Merge branch 'release-0.15.1' into main

ubisoft · Mar 3, 2021 · 7ac0ba0 · 7ac0ba0
2 parents 1775159 + 149ca86
commit 7ac0ba0
Show file tree

Hide file tree

Showing 58 changed files with 2,636 additions and 2,649 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -38,6 +38,11 @@ jobs:
         if: runner.os != 'Windows'
         shell: bash
         run: ./CompileSharpmake.sh Sharpmake.sln "${{ matrix.configuration }}"
+
+      - name: GenerateMdbFiles.bat
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: GenerateMdbFiles.bat
 
       - name: UnitTest
         if: runner.os == 'Windows'
@@ -52,3 +57,10 @@ jobs:
       - name: FunctionalTest
         if: runner.os == 'Windows'
         run: python functional_test.py
+
+      - name: Upload sharpmake cross-platform release binaries
+        if: runner.os == 'Windows' && matrix.configuration == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: 'Sharpmake-${{github.sha}}'
+          path: tmp/bin
diff --git a/Sharpmake.Application/CommandLineArguments.cs b/Sharpmake.Application/CommandLineArguments.cs
@@ -57,7 +57,6 @@ public enum InputType
             public bool SkipInvalidPath = false;
             public bool DebugLog = false;
             public bool Debug = false;
-            public bool DebugScripts = false;
             public bool Diagnostics = false;
             public bool WriteFiles = true;
             public bool DumpDependency = false;
@@ -170,12 +169,6 @@ public void CommandLineDebug()
                 Debug = true;
             }
 
-            [CommandLine.Option("debugscripts", @"Compile scripts in debug to ease their debuggging: ex: /debugscripts")]
-            public void CommandLineDebugScripts()
-            {
-                DebugScripts = true;
-            }
-
             [CommandLine.Option("sharpmakemutexsuffix", @"Allow custom mutex name suffix. Useful to debug concurrently multiple sharpmake running from different branches. Ex: /sharpmakemutexsuffix(""Name"")")]
             public void CommandLineSharpmakeMutexSuffix(string name)
             {

diff --git a/Sharpmake.Application/Program.cs b/Sharpmake.Application/Program.cs
@@ -596,9 +596,9 @@ public static Builder CreateBuilder(BuildContext.BaseBuildContext context, Argum
                 parameters.BlobOnly,
                 parameters.SkipInvalidPath,
                 parameters.Diagnostics,
-                parameters.DebugScripts,
-                Program.GetGeneratorsManager,
-                parameters.Defines
+                debugScripts: true, // warning: some code that rely on callstacks misbehaves in release, because methods can completely disappear due to optimizations, so force disable for now
+                getGeneratorsManagerCallBack: GetGeneratorsManager,
+                defines: parameters.Defines
             );
 
             // Allow message log from builder.

diff --git a/Sharpmake.Application/Properties/AssemblyInfo.cs b/Sharpmake.Application/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017, 2019-2020 Ubisoft Entertainment
+// Copyright (c) 2017, 2019-2021 Ubisoft Entertainment
 // 
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -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.15.0.0")]
+[assembly: AssemblyVersion("0.15.1.0")]
diff --git a/...itlyorderedpostbuildtest_vs2017_win64.bff → ...itlyorderedpostbuildtest_vs2019_win64.bff b/...itlyorderedpostbuildtest_vs2017_win64.bff → ...itlyorderedpostbuildtest_vs2019_win64.bff
diff --git a/...orderedpostbuildtest_vs2017_win64.vcxproj → ...orderedpostbuildtest_vs2019_win64.vcxproj b/...orderedpostbuildtest_vs2017_win64.vcxproj → ...orderedpostbuildtest_vs2019_win64.vcxproj
diff --git a/...ostbuildtest_vs2017_win64.vcxproj.filters → ...ostbuildtest_vs2019_win64.vcxproj.filters b/...ostbuildtest_vs2017_win64.vcxproj.filters → ...ostbuildtest_vs2019_win64.vcxproj.filters
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\codebase\ExplicitlyOrderedPostBuildTest\main.cpp" />
   </ItemGroup>

diff --git a/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff b/...sts/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest-globalsettings.bff
@@ -24,9 +24,9 @@ Settings
 }
 
 //=================================================================================================================
