Merge pull request #3435 from CombatExtended-Continued/Further-rosyln…

…-changes Make BuildCompat.py aware of new roslyn csc
CombatExtended-Continued · Sep 21, 2024 · 3946253 · 3946253
2 parents 43a3e68 + 75a7e99
commit 3946253
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -28,7 +28,7 @@ jobs:
         
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
         
     - name: package
       run: |

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -42,7 +42,7 @@ jobs:
 
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
         
     - name: package
       run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ jobs:
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer --csc $PWD/csc
     - name: build compat
       run: |
-        TEMP=${{ runner.temp }}/ python BuildCompat.py
+        TEMP=${{ runner.temp }}/ python BuildCompat.py --csc $PWD/csc
     - name: package
       run: |
         mkdir CombatExtended

diff --git a/BuildCompat.py b/BuildCompat.py
@@ -10,6 +10,8 @@
 
 parallel = '-j' in sys.argv
 
+csc = sys.argv[sys.argv.index("--csc") + 1]
+
 PROJECT_PATTERN = re.compile(r'''Project.".[0-9A-Za-z]{8}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{4}-[0-9A-Za-z]{12}.". = '''
                              r'''"([0-9a-zA-Z]+Compat)", '''
                              r'''"([0-9A-zA-Z\/]+.csproj)", '''
@@ -52,7 +54,7 @@ def system(*cmd):
                             output = od.child(name+".dll")
 
             print(f"Building {name}")
-            system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--", "-r:Assemblies/CombatExtended.dll")
+            system("python3", "Make.py", "--csproj", csproj.path, "--output", output.path, DOWNLOAD_LIBS, "--all-libs", "--publicizer", PUBLICIZER, "--csc", csc, "--", "-r:Assemblies/CombatExtended.dll")
 
 for t in tasks:
     t.wait()