Skip to content

Commit a40bb76

Browse files
belkissbelkiss
committed
Merge branch 'release-0.14.2'
2 parents 11f0545 + 0b606a8 commit a40bb76

33 files changed

+329
-224
lines changed

‎Sharpmake.Application/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,4 @@
4343
//
4444
// You can specify all the values or you can default the Build and Revision Numbers
4545
// by using the '*' as shown below:
46-
[assembly: AssemblyVersion("0.14.1.0")]
46+
[assembly: AssemblyVersion("0.14.2.0")]

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/FastBuildFunctionalTest.sharpmake.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,8 @@ public override void ConfigureAll(Configuration conf, Target target)
302302

303303
conf.PrecompSourceExclude.Add("noprecomp_util.cpp");
304304
conf.PrecompSourceExcludeExtension.Add(".ceepeepee");
305+
306+
conf.Defines.Add("SOME_UTILITY_STRING=\"UTIL FUNC\"");
305307
}
306308
}
307309

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/codebase/UsePrecompExe/util.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99

1010
void Util::StaticUtilityMethod()
1111
{
12-
printf("%s\n", __func__);
12+
printf(SOME_UTILITY_STRING " => %s\n", __func__);
1313
}

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2017_win64.bff‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_0_objects' )
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' /DWIN64'
46-
+ ' /D_CONSOLE'
47-
+ ' /D_DEBUG'
45+
+ ' "/D_CONSOLE"'
46+
+ ' "/DWIN64"'
47+
+ ' "/D_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -119,9 +119,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
119119
// + ' /MP'
120120
// Preprocessor options
121121
// ---------------------------
122-
+ ' /DWIN64'
123-
+ ' /D_CONSOLE'
124-
+ ' /D_DEBUG'
122+
+ ' "/D_CONSOLE"'
123+
+ ' "/DWIN64"'
124+
+ ' "/D_DEBUG"'
125125
// Code Generation options
126126
// ---------------------------
127127
+ ' /GF'
@@ -273,9 +273,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_0_objects' )
273273
// + ' /MP'
274274
// Preprocessor options
275275
// ---------------------------
276-
+ ' /DNDEBUG'
277-
+ ' /DWIN64'
278-
+ ' /D_CONSOLE'
276+
+ ' "/D_CONSOLE"'
277+
+ ' "/DWIN64"'
278+
+ ' "/DNDEBUG"'
279279
// Code Generation options
280280
// ---------------------------
281281
+ ' /GF'
@@ -351,9 +351,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2017_win64_objects' )
351351
// + ' /MP'
352352
// Preprocessor options
353353
// ---------------------------
354-
+ ' /DNDEBUG'
355-
+ ' /DWIN64'
356-
+ ' /D_CONSOLE'
354+
+ ' "/D_CONSOLE"'
355+
+ ' "/DWIN64"'
356+
+ ' "/DNDEBUG"'
357357
// Code Generation options
358358
// ---------------------------
359359
+ ' /GF'
@@ -506,9 +506,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_0_objects' )
506506
// + ' /MP'
507507
// Preprocessor options
508508
// ---------------------------
509-
+ ' /DWIN64'
510-
+ ' /D_CONSOLE'
511-
+ ' /D_DEBUG'
509+
+ ' "/D_CONSOLE"'
510+
+ ' "/DWIN64"'
511+
+ ' "/D_DEBUG"'
512512
// Code Generation options
513513
// ---------------------------
514514
+ ' /GF'
@@ -583,9 +583,9 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2017_win64_objects' )
583583
// + ' /MP'
584584
// Preprocessor options
585585
// ---------------------------
586-
+ ' /DWIN64'
587-
+ ' /D_CONSOLE'
588-
+ ' /D_DEBUG'
586+
+ ' "/D_CONSOLE"'
587+
+ ' "/DWIN64"'
588+
+ ' "/D_DEBUG"'
589589
// Code Generation options
590590
// ---------------------------
591591
+ ' /GF'
@@ -737,9 +737,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_0_objects' )
737737
// + ' /MP'
738738
// Preprocessor options
739739
// ---------------------------
740-
+ ' /DNDEBUG'
741-
+ ' /DWIN64'
742-
+ ' /D_CONSOLE'
740+
+ ' "/D_CONSOLE"'
741+
+ ' "/DWIN64"'
742+
+ ' "/DNDEBUG"'
743743
// Code Generation options
744744
// ---------------------------
745745
+ ' /GF'
@@ -815,9 +815,9 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2017_win64_objects' )
815815
// + ' /MP'
816816
// Preprocessor options
817817
// ---------------------------
818-
+ ' /DNDEBUG'
819-
+ ' /DWIN64'
820-
+ ' /D_CONSOLE'
818+
+ ' "/D_CONSOLE"'
819+
+ ' "/DWIN64"'
820+
+ ' "/DNDEBUG"'
821821
// Code Generation options
822822
// ---------------------------
823823
+ ' /GF'

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopydirtest_vs2017_win64.bff‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' /DWIN64'
46-
+ ' /D_CONSOLE'
47-
+ ' /D_DEBUG'
45+
+ ' "/D_CONSOLE"'
46+
+ ' "/DWIN64"'
47+
+ ' "/D_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
204204
// + ' /MP'
205205
// Preprocessor options
206206
// ---------------------------
207-
+ ' /DNDEBUG'
208-
+ ' /DWIN64'
209-
+ ' /D_CONSOLE'
207+
+ ' "/D_CONSOLE"'
208+
+ ' "/DWIN64"'
209+
+ ' "/DNDEBUG"'
210210
// Code Generation options
211211
// ---------------------------
212212
+ ' /GF'
@@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopyDirTest_Debug_FastBuild_vs2017_win64_objects' )
367367
// + ' /MP'
368368
// Preprocessor options
369369
// ---------------------------
370-
+ ' /DWIN64'
371-
+ ' /D_CONSOLE'
372-
+ ' /D_DEBUG'
370+
+ ' "/D_CONSOLE"'
371+
+ ' "/DWIN64"'
372+
+ ' "/D_DEBUG"'
373373
// Code Generation options
374374
// ---------------------------
375375
+ ' /GF'
@@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopyDirTest_Release_FastBuild_vs2017_win64_objects' )
529529
// + ' /MP'
530530
// Preprocessor options
531531
// ---------------------------
532-
+ ' /DNDEBUG'
533-
+ ' /DWIN64'
534-
+ ' /D_CONSOLE'
532+
+ ' "/D_CONSOLE"'
533+
+ ' "/DWIN64"'
534+
+ ' "/DNDEBUG"'
535535
// Code Generation options
536536
// ---------------------------
537537
+ ' /GF'

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildcopysinglefiletest_vs2017_win64.bff‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_NoBlob_vs2017_win64_obj
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' /DWIN64'
46-
+ ' /D_CONSOLE'
47-
+ ' /D_DEBUG'
45+
+ ' "/D_CONSOLE"'
46+
+ ' "/DWIN64"'
47+
+ ' "/D_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -204,9 +204,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_NoBlob_vs2017_win64_o
204204
// + ' /MP'
205205
// Preprocessor options
206206
// ---------------------------
207-
+ ' /DNDEBUG'
208-
+ ' /DWIN64'
209-
+ ' /D_CONSOLE'
207+
+ ' "/D_CONSOLE"'
208+
+ ' "/DWIN64"'
209+
+ ' "/DNDEBUG"'
210210
// Code Generation options
211211
// ---------------------------
212212
+ ' /GF'
@@ -367,9 +367,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Debug_FastBuild_vs2017_win64_objects' )
367367
// + ' /MP'
368368
// Preprocessor options
369369
// ---------------------------
370-
+ ' /DWIN64'
371-
+ ' /D_CONSOLE'
372-
+ ' /D_DEBUG'
370+
+ ' "/D_CONSOLE"'
371+
+ ' "/DWIN64"'
372+
+ ' "/D_DEBUG"'
373373
// Code Generation options
374374
// ---------------------------
375375
+ ' /GF'
@@ -529,9 +529,9 @@ ObjectList( 'PostBuildCopySingleFileTest_Release_FastBuild_vs2017_win64_objects'
529529
// + ' /MP'
530530
// Preprocessor options
531531
// ---------------------------
532-
+ ' /DNDEBUG'
533-
+ ' /DWIN64'
534-
+ ' /D_CONSOLE'
532+
+ ' "/D_CONSOLE"'
533+
+ ' "/DWIN64"'
534+
+ ' "/DNDEBUG"'
535535
// Code Generation options
536536
// ---------------------------
537537
+ ' /GF'

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildexecutetest_vs2017_win64.bff‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' /DWIN64'
46-
+ ' /D_CONSOLE'
47-
+ ' /D_DEBUG'
45+
+ ' "/D_CONSOLE"'
46+
+ ' "/DWIN64"'
47+
+ ' "/D_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -205,9 +205,9 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_NoBlob_vs2017_win64_objects'
205205
// + ' /MP'
206206
// Preprocessor options
207207
// ---------------------------
208-
+ ' /DNDEBUG'
209-
+ ' /DWIN64'
210-
+ ' /D_CONSOLE'
208+
+ ' "/D_CONSOLE"'
209+
+ ' "/DWIN64"'
210+
+ ' "/DNDEBUG"'
211211
// Code Generation options
212212
// ---------------------------
213213
+ ' /GF'
@@ -369,9 +369,9 @@ ObjectList( 'PostBuildExecuteTest_Debug_FastBuild_vs2017_win64_objects' )
369369
// + ' /MP'
370370
// Preprocessor options
371371
// ---------------------------
372-
+ ' /DWIN64'
373-
+ ' /D_CONSOLE'
374-
+ ' /D_DEBUG'
372+
+ ' "/D_CONSOLE"'
373+
+ ' "/DWIN64"'
374+
+ ' "/D_DEBUG"'
375375
// Code Generation options
376376
// ---------------------------
377377
+ ' /GF'
@@ -532,9 +532,9 @@ ObjectList( 'PostBuildExecuteTest_Release_FastBuild_vs2017_win64_objects' )
532532
// + ' /MP'
533533
// Preprocessor options
534534
// ---------------------------
535-
+ ' /DNDEBUG'
536-
+ ' /DWIN64'
537-
+ ' /D_CONSOLE'
535+
+ ' "/D_CONSOLE"'
536+
+ ' "/DWIN64"'
537+
+ ' "/DNDEBUG"'
538538
// Code Generation options
539539
// ---------------------------
540540
+ ' /GF'

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/postbuildtestexecution_vs2017_win64.bff‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_NoBlob_vs2017_win64_objects'
4242
// + ' /MP'
4343
// Preprocessor options
4444
// ---------------------------
45-
+ ' /DWIN64'
46-
+ ' /D_CONSOLE'
47-
+ ' /D_DEBUG'
45+
+ ' "/D_CONSOLE"'
46+
+ ' "/DWIN64"'
47+
+ ' "/D_DEBUG"'
4848
// Code Generation options
4949
// ---------------------------
5050
+ ' /GF'
@@ -205,9 +205,9 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_NoBlob_vs2017_win64_object
205205
// + ' /MP'
206206
// Preprocessor options
207207
// ---------------------------
208-
+ ' /DNDEBUG'
209-
+ ' /DWIN64'
210-
+ ' /D_CONSOLE'
208+
+ ' "/D_CONSOLE"'
209+
+ ' "/DWIN64"'
210+
+ ' "/DNDEBUG"'
211211
// Code Generation options
212212
// ---------------------------
213213
+ ' /GF'
@@ -369,9 +369,9 @@ ObjectList( 'PostBuildTestExecution_Debug_FastBuild_vs2017_win64_objects' )
369369
// + ' /MP'
370370
// Preprocessor options
371371
// ---------------------------
372-
+ ' /DWIN64'
373-
+ ' /D_CONSOLE'
374-
+ ' /D_DEBUG'
372+
+ ' "/D_CONSOLE"'
373+
+ ' "/DWIN64"'
374+
+ ' "/D_DEBUG"'
375375
// Code Generation options
376376
// ---------------------------
377377
+ ' /GF'
@@ -532,9 +532,9 @@ ObjectList( 'PostBuildTestExecution_Release_FastBuild_vs2017_win64_objects' )
532532
// + ' /MP'
533533
// Preprocessor options
534534
// ---------------------------
535-
+ ' /DNDEBUG'
536-
+ ' /DWIN64'
537-
+ ' /D_CONSOLE'
535+
+ ' "/D_CONSOLE"'
536+
+ ' "/DWIN64"'
537+
+ ' "/DNDEBUG"'
538538
// Code Generation options
539539
// ---------------------------
540540
+ ' /GF'

‎Sharpmake.FunctionalTests/FastBuildFunctionalTest/reference/projects/requireprebuildstep_vs2017_win64.bff‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_NoBlob_vs2017_win64_objects' )
4343
// + ' /MP'
4444
// Preprocessor options
4545
// ---------------------------
46-
+ ' /DWIN64'
47-
+ ' /D_CONSOLE'
48-
+ ' /D_DEBUG'
46+
+ ' "/D_CONSOLE"'
47+
+ ' "/DWIN64"'
48+
+ ' "/D_DEBUG"'
4949
// Code Generation options
5050
// ---------------------------
5151
+ ' /GF'
@@ -197,9 +197,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_NoBlob_vs2017_win64_objects'
197197
// + ' /MP'
198198
// Preprocessor options
199199
// ---------------------------
200-
+ ' /DNDEBUG'
201-
+ ' /DWIN64'
202-
+ ' /D_CONSOLE'
200+
+ ' "/D_CONSOLE"'
201+
+ ' "/DWIN64"'
202+
+ ' "/DNDEBUG"'
203203
// Code Generation options
204204
// ---------------------------
205205
+ ' /GF'
@@ -352,9 +352,9 @@ ObjectList( 'RequirePreBuildStep_Debug_FastBuild_vs2017_win64_objects' )
352352
// + ' /MP'
353353
// Preprocessor options
354354
// ---------------------------
355-
+ ' /DWIN64'
356-
+ ' /D_CONSOLE'
357-
+ ' /D_DEBUG'
355+
+ ' "/D_CONSOLE"'
356+
+ ' "/DWIN64"'
357+
+ ' "/D_DEBUG"'
358358
// Code Generation options
359359
// ---------------------------
360360
+ ' /GF'
@@ -506,9 +506,9 @@ ObjectList( 'RequirePreBuildStep_Release_FastBuild_vs2017_win64_objects' )
506506
// + ' /MP'
507507
// Preprocessor options
508508
// ---------------------------
509-
+ ' /DNDEBUG'
510-
+ ' /DWIN64'
511-
+ ' /D_CONSOLE'
509+
+ ' "/D_CONSOLE"'
510+
+ ' "/DWIN64"'
511+
+ ' "/DNDEBUG"'
512512
// Code Generation options
513513
// ---------------------------
514514
+ ' /GF'

0 commit comments

Comments
 (0)