From e8a64af18c42a4e841f64ae418e2d80e8e878eea Mon Sep 17 00:00:00 2001 From: Natsumi Date: Thu, 5 Aug 2021 00:38:55 +1200 Subject: [PATCH] Update build scripts --- build-7z.cmd | 2 +- build-all.ps1 | 37 +++++++++++++++++++++++++++++++++++++ build.cmd | 2 +- make-zip-7z.cmd | 2 +- make-zip.cmd | 2 +- 5 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 build-all.ps1 diff --git a/build-7z.cmd b/build-7z.cmd index 60afd731..46a87ea5 100644 --- a/build-7z.cmd +++ b/build-7z.cmd @@ -19,7 +19,7 @@ set ZIP_NAME=VRCX_%TODAY%.zip echo %ZIP_NAME% rem using 7-Zip (https://www.7-zip.org) cd "%~dp0\bin\x64\Release" -%ZIP_BIN% a -tzip %ZIP_NAME% * -mx=7 -xr0!cache -xr0!userdata -xr0!*.log -xr0!VRCX.json -xr0!VRCX.sqlite3 +%ZIP_BIN% a -tzip %ZIP_NAME% * -mx=7 -xr0!cache -xr0!userdata -xr0!*.log -xr0!*.json -xr0!*.sqlite3 -xr0!*.pdb -xr0!*.config cd "%~dp0" move "%~dp0\bin\x64\Release\%ZIP_NAME%" "%~dp0" rd "%~dp0\bin\x64\Release\html" diff --git a/build-all.ps1 b/build-all.ps1 new file mode 100644 index 00000000..90a2bfcf --- /dev/null +++ b/build-all.ps1 @@ -0,0 +1,37 @@ +$ErrorActionPreference = "Stop" + +$installPath = &"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -version 16.0 -property installationpath +Import-Module (Join-Path $installPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll") +Enter-VsDevShell -VsInstallPath $installPath -SkipAutomaticLocation + +$Date = Get-Date -format yyyyMMdd +$ZipName = "VRCX_" + $Date + ".zip" +$SetupName = "VRCX_" + $Date + "_Setup.exe" + +Write-Host "Building .Net..." -ForegroundColor Green +msbuild VRCX.sln /p:Configuration=Release /p:Platform=x64 -m + +Write-Host "Building Node.js..." -ForegroundColor Green +cd "html" +Remove-Item -Path "node_modules" -Force -Recurse -ErrorAction SilentlyContinue +npm ci +npm run prod +cd .. +Remove-Item -Path "bin\x64\Release\html" -Force -Recurse -ErrorAction SilentlyContinue +New-Item -ItemType Junction -Path "bin\x64\Release\html" -Target "html\dist" + +Write-Host "Creating Zip..." -ForegroundColor Green +cd "bin\x64\Release" +7z a -tzip $ZipName * -mx=7 -xr0!cache -xr0!userdata -xr0!"*.log" -xr0!"*.json" -xr0!"*.sqlite3" -xr0!"*.pdb" -xr0!"*.config" +Move-Item $ZipName ..\..\..\$ZipName -Force +cd ..\..\..\ + +Write-Host "Creating Installer..." -ForegroundColor Green +cd "Installer" +$nsisPath = "C:\Program Files (x86)\NSIS\makensis.exe" +&$nsisPath installer.nsi +Start-Sleep -Seconds 1 +Move-Item VRCX_Setup.exe ..\$SetupName -Force +cd .. + +Write-Host "Done!" -ForegroundColor Green \ No newline at end of file diff --git a/build.cmd b/build.cmd index f31eaa71..09063e8d 100644 --- a/build.cmd +++ b/build.cmd @@ -13,7 +13,7 @@ set ZIP_NAME=VRCX_%TODAY%.zip echo %ZIP_NAME% rem using bandizip (https://www.bandisoft.com/bandizip) cd "%~dp0\bin\x64\Release" -bz c -l:9 -r -storeroot:yes -ex:"cache;userdata;*.log;VRCX.json;VRCX.sqlite3" -cmt:"https://github.com/pypy-vrc/VRCX" %ZIP_NAME% * +bz c -l:9 -r -storeroot:yes -ex:"cache;userdata;*.log;*.json;*.sqlite3;*.pdb;*.config" -cmt:"https://github.com/pypy-vrc/VRCX" %ZIP_NAME% * cd "%~dp0" move "%~dp0\bin\x64\Release\%ZIP_NAME%" "%~dp0" rd "%~dp0\bin\x64\Release\html" diff --git a/make-zip-7z.cmd b/make-zip-7z.cmd index 8beaf702..77541a64 100644 --- a/make-zip-7z.cmd +++ b/make-zip-7z.cmd @@ -11,7 +11,7 @@ set ZIP_NAME=VRCX_%TODAY%.zip echo %ZIP_NAME% rem using 7-Zip (https://www.7-zip.org) cd "%~dp0\bin\x64\Release" -%ZIP_BIN% a -tzip %ZIP_NAME% * -mx=7 -xr0!cache -xr0!userdata -xr0!*.log -xr0!VRCX.json -xr0!VRCX.sqlite3 +%ZIP_BIN% a -tzip %ZIP_NAME% * -mx=7 -xr0!cache -xr0!userdata -xr0!*.log -xr0!*.json -xr0!*.sqlite3 -xr0!*.pdb -xr0!*.config cd "%~dp0" move "%~dp0\bin\x64\Release\%ZIP_NAME%" "%~dp0" pause diff --git a/make-zip.cmd b/make-zip.cmd index 02749c67..db35d259 100644 --- a/make-zip.cmd +++ b/make-zip.cmd @@ -5,7 +5,7 @@ set ZIP_NAME=VRCX_%TODAY%.zip echo %ZIP_NAME% rem using bandizip (https://www.bandisoft.com/bandizip) cd "%~dp0\bin\x64\Release" -bz c -l:9 -r -storeroot:yes -ex:"cache;userdata;*.log;VRCX.json;VRCX.sqlite3" -cmt:"https://github.com/pypy-vrc/VRCX" %ZIP_NAME% * +bz c -l:9 -r -storeroot:yes -ex:"cache;userdata;*.log;*.json;*.sqlite3;*.pdb;*.config" -cmt:"https://github.com/pypy-vrc/VRCX" %ZIP_NAME% * cd "%~dp0" move "%~dp0\bin\x64\Release\%ZIP_NAME%" "%~dp0" pause