diff --git a/.gitignore b/.gitignore index 395028d..27860a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,8 @@ debug release assets +bin +Makefile* *.vcxproj* *.log *.vs diff --git a/appveyor.yml b/appveyor.yml index 7dab24b..3c215a3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,6 +14,7 @@ init: build_script: - call "build_windows.cmd" + - call "package.cmd" artifacts: - path: bin\win64\AdvancedSettings.zip diff --git a/build_windows.cmd b/build_windows.cmd index 928d7cd..ffa19e3 100644 --- a/build_windows.cmd +++ b/build_windows.cmd @@ -21,22 +21,5 @@ rd /s /q AdvancedSettings\moc\ rd /s /q AdvancedSettings\obj\ rd /s /q AdvancedSettings\qrc\ -echo Copying project files for archival... -copy "%project_dir%\Readme.md" "AdvancedSettings\Readme.md" -copy "%project_dir%\LICENSE" "AdvancedSettings\LICENSE.txt" -xcopy /Y /E /I "%project_dir%\src\res" "AdvancedSettings\res\" -copy "%project_dir%\src\restartvrserver.bat" "AdvancedSettings\restartvrserver.bat" -copy "%project_dir%\src\startdesktopmode.bat" "AdvancedSettings\startdesktopmode.bat" -copy "%project_dir%\src\qt.conf" "AdvancedSettings\qt.conf" -copy "%project_dir%\src\manifest.vrmanifest" "AdvancedSettings\manifest.vrmanifest" -copy "%project_dir%\third-party\openvr\bin\win64\openvr_api.dll" "AdvancedSettings\openvr_api.dll" - -echo Packaging portable archive... -7z a AdvancedSettings.zip AdvancedSettings - -echo Creating installer... -cd %project_dir%/installer -makensis installer.nsi - set PATH=%original_path% cd %project_dir% diff --git a/package.cmd b/package.cmd new file mode 100644 index 0000000..9d20f8f --- /dev/null +++ b/package.cmd @@ -0,0 +1,20 @@ +echo on + +cd %project_dir%\bin\win64\ + +echo Copying project files for archival... +copy "%project_dir%\Readme.md" "AdvancedSettings\Readme.md" +copy "%project_dir%\LICENSE" "AdvancedSettings\LICENSE.txt" +xcopy /Y /E /I "%project_dir%\src\res" "AdvancedSettings\res\" +copy "%project_dir%\src\restartvrserver.bat" "AdvancedSettings\restartvrserver.bat" +copy "%project_dir%\src\startdesktopmode.bat" "AdvancedSettings\startdesktopmode.bat" +copy "%project_dir%\src\qt.conf" "AdvancedSettings\qt.conf" +copy "%project_dir%\src\manifest.vrmanifest" "AdvancedSettings\manifest.vrmanifest" +copy "%project_dir%\third-party\openvr\bin\win64\openvr_api.dll" "AdvancedSettings\openvr_api.dll" + +echo Packaging portable archive... +7z a AdvancedSettings.zip AdvancedSettings + +echo Creating installer... +cd %project_dir%/installer +makensis installer.nsi