-Compiler( 'Compiler-x64-vs2017' )
+Compiler( 'Compiler-x64-vs2019' )
 {
-    .ExecutableRootPath     = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\HostX64\x64'
+    .ExecutableRootPath     = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\HostX64\x64'
     .Executable             = '$ExecutableRootPath$\cl.exe'
     .ExtraFiles             = {
                                 '$ExecutableRootPath$\1033\clui.dll',
@@ -40,9 +40,12 @@ Compiler( 'Compiler-x64-vs2017' )
                                 '$ExecutableRootPath$\mspft140.dll',
                                 '$ExecutableRootPath$\msvcdis140.dll',
                                 '$ExecutableRootPath$\msvcp140.dll',
+                                '$ExecutableRootPath$\msvcp140_atomic_wait.dll',
                                 '$ExecutableRootPath$\pgodb140.dll',
+                                '$ExecutableRootPath$\tbbmalloc.dll',
                                 '$ExecutableRootPath$\vcruntime140.dll',
-                                'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build\vcvars64.bat',
+                                '$ExecutableRootPath$\vcruntime140_1.dll',
+                                'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat',
                                 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-console-l1-1-0.dll',
                                 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-datetime-l1-1-0.dll',
                                 'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs\x64\api-ms-win-core-debug-l1-1-0.dll',
@@ -89,10 +92,10 @@ Compiler( 'Compiler-x64-vs2017' )
 
 .win64Config =
 [
-    .BinPath                = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64'
-    .LinkerPath             = 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Tools\MSVC\14.16.27023\bin\Hostx64\x64'
-    .ResourceCompiler       = 'C:\Program Files (x86)\Windows Kits\10\bin\x64\rc.exe'
-    .Compiler               = 'Compiler-x64-vs2017'
+    .BinPath                = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64'
+    .LinkerPath             = 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Tools\MSVC\14.28.29333\bin\Hostx64\x64'
+    .ResourceCompiler       = 'C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\rc.exe'
+    .Compiler               = 'Compiler-x64-vs2019'
     .Librarian              = '$LinkerPath$\lib.exe'
     .Linker                 = '$LinkerPath$\link.exe'
 ]

diff --git a/...ke.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff b/...ke.FunctionalTests/FastBuildFunctionalTest/reference/projects/fastbuildfunctionaltest.bff
@@ -28,18 +28,18 @@ Exec( 'GenerateHeader' )
 //=================================================================================================================
 // fastbuildfunctionaltest.bff .bff includes
 //=================================================================================================================
-#include ".\explicitlyorderedpostbuildtest_vs2017_win64.bff"
-#include ".\mixcppandcexe_vs2017_win64.bff"
-#include ".\postbuildcopydirtest_vs2017_win64.bff"
-#include ".\postbuildcopysinglefiletest_vs2017_win64.bff"
-#include ".\postbuildexecutetest_vs2017_win64.bff"
-#include ".\postbuildtestexecution_vs2017_win64.bff"
-#include ".\requireprebuildstep_vs2017_win64.bff"
-#include ".\spanmultiplesrcdirsfbunityexclude_vs2017_win64.bff"
-#include ".\spanmultiplesrcdirsfbunityinclude_vs2017_win64.bff"
-#include ".\useprecompexe_vs2017_win64.bff"
-#include ".\spanmultiplesrcdirsfbnoblobexclude_vs2017_win64.bff"
-#include ".\spanmultiplesrcdirsfbnoblobinclude_vs2017_win64.bff"
+#include ".\explicitlyorderedpostbuildtest_vs2019_win64.bff"
+#include ".\mixcppandcexe_vs2019_win64.bff"
+#include ".\postbuildcopydirtest_vs2019_win64.bff"
+#include ".\postbuildcopysinglefiletest_vs2019_win64.bff"
+#include ".\postbuildexecutetest_vs2019_win64.bff"
+#include ".\postbuildtestexecution_vs2019_win64.bff"
+#include ".\requireprebuildstep_vs2019_win64.bff"
+#include ".\spanmultiplesrcdirsfbunityexclude_vs2019_win64.bff"
+#include ".\spanmultiplesrcdirsfbunityinclude_vs2019_win64.bff"
+#include ".\useprecompexe_vs2019_win64.bff"
+#include ".\spanmultiplesrcdirsfbnoblobexclude_vs2019_win64.bff"
+#include ".\spanmultiplesrcdirsfbnoblobinclude_vs2019_win64.bff"
 #include ".\fastbuildfunctionaltest_all.bff"
 
 
@@ -50,9 +50,9 @@ Alias( 'All-Configs' )
 {
     .Targets =
     {
-        'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2017_win64',
-        'FastBuildFunctionalTest_All_Debug_FastBuild_vs2017_win64',
-        'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2017_win64',
-        'FastBuildFunctionalTest_All_Release_FastBuild_vs2017_win64'
+        'FastBuildFunctionalTest_All_Debug_FastBuild_NoBlob_vs2019_win64',
+        'FastBuildFunctionalTest_All_Debug_FastBuild_vs2019_win64',
+        'FastBuildFunctionalTest_All_Release_FastBuild_NoBlob_vs2019_win64',
+        'FastBuildFunctionalTest_All_Release_FastBuild_vs2019_win64'
     }
 }