Merge branch 'release-0.17.1'

ubisoft · Aug 4, 2021 · 57c3b87 · 57c3b87
2 parents 5354c1a + 25b3f61
commit 57c3b87
Show file tree

Hide file tree

Showing 63 changed files with 1,500 additions and 211 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -159,6 +159,14 @@ jobs:
           & $env:SHARPMAKE_EXE "/sources('CSharpVsix.sharpmake.cs')"
           & $env:COMPILE_BATCH projects\CSharpVsixSolution.vs2017.v4_7_2.sln "${{ matrix.configuration }}" "Any CPU"
 
+      - name: CustomBuildStep ${{ matrix.configuration }}
+        if: runner.os == 'Windows'
+        working-directory: 'samples/CustomBuildStep'
+        run: | 
+          & $env:SHARPMAKE_EXE "/sources('CustomBuildStep.sharpmake.cs')"
+          & $env:COMPILE_BATCH projects\custombuildstepsolution_vs2017_win64.sln "${{ matrix.configuration }}" "x64"
+          projects\output\win64\${{ matrix.configuration }}\custombuildstep.exe
+
       - name: CSharpWCF ${{ matrix.configuration }}
         if: runner.os == 'Windows'
         working-directory: 'samples/CSharpWCF'
@@ -202,6 +210,16 @@ jobs:
           & $env:COMPILE_BATCH codebase\temp\solutions\HelloClangCl_win64_vs2019.sln "MSVC ${{ matrix.configuration }}" "FastBuild"
           codebase\temp\bin\win64_msvc_${{ matrix.configuration }}_fastbuild\exe_rx.exe
 
+      - name: HelloEvents
+        if: runner.os == 'Windows'
+        working-directory: 'samples/HelloEvents'
+        run: |
+          & $env:SHARPMAKE_EXE "/sources('HelloEvents.Main.sharpmake.cs')"
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloEvents_win64_vs2019.sln "${{ matrix.configuration }}" "win64"
+          codebase\temp\bin\win64_${{ matrix.configuration }}\exe\exe.exe
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloEvents_win64_vs2019.sln "${{ matrix.configuration }}_FastBuild" "win64"
+          codebase\temp\bin\win64_${{ matrix.configuration }}_fastbuild\exe\exe.exe
+
       - name: HelloLinux ${{ matrix.configuration }}
         if: runner.os == 'Linux'
         working-directory: 'samples/HelloLinux'

diff --git a/CompileSharpmake.bat b/CompileSharpmake.bat
@@ -44,7 +44,7 @@ goto success
 :BuildSharpmake
 echo Compiling %~1 in "%~2|%~3"...
 
-set MSBUILD_CMD=msbuild -clp:Summary -t:rebuild -restore "%~1" /nologo /verbosity:m /p:Configuration="%~2" /p:Platform="%~3"
+set MSBUILD_CMD=msbuild -clp:Summary -t:rebuild -restore "%~1" /nologo /verbosity:m /p:Configuration="%~2" /p:Platform="%~3" /maxcpucount /p:CL_MPCount=%NUMBER_OF_PROCESSORS%
 echo %MSBUILD_CMD%
 %MSBUILD_CMD%
 set ERROR_CODE=%errorlevel%

diff --git a/README.md b/README.md
@@ -43,9 +43,7 @@ source code also comes with samples that you can study.
 Building Sharpmake is quite straightforward. Clone the repo on GitHub, run the 
 "bootstrap" script (".bat" for Windows, ".sh" for Unix platforms), open the
 solution in Visual Studio and build the solution in *Release*. The binaries
-will be found in the *Sharpmake.Application/bin/Release*. You can run the
-*deploy_binaries.py* script to automatically fetch the binaries and copy them
-in a *Binaries* folder.
+will be found in the *tmp/bin/release* directory.
 
 
 ## More Platforms

diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Ubisoft")]
 [assembly: AssemblyProduct("Sharpmake.Application")]
-[assembly: AssemblyCopyright("Copyright \u00A9 Ubisoft 2017-2018")]
+[assembly: AssemblyCopyright("Copyright \u00A9 Ubisoft 2017-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.17.0.0")]
+[assembly: AssemblyVersion("0.17.1.0")]
diff --git a/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff b/...astBuildFunctionalTest/reference/projects/explicitlyorderedpostbuildtest_vs2019_win64.bff
@@ -22,7 +22,7 @@ Unity( 'ExplicitlyOrderedPostBuildTest_FastBuildUnitys_unity' )
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
@@ -98,7 +98,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_
 //=================================================================================================================
 Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
     .Libraries              = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_objects'
     .LinkerOutput           = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe'
@@ -216,7 +216,7 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_NoBlob_vs2019_win64_Libra
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
@@ -293,7 +293,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win6
 //=================================================================================================================
 Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest\'
     .Libraries              = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_objects'
     .LinkerOutput           = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_noblob_vs2019\explicitlyorderedpostbuildtest.exe'
