Reactivate builds, other cleanup.

CesiumGS · Aug 10, 2024 · 2c2ec89 · 2c2ec89
1 parent b53487f
commit 2c2ec89
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 47 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -110,18 +110,10 @@ jobs:
           $ENV:CESIUM_VCPKG_RELEASE_ONLY="TRUE"
           # Clear ANDROID_NDK_ROOT so that we use Unity's version
           Remove-Item Env:ANDROID_NDK_ROOT
+          # Explicitly set the ezvcpkg path. Otherwise it will be `/.ezvcpkg` and the drive letter is ambiguous.
           $ENV:EZVCPKG_BASEDIR="D:/.ezvcpkg"
           # Run the build
           dotnet run --project Build~
-          dir /.ezvcpkg/2024.07.12/installed/arm64-android-unity/include
-          dir /.ezvcpkg/2024.07.12/installed/arm64-android-unity/include/spdlog
-          # cat D:\cesium\CesiumForUnityBuildProject\Packages\com.cesium.unity\native~\build-WSA-x86_64\build.log
-          # cat D:\cesium\CesiumForUnityBuildProject\Packages\com.cesium.unity\native~\build-WSA-arm64\build.log
-          cat D:\cesium\CesiumForUnityBuildProject\Packages\com.cesium.unity\native~\build-Android-arm64\build.log
-          # dir d:\cesium\CesiumForUnityBuildProject
-          # dir C:\.ezvcpkg\2024.07.12\packages\spdlog_arm64-android-unity
-          # dir C:\.ezvcpkg\2024.07.12\packages\spdlog_arm64-android-unity\include
-          # dir C:\.ezvcpkg\2024.07.12\packages\spdlog_arm64-android-unity\include\spdlog
       - name: Publish package artifact
         if: ${{ success() }}
         uses: actions/upload-artifact@v4

diff --git a/Build~/Package.cs b/Build~/Package.cs
@@ -145,41 +145,45 @@ public void Run()
                 if (OperatingSystem.IsWindows())
                 {
                     // TODO: we're currently only building for UWP on Windows. This should be an option, or a separate build command.
-                    // Console.WriteLine("**** Compiling for Universal Windows Platform Player");
-                    // unity.Run(new[]
-                    // {
-                    //     "-batchmode",
-                    //     "-nographics",
-                    //     "-projectPath",
-                    //     Utility.ProjectRoot,
-                    //     "-buildTarget",
-                    //     "WindowsStoreApps",
-                    //     "-executeMethod",
-                    //     "CesiumForUnity.BuildCesiumForUnity.CompileForUWPAndExit"
-                    // });
-
-                    // Console.WriteLine("**** Adding generated files (for the UWP Player) to the package");
-                    // AddGeneratedFiles("!UNITY_EDITOR && UNITY_WSA", generatedRuntimePath, Path.Combine(outputPackagePath, "Runtime", "generated"));
-
-                    // Console.WriteLine("**** Compiling for Windows Player");
-                    // unity.Run(new[]
-                    // {
-                    //     "-batchmode",
-                    //     "-nographics",
-                    //     "-projectPath",
-                    //     Utility.ProjectRoot,
-                    //     "-buildTarget",
-                    //     "Win64",
-                    //     "-executeMethod",
-                    //     "CesiumForUnity.BuildCesiumForUnity.CompileForWindowsAndExit"
-                    // });
-
-                    // Console.WriteLine("**** Adding generated files (for the Windows Player) to the package");
-                    // AddGeneratedFiles("!UNITY_EDITOR && UNITY_STANDALONE_WIN", generatedRuntimePath, Path.Combine(outputPackagePath, "Runtime", "generated"));
-
-                    // // Clean the generated code directory.
-                    // Directory.Delete(generatedRuntimePath, true);
-                    // Directory.CreateDirectory(generatedRuntimePath);
+                    Console.WriteLine("**** Compiling for Universal Windows Platform Player");
+                    unity.Run(new[]
+                    {
+                        "-batchmode",
+                        "-nographics",
+                        "-projectPath",
+                        Utility.ProjectRoot,
+                        "-buildTarget",
+                        "WindowsStoreApps",
+                        "-executeMethod",
+                        "CesiumForUnity.BuildCesiumForUnity.CompileForUWPAndExit"
+                    });
+
+                    Console.WriteLine("**** Adding generated files (for the UWP Player) to the package");
+                    AddGeneratedFiles("!UNITY_EDITOR && UNITY_WSA", generatedRuntimePath, Path.Combine(outputPackagePath, "Runtime", "generated"));
+
+                    // Clean the generated code directory.
+                    Directory.Delete(generatedRuntimePath, true);
+                    Directory.CreateDirectory(generatedRuntimePath);
+
+                    Console.WriteLine("**** Compiling for Windows Player");
+                    unity.Run(new[]
+                    {
+                        "-batchmode",
+                        "-nographics",
+                        "-projectPath",
+                        Utility.ProjectRoot,
+                        "-buildTarget",
+                        "Win64",
+                        "-executeMethod",
+                        "CesiumForUnity.BuildCesiumForUnity.CompileForWindowsAndExit"
+                    });
+
+                    Console.WriteLine("**** Adding generated files (for the Windows Player) to the package");
+                    AddGeneratedFiles("!UNITY_EDITOR && UNITY_STANDALONE_WIN", generatedRuntimePath, Path.Combine(outputPackagePath, "Runtime", "generated"));
+
+                    // Clean the generated code directory.
+                    Directory.Delete(generatedRuntimePath, true);
+                    Directory.CreateDirectory(generatedRuntimePath);
 
                     // TODO: we're currently only building for Android on Windows. This should be an option, or a separate build command.
                     Console.WriteLine("**** Compiling for Android Player");

diff --git a/Editor/CompileCesiumForUnityNative.cs b/Editor/CompileCesiumForUnityNative.cs
@@ -462,7 +462,6 @@ internal static void BuildNativeLibrary(LibraryToBuild library)
 
                     List<string> args = new List<string>()
                     {
-                        "--trace-expand",
                         "-B",
                         library.BuildDirectory,
                         "-S",
@@ -490,8 +489,7 @@ internal static void BuildNativeLibrary(LibraryToBuild library)
                         "--parallel",
                         (Environment.ProcessorCount + 1).ToString(),
                         "--target",
-                        "install",
-                        "--verbose"
+                        "install"
                     };
                     args.AddRange(library.ExtraBuildArgs);
                     startInfo.Arguments = string.Join(' ', args);