Skip to content

Commit

Permalink
Merge branch 'release-0.14.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@belkiss
belkiss committed Jul 16, 2020
2 parents 11f0545 + 0b606a8 commit a40bb76
Show file tree
Hide file tree
Showing 33 changed files with 329 additions and 224 deletions.
2 changes: 1 addition & 1 deletion Sharpmake.Application/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("0.14.1.0")]
[assembly: AssemblyVersion("0.14.2.0")]
2 changes: 2 additions & 0 deletions Sharpmake.FunctionalTests/FastBuildFunctionalTest/FastBuildFunctionalTest.sharpmake.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,8 @@ public override void ConfigureAll(Configuration conf, Target target)

conf.PrecompSourceExclude.Add("noprecomp_util.cpp");
conf.PrecompSourceExcludeExtension.Add(".ceepeepee");

conf.Defines.Add("SOME_UTILITY_STRING=\"UTIL FUNC\"");
}
}

Expand Down
2 changes: 1 addition & 1 deletion Sharpmake.FunctionalTests/FastBuildFunctionalTest/codebase/UsePrecompExe/util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

void Util::StaticUtilityMethod()
{
printf("%s\n", __func__);
printf(SOME_UTILITY_STRING " => %s\n", __func__);
}
48 changes: 24 additions & 24 deletions ...FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -119,9 +119,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -273,9 +273,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -351,9 +351,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -506,9 +506,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -583,9 +583,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -737,9 +737,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -815,9 +815,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
24 changes: 12 additions & 12 deletions ...nalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
24 changes: 12 additions & 12 deletions ...s/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_obj
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_o
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
24 changes: 12 additions & 12 deletions ...nalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -205,9 +205,9 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -369,9 +369,9 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -532,9 +532,9 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
24 changes: 12 additions & 12 deletions ...lTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -205,9 +205,9 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_object
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -369,9 +369,9 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -532,9 +532,9 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
24 changes: 12 additions & 12 deletions ...onalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.bff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -197,9 +197,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects'
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -352,9 +352,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' /D_DEBUG'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/D_DEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down Expand Up @@ -506,9 +506,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' )
// + ' /MP'
// Preprocessor options
// ---------------------------
+ ' /DNDEBUG'
+ ' /DWIN64'
+ ' /D_CONSOLE'
+ ' "/D_CONSOLE"'
+ ' "/DWIN64"'
+ ' "/DNDEBUG"'
// Code Generation options
// ---------------------------
+ ' /GF'
Expand Down
Loading

0 comments on commit a40bb76

Please sign in to comment.