Merge branch 'main' of https://github.com/geode-sdk/geode into main

geode-sdk · Jul 31, 2023 · e64e6bc · e64e6bc
2 parents 5a1d780 + 7ef551c
commit e64e6bc
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
           extra_flags: "-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13"
           out_paths: './bin/nightly/Geode.dylib ./bin/nightly/GeodeBootstrapper.dylib ./loader/include/link/libfmod.dylib'
           cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode'
-          
+
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
@@ -56,11 +56,11 @@ jobs:
         tarBall: false
         zipBall: false
         out-file-path: "cli" 
-    
+
     - name: Unzip CLI
       run: |
         7z x "${{ github.workspace }}/cli/*-${{ matrix.config.os_identifier }}.zip" -o"${{ github.workspace }}/cli"
-    
+
     - name: Add CLI to Path
       run: |
         ${{ matrix.config.cli_cmd }}
@@ -86,13 +86,13 @@ jobs:
       run: |
         mkdir ./out
         mv ${{ matrix.config.out_paths }} ./out
-    
+
     - name: Get version
       uses: juliangruber/read-file-action@v1.1.6
       with:
         path: ${{ github.workspace }}/VERSION
       id: version
-      
+
     - name: Trim whitespace from version
       shell: bash
       run: echo "VERSION_TRIM=$(echo '${{ steps.version.outputs.content }}' | xargs)" >> $GITHUB_ENV
@@ -112,33 +112,55 @@ jobs:
       with:
         name: geode-v${{ env.VERSION_TRIM }}-${{ matrix.config.os_identifier }}
         path: ./out
-        
+
     - name: Package MacOS
       run: |
         cp -R ./bin/nightly/resources ./out/resources
         ./installer/mac/package.sh ./out ./out/geode-installer-v${{ env.VERSION_TRIM }}-${{ matrix.config.os_identifier }}.pkg
       if: matrix.config.os_identifier == 'mac'
-      
+
     - name: Publish MacOS Installer
       uses: actions/upload-artifact@v2
       with:
         name: geode-installer-v${{ env.VERSION_TRIM }}-${{ matrix.config.os_identifier }}
         path: ./out/geode-installer-v${{ env.VERSION_TRIM }}-${{ matrix.config.os_identifier }}.pkg
       if: matrix.config.os_identifier == 'mac'
 
+    - name: Install NSIS
+      run: |
+        iwr -useb get.scoop.sh -outfile 'install.ps1'
+        .\install.ps1 -RunAsAdmin
+        scoop update
+        scoop bucket add extras
+        scoop install nsis
+      if: matrix.config.os_identifier == 'win'
+
+    - name: Package Windows
+      run: |
+        cd ./installer/windows
+        makensis -WX -V3 installer.nsi
+      if: matrix.config.os_identifier == 'win'
+
+    - name: Publish Windows Installer
+      uses: actions/upload-artifact@v2
+      with:
+        name: GeodeInstaller_v${{ env.VERSION_TRIM }}-${{ matrix.config.os_identifier }}
+        path: ./installer/windows/GeodeInstaller.exe
+      if: matrix.config.os_identifier == 'win'
+
   publish:
     runs-on: ubuntu-latest
     needs: build
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v2
-      
+
       - name: Get version
         uses: juliangruber/read-file-action@v1.1.6
         with:
           path: ${{ github.workspace }}/VERSION
         id: version
-        
+
       - name: Trim whitespace from version
         shell: bash
         run: echo "VERSION_TRIM=$(echo '${{ steps.version.outputs.content }}' | xargs)" >> $GITHUB_ENV

diff --git a/installer/windows/installer.nsi b/installer/windows/installer.nsi
@@ -47,7 +47,7 @@
     ;!insertmacro GEODE_LANGUAGE "Spanish"
     ;!insertmacro GEODE_LANGUAGE "SpanishInternational" (idk what's the difference)
     ;!insertmacro GEODE_LANGUAGE "Swedish"
-    ;!insertmacro GEODE_LANGUAGE "Finnish"
+    !insertmacro GEODE_LANGUAGE "Finnish"
     !insertmacro GEODE_LANGUAGE "Russian"
     ;!insertmacro GEODE_LANGUAGE "Portuguese"
     ;!insertmacro GEODE_LANGUAGE "PortugueseBR" (idk what's the difference)
@@ -332,7 +332,11 @@ Section "Geode"
     File ${BINDIR}\GeodeUpdater.exe
     File ${BINDIR}\XInput9_1_0.dll
 
-    CreateDirectory $INSTDIR\geode
+    CreateDirectory $INSTDIR\geode\resources\geode.loader
+    SetOutPath $INSTDIR\geode\resources\geode.loader
+
+    File /r ${BINDIR}\resources\*
+
     WriteUninstaller "geode\Uninstall.exe"
 SectionEnd