diff --git a/.github/workflows/build-engine.yml b/.github/workflows/build-engine.yml index e6268ee630..96fa7439d5 100644 --- a/.github/workflows/build-engine.yml +++ b/.github/workflows/build-engine.yml @@ -152,7 +152,7 @@ jobs: config: - Release platform: - - Win32 + - x86 runs-on: ${{ matrix.system }} @@ -165,7 +165,7 @@ jobs: - name: Get binaries uses: actions/download-artifact@v3 with: - name: utils-bin-x86-${{ matrix.config }}-${{ github.sha }} + name: bin-utils-(${{ matrix.platform }}-${{ matrix.config }})-(${{ github.sha }}) path: bin/utils/Win32/${{ matrix.config }}/ - name: Generate patch diff --git a/pack-artifacts.bat b/pack-artifacts.bat new file mode 100644 index 0000000000..b1ac0c998f --- /dev/null +++ b/pack-artifacts.bat @@ -0,0 +1,108 @@ +:: Deleting unnecessary files +del "bin\*.ilk" /s +del "bin\*.lib" /s +del "bin\*.exp" /s +del "lib\*.idb" /s +del "lib\*.pdb" /s + +:: Packing packages +"%ProgramFiles%"\7-Zip\7z.exe a "packages.zip" "packages" + +:: Packing engine binaries +"%ProgramFiles%"\7-Zip\7z.exe a "bin-engine-debug.zip" "bin\Win32\Debug" ^ + -ir!"bin\Win32\Debug\*" ^ + -xr!"*.pdb" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-engine-mixed.zip" "bin\Win32\Mixed" ^ + -ir!"bin\Win32\Mixed\*" ^ + -xr!"*.pdb" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-engine-release.zip" "bin\Win32\Release" ^ + -ir!"bin\Win32\Release\*" ^ + -xr!"*.pdb" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" + +:: Packing server binaries +"%ProgramFiles%"\7-Zip\7z.exe a "bin-server-debug.zip" "bin\dedicated\Win32\Debug" ^ + -ir!"bin\dedicated\Win32\Debug\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-server-mixed.zip" "bin\dedicated\Win32\Mixed" ^ + -ir!"bin\dedicated\Win32\Mixed\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-server-release.zip" "bin\dedicated\Win32\Release" ^ + -ir!"bin\dedicated\Win32\Release\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" + +:: Packing utility binaries +"%ProgramFiles%"\7-Zip\7z.exe a "bin-utils-debug.zip" "bin\utils\Win32\Debug" ^ + -ir!"bin\utils\Win32\Debug\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-utils-mixed.zip" "bin\utils\Win32\Mixed" ^ + -ir!"bin\utils\Win32\Mixed\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "bin-utils-release.zip" "bin\utils\Win32\Release" ^ + -ir!"bin\utils\Win32\Release\*" ^ + -xr!"*.pdb" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" + +:: Packing engine libraries +"%ProgramFiles%"\7-Zip\7z.exe a "lib-engine-debug.zip" "lib\Win32\Debug" ^ + -ir!"lib\Win32\Debug\*" ^ + -xr!"lib\utils\Win32\*" -xr!"lib\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-engine-mixed.zip" "lib\Win32\Mixed" ^ + -ir!"lib\Win32\Mixed\*" ^ + -xr!"lib\utils\Win32\*" -xr!"lib\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-engine-release.zip" "lib\Win32\Release" ^ + -ir!"lib\Win32\Release\*" ^ + -xr!"lib\utils\Win32\*" -xr!"lib\dedicated\Win32\*" + +:: Packing server libraries +"%ProgramFiles%"\7-Zip\7z.exe a "lib-server-debug.zip" "lib\dedicated\Win32\Debug" ^ + -ir!"lib\dedicated\Win32\Debug\*" ^ + -xr!"lib\Win32\*" -xr!"lib\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-server-mixed.zip" "lib\dedicated\Win32\Mixed" ^ + -ir!"lib\dedicated\Win32\Mixed\*" ^ + -xr!"lib\Win32\*" -xr!"lib\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-server-release.zip" "lib\dedicated\Win32\Release" ^ + -ir!"lib\dedicated\Win32\Release\*" ^ + -xr!"lib\Win32\*" -xr!"lib\utils\Win32\*" + +:: Packing utility libraries +"%ProgramFiles%"\7-Zip\7z.exe a "lib-utils-debug.zip" "lib\utils\Win32\Debug" ^ + -ir!"lib\utils\Win32\Debug\*" ^ + -xr!"lib\Win32\*" -xr!"lib\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-utils-mixed.zip" "lib\utils\Win32\Mixed" ^ + -ir!"lib\utils\Win32\Mixed\*" ^ + -xr!"lib\Win32\*" -xr!"lib\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "lib-utils-release.zip" "lib\utils\Win32\Release" ^ + -ir!"lib\utils\Win32\Release\*" ^ + -xr!"lib\Win32\*" -xr!"lib\dedicated\Win32\*" + +:: Packing engine symbols +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-engine-debug.zip" "bin\Win32\Debug" ^ + -ir!"bin\Win32\Debug\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-engine-mixed.zip" "bin\Win32\Mixed" ^ + -ir!"bin\Win32\Mixed\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-engine-release.zip" "bin\Win32\Release" ^ + -ir!"bin\Win32\Release\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\utils\Win32\*" -xr!"bin\dedicated\Win32\*" + +:: Packing server symbols +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-server-debug.zip" "bin\dedicated\Win32\Debug" ^ + -ir!"bin\dedicated\Win32\Debug\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-server-mixed.zip" "bin\dedicated\Win32\Mixed" ^ + -ir!"bin\dedicated\Win32\Mixed\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-server-release.zip" "bin\dedicated\Win32\Release" ^ + -ir!"bin\dedicated\Win32\Release\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\utils\Win32\*" + +:: Packing utility symbols +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-utils-debug.zip" "bin\utils\Win32\Debug" ^ + -ir!"bin\utils\Win32\Debug\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-utils-mixed.zip" "bin\utils\Win32\Mixed" ^ + -ir!"bin\utils\Win32\Mixed\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" +"%ProgramFiles%"\7-Zip\7z.exe a "pdb-utils-release.zip" "bin\utils\Win32\Release" ^ + -ir!"bin\utils\Win32\Release\*" ^ + -xr!"*.exe" -xr!"*.dll" -xr!"bin\Win32\*" -xr!"bin\dedicated\Win32\*" diff --git a/src/Compressor.targets b/src/Compressor.targets index ae2856d2b5..f8b9925994 100644 --- a/src/Compressor.targets +++ b/src/Compressor.targets @@ -3,4 +3,8 @@ + + + + diff --git a/src/Mixed.targets b/src/Mixed.targets index 20f4cc7979..0c2feda19f 100644 --- a/src/Mixed.targets +++ b/src/Mixed.targets @@ -5,6 +5,7 @@ + @@ -13,4 +14,16 @@ + + + + + + + + + + + + diff --git a/src/Server.targets b/src/Server.targets index f75135b081..e7a9dc9979 100644 --- a/src/Server.targets +++ b/src/Server.targets @@ -1,21 +1,60 @@ - - $(MSBuildThisFileDirectory)\..\bin\ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + diff --git a/src/xrEngine/xrServer.vcxproj b/src/xrEngine/xrServer.vcxproj index 2d1ceae741..ce134439b6 100644 --- a/src/xrEngine/xrServer.vcxproj +++ b/src/xrEngine/xrServer.vcxproj @@ -497,4 +497,5 @@ + \ No newline at end of file