@@ -411,7 +411,7 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_NoBlob_vs2019_win64_Lib
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
@@ -487,7 +487,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects
 //=================================================================================================================
 Executable( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
     .Libraries              = 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_objects'
     .LinkerOutput           = '.\$_CURRENT_BFF_DIR_$\output\debug_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe'
@@ -605,7 +605,7 @@ Alias( 'ExplicitlyOrderedPostBuildTest_Debug_FastBuild_vs2019_win64_LibraryDepen
 //=================================================================================================================
 ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
 
     .CompilerExtraOptions   = ''
@@ -682,7 +682,7 @@ ObjectList( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objec
 //=================================================================================================================
 Executable( 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\explicitlyorderedpostbuildtest\'
     .Libraries              = 'ExplicitlyOrderedPostBuildTest_Release_FastBuild_vs2019_win64_objects'
     .LinkerOutput           = '.\$_CURRENT_BFF_DIR_$\output\release_fastbuild_vs2019\explicitlyorderedpostbuildtest.exe'

diff --git a/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff b/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff
@@ -19,6 +19,7 @@ Settings
         "TEMP=$TEMP$",
         "USERPROFILE=$USERPROFILE$",
         "SystemRoot=C:\WINDOWS"
+        "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64"
     }
 
 }
@@ -91,18 +92,30 @@ Compiler( 'Compiler-x64-vs2019' )
     .CompilerFamily         = 'msvc'
 }
 
+Compiler( 'RC.win64Config' )
+{
+    .Executable             = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\rc.exe'
+    .CompilerFamily         = 'custom'
+}
+
 .win64Config =
 [
     .BinPath                = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64'
     .LinkerPath             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64'
-    .ResourceCompiler       = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x64\rc.exe'
+    .ResourceCompiler       = 'RC.win64Config'
     .Compiler               = 'Compiler-x64-vs2019'
     .Librarian              = '$LinkerPath$\lib.exe'
     .Linker                 = '$LinkerPath$\link.exe'
 ]
 
+Compiler( 'ML.win64ConfigMasm' )
+{
+    .Executable             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.29.30037\bin\Hostx64\x64\ml64.exe'
+    .CompilerFamily         = 'custom'
+}
+
 .win64ConfigMasm =
 [
     Using( .win64Config )
-    .Compiler               = '$BinPath$\ml64.exe'
+    .Compiler               = 'ML.win64ConfigMasm'
 ]
diff --git a/...unctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff b/...unctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest_all.bff
@@ -27,13 +27,6 @@ Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64' )
 }
 
 
-//=================================================================================================================
-Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
-{
-    .Targets = 'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64_Unknown'
-}
-
-
 //=================================================================================================================
 Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64' )
 {
@@ -52,13 +45,6 @@ Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64' )
 }
 
 
-//=================================================================================================================
-Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
-{
-    .Targets = 'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64_Unknown'
-}
-
-
 //=================================================================================================================
 Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64' )
 {
@@ -77,13 +63,6 @@ Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64' )
 }
 
 
-//=================================================================================================================
-Alias( 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64_LibraryDependency' )
-{
-    .Targets = 'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64_Unknown'
-}
-
-
 //=================================================================================================================
 Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64' )
 {
@@ -102,12 +81,5 @@ Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64' )
 }
 
 
-//=================================================================================================================
-Alias( 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64_LibraryDependency' )
-{
-    .Targets = 'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64_Unknown'
-}
-
-
 #endif // WIN64
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/...FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff b/...FunctionalTests/FastBuildFunctionalTest/reference/projects/mixcppandcexe_vs2019_win64.bff
@@ -22,7 +22,7 @@ Unity( 'MixCppAndCExe_FastBuildUnitys_unity' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -98,7 +98,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -174,7 +174,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_objects' )
 //=================================================================================================================
 Executable( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_noblob_vs2019\mixcppandcexe\'
     .Libraries              = {
                                   'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_0_objects',
@@ -258,7 +258,7 @@ Alias( 'MixCppAndCExe_Debug_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -335,7 +335,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -412,7 +412,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_objects' )
 //=================================================================================================================
 Executable( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_noblob_vs2019\mixcppandcexe\'
     .Libraries              = {
                                   'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_0_objects',
@@ -496,7 +496,7 @@ Alias( 'MixCppAndCExe_Release_FastBuild_NoBlob_vs2019_win64_LibraryDependency' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -572,7 +572,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -648,7 +648,7 @@ ObjectList( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_objects' )
 //=================================================================================================================
 Executable( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\debug_fastbuild_vs2019\mixcppandcexe\'
     .Libraries              = {
                                   'MixCppAndCExe_Debug_FastBuild_vs2019_win64_0_objects',
@@ -732,7 +732,7 @@ Alias( 'MixCppAndCExe_Debug_FastBuild_vs2019_win64_LibraryDependency' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -809,7 +809,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects' )
 //=================================================================================================================
 ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\'
 
     .CompilerExtraOptions   = ''
@@ -886,7 +886,7 @@ ObjectList( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_objects' )
 //=================================================================================================================
 Executable( 'MixCppAndCExe_Release_FastBuild_vs2019_win64_Executable' )
 {
-     Using( .win64Config )
+    Using( .win64Config )
     .Intermediate           = '.\$_CURRENT_BFF_DIR_$\build\release_fastbuild_vs2019\mixcppandcexe\'
     .Libraries              = {
                                   'MixCppAndCExe_Release_FastBuild_vs2019_win64_0_objects',