Include Discord SDK in launcher builds (#224)

Co-authored-by: Emma Miler <27428383+emma-miler@users.noreply.github.com>

.github/workflows/build.yml

@@ -11,30 +11,49 @@ jobs:
   build-launcher:
     runs-on: windows-2022
     steps:
-      - name: Checkout
+      - name: Setup bundled plugins
+        uses: actions/checkout@v2
+        with:
+          repository: R2Northstar/NorthstarDiscordRPC
+          path: discord-plugin
+      - name: Checkout launcher repository
         uses: actions/checkout@v2
         with:
           repository: R2Northstar/NorthstarLauncher
           ref: ${{ env.NORTHSTAR_VERSION }}
+          path: northstar-launcher
       - name: Setup MSBuild
         uses: microsoft/setup-msbuild@v1.1
       - name: Setup resource file version
         shell: bash
+        working-directory: northstar-launcher
         run: |
           sed -i 's/DEV/${{ env.NORTHSTAR_VERSION }}/g' LauncherInjector/resources.rc
           FILEVERSION=$(echo ${{ env.NORTHSTAR_VERSION }} | tr '.' ',' | tr -d '[:alpha:]')
-          sed -i "s/0,0,0,0/${FILEVERSION}/g" LauncherInjector/resources.rc
+          sed -i "s/0,0,0,1/${FILEVERSION}/g" LauncherInjector/resources.rc
       - name: Build
-        run: msbuild /p:Configuration=Release
+        working-directory: northstar-launcher 
-      - name: Upload Build Artifact
+        run: |
+          cp -r ../discord-plugin/*Discord* .
+          msbuild /p:Configuration=Release R2Northstar.sln
+          msbuild /p:Configuration=Release NorthstarDiscordRPC.sln
+      - name: Upload launcher build as artifact
         uses: actions/upload-artifact@v2
         with:
           name: northstar-launcher
           path: |
-            x64/Release/Northstar.dll
+            northstar-launcher/x64/Release/Northstar.dll
-            x64/Release/wsock32.dll
+            northstar-launcher/x64/Release/wsock32.dll
-            x64/Release/NorthstarLauncher.exe
+            northstar-launcher/x64/Release/NorthstarLauncher.exe
-            x64/Release/*.txt
+            northstar-launcher/x64/Release/discord_game_sdk.dll
+            northstar-launcher/x64/Release/DiscordRPC.dll
+            northstar-launcher/x64/Release/*.txt
+      - name: Upload debug build artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: launcher-debug-files
+          path: |
+            northstar-launcher/x64/Release/*.pdb
 
   build-northstar:
     needs: build-launcher
@@ -45,12 +64,15 @@ jobs:
         with:
           name: northstar-launcher
           path: northstar-launcher
-      - name: Checkout
+      - name: Download compiled stubs
+        run:
+          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
+      - name: Checkout release files
         uses: actions/checkout@v2
         with:
           ref: ${{ env.NORTHSTAR_VERSION }}
           path: northstar
-      - name: Checkout
+      - name: Checkout core mods
         uses: actions/checkout@v2
         with:
           repository: R2Northstar/NorthstarMods
@@ -62,13 +84,22 @@ jobs:
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Client/mod.json) > northstar-mods/Northstar.Client/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.Custom/mod.json) > northstar-mods/Northstar.Custom/mod.json
           cat <<< $(jq ".Version = \"${MOD_VERSION}\"" northstar-mods/Northstar.CustomServers/mod.json) > northstar-mods/Northstar.CustomServers/mod.json
-      - name: Download repositories
+      - name: Generate md5sum file
+        working-directory: northstar-mods
         run: |
-          mv northstar/release/* northstar/.
+          echo -e "# Check with 'md5sum -c md5sum.txt' at the root of mods folder\n" > md5sum.txt
+          git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt
+      - name: Make folder structure
+        run: |
+          mv -v northstar/release/* northstar/.
           mkdir -p northstar/R2Northstar/mods
+          mkdir -p northstar/R2Northstar/plugins
           mkdir -p northstar/bin/x64_retail
-          mv northstar-launcher/wsock32.dll northstar/bin/x64_retail
+          mv -v northstar-launcher/DiscordRPC.dll northstar/R2Northstar/plugins
-          mv northstar-launcher/* northstar
+          mv -v northstar-launcher/discord_game_sdk.dll northstar
+          mv -v northstar-launcher/wsock32.dll northstar/bin/x64_retail
+          unzip NorthstarStubs.zip -d northstar/bin/x64_dedi
+          mv -v northstar-launcher/* northstar
           rsync -avr --exclude="Northstar.Coop" --exclude=".git*" northstar-mods/. northstar/R2Northstar/mods
       - name: Cleanup
         run: |

README.md

@@ -15,9 +15,13 @@ Northstar is a modding framework client that allows users to host their own Tita
 Northstar's development is split into 4 repositories:
 
 1. [NorthstarLauncher](https://github.com/R2Northstar/NorthstarLauncher) (Code for the C++ hook DLL)
-2. [NorthstarMods](https://github.com/R2Northstar/NorthstarMods) (Code for the squirrel mods responsible for server gamelogic recreation and custom content)
+1. [NorthstarMods](https://github.com/R2Northstar/NorthstarMods) (Code for the squirrel mods responsible for server gamelogic recreation and custom content)
-3. [NorthstarMasterServer](https://github.com/R2Northstar/NorthstarMasterServer) (Responsible for server browser, authentication and persistence)
+1. [NorthstarMasterServer](https://github.com/R2Northstar/NorthstarMasterServer) (Responsible for server browser, authentication and persistence)
-4. [NorthstarWiki](https://github.com/R2Northstar/NorthstarWiki) (Documentation for Northstar)
+1. [NorthstarStubs](https://github.com/R2Northstar/NorthstarStubs) (D3D11 and GFSDK stubs for the Northstar dedicated server)
+
+The documentation is split into two repositories:
+1. [NorthstarWiki](https://github.com/R2Northstar/NorthstarWiki) (Wiki covering installation, hosting and configuration of Northstar)
+1. [ModdingDocs](https://github.com/R2Northstar/ModdingDocs) (Guides and tutorials on how to mod using Northstar)
 
 ## Special Thanks
   

release/r2ds.bat

@@ -1 +0,0 @@
-NorthstarLauncher.exe -dedicated -multiple