added some missing mono-support stuff

blazium-engine · Nov 24, 2024 · cfe085d · cfe085d
1 parent 641f2fb
commit cfe085d
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 11 deletions.
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -198,8 +198,8 @@ jobs:
           mkdir -p modules/mono/glue/GodotSharp/GodotSharpEditor
 
           # Move the extracted folders to their target locations
-          mv temp_extract/GodotSharp/* modules/mono/glue/GodotSharp/GodotSharp/
-          mv temp_extract/GodotSharpEditor/* modules/mono/glue/GodotSharp/GodotSharpEditor/
+          cp -r temp_extract/GodotSharp/. modules/mono/glue/GodotSharp/GodotSharp/
+          cp -r temp_extract/GodotSharpEditor/. modules/mono/glue/GodotSharp/GodotSharpEditor/
 
           # Clean up the temporary directory
           rm -rf temp_extract monoglue.tar.gz
@@ -212,6 +212,13 @@ jobs:
           target: ${{ matrix.target }}
           tests: ${{ matrix.tests }}
 
+      - name: Building C# Assemblies
+        if: matrix.mono
+        run: |
+          pushd platform/android/java
+          ./gradlew generateGodotMonoTemplates
+          popd
+          
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with:

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -259,19 +259,25 @@ jobs:
           mkdir -p modules/mono/glue/GodotSharp/GodotSharpEditor
 
           # Move the extracted folders to their target locations
-          mv temp_extract/GodotSharp/* modules/mono/glue/GodotSharp/GodotSharp/
-          mv temp_extract/GodotSharpEditor/* modules/mono/glue/GodotSharp/GodotSharpEditor/
+          cp -r temp_extract/GodotSharp/. modules/mono/glue/GodotSharp/GodotSharp/
+          cp -r temp_extract/GodotSharpEditor/. modules/mono/glue/GodotSharp/GodotSharpEditor/
 
           # Clean up the temporary directory
           rm -rf temp_extract monoglue.tar.gz
-      
+          
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:
           sconsflags: ${{ env.SCONSFLAGS }} ${{ matrix.sconsflags }}
           platform: linuxbsd
           target: ${{ matrix.target }}
 
+      - name: Building C# Assemblies
+        if: matrix.mono
+        run: |
+          ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=linuxbsd
+
+
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with:

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -184,8 +184,8 @@ jobs:
           mkdir -p modules/mono/glue/GodotSharp/GodotSharpEditor
 
           # Move the extracted folders to their target locations
-          mv temp_extract/GodotSharp/* modules/mono/glue/GodotSharp/GodotSharp/
-          mv temp_extract/GodotSharpEditor/* modules/mono/glue/GodotSharp/GodotSharpEditor/
+          cp -r temp_extract/GodotSharp/. modules/mono/glue/GodotSharp/GodotSharp/
+          cp -r temp_extract/GodotSharpEditor/. modules/mono/glue/GodotSharp/GodotSharpEditor/
 
           # Clean up the temporary directory
           rm -rf temp_extract monoglue.tar.gz

diff --git a/.github/workflows/mono_glue_build.yml b/.github/workflows/mono_glue_build.yml
@@ -189,8 +189,8 @@ jobs:
           mkdir -p combined/GodotSharp
           mkdir -p combined/GodotSharpEditor
 
-          cp -r ./modules/mono/glue/GodotSharp/GodotSharp/Generated/* combined/GodotSharp/
-          cp -r ./modules/mono/glue/GodotSharp/GodotSharpEditor/Generated/* combined/GodotSharpEditor
+          cp -r ./modules/mono/glue/GodotSharp/GodotSharp/Generated combined/GodotSharp/
+          cp -r ./modules/mono/glue/GodotSharp/GodotSharpEditor/Generated combined/GodotSharpEditor/
           cd combined
           tar -czvf ../${{ env.DEPLOY_TYPE }}-${{ github.event.client_payload.type || 'nightly' }}.tar.gz .
           cd ..

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -297,8 +297,8 @@ jobs:
           mkdir -p modules/mono/glue/GodotSharp/GodotSharpEditor
 
           # Move the extracted folders to their target locations
-          mv temp_extract/GodotSharp/* modules/mono/glue/GodotSharp/GodotSharp/
-          mv temp_extract/GodotSharpEditor/* modules/mono/glue/GodotSharp/GodotSharpEditor/
+          cp -r temp_extract/GodotSharp/. modules/mono/glue/GodotSharp/GodotSharp/
+          cp -r temp_extract/GodotSharpEditor/. modules/mono/glue/GodotSharp/GodotSharpEditor/
 
           # Clean up the temporary directory
           rm -rf temp_extract monoglue.tar.gz
@@ -326,6 +326,12 @@ jobs:
           platform: windows
           target: ${{ matrix.target }}
 
+      - name: Building C# Assemblies
+        if: matrix.mono
+        run: |
+          ./modules/mono/build_scripts/build_assemblies.py --godot-output-dir=./bin --godot-platform=windows
+
+
       - name: Save Godot build cache
         uses: ./.github/actions/godot-cache-save
         with: