From 528c6f771a748609ac6666cc9494571f50d63fd8 Mon Sep 17 00:00:00 2001 From: mazmazz Date: Tue, 1 Jan 2019 11:35:09 -0500 Subject: [PATCH] Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer) --- appveyor.yml | 2 +- deployer/appveyor/deployer.bat | 42 ++++++++++++++++++---------------- 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0450b059b..f0f843fbb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -50,7 +50,7 @@ cache: - upx391w.zip - ccache.exe - C:\Users\appveyor\.ccache -- assets\deployer\archives +- C:\Users\appveyor\srb2_cache install: - if [%CONFIGURATION%] == [SDL64] ( set "X86_64=1" ) diff --git a/deployer/appveyor/deployer.bat b/deployer/appveyor/deployer.bat index 7b1bc68a8..fae388590 100644 --- a/deployer/appveyor/deployer.bat +++ b/deployer/appveyor/deployer.bat @@ -49,12 +49,14 @@ if [%APPVEYOR_REPO_TAG%] == [true] ( : Get asset archives :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -if [%ASSET_CLEAN%] == [1] ( - echo Cleaning asset archives... - rmdir /s /q "assets\deployer\archives" +if exist "C:\Users\appveyor\srb2_cache\archives\" ( + if [%ASSET_CLEAN%] == [1] ( + echo Cleaning asset archives... + rmdir /s /q "C:\Users\appveyor\srb2_cache\archives" + ) ) -if not exist "assets\deployer\archives" mkdir "assets\deployer\archives" +if not exist "C:\Users\appveyor\srb2_cache\archives\" mkdir "C:\Users\appveyor\srb2_cache\archives" goto EXTRACT_ARCHIVES @@ -69,7 +71,7 @@ for %%a in (%archivepath%) do ( set "filename=%%~nxa" ) -set "localarchivepath=assets\deployer\archives\%filename%" +set "localarchivepath=C:\Users\appveyor\srb2_cache\archives\%filename%" goto EOF @@ -112,20 +114,20 @@ if [%ASSET_FILES_OPTIONAL_GET%] == [1] ( : Build the installers :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -mkdir "assets\deployer\installer" -mkdir "assets\deployer\patch" +mkdir "assets\installer" +mkdir "assets\patch" -7z x -y "%ASSET_ARCHIVE_PATH_LOCAL%" -o"assets\deployer\installer" >null -7z x -y "%ASSET_ARCHIVE_PATCH_PATH_LOCAL%" -o"assets\deployer\patch" >null +7z x -y "%ASSET_ARCHIVE_PATH_LOCAL%" -o"assets\installer" >null +7z x -y "%ASSET_ARCHIVE_PATCH_PATH_LOCAL%" -o"assets\patch" >null : Copy optional files to full installer (music.dta) if [%ASSET_FILES_OPTIONAL_GET%] == [1] ( - 7z x -y "%ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL%" -o"assets\deployer\installer" >null + 7z x -y "%ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL%" -o"assets\installer" >null ) : Copy EXE -- BUILD_PATH is from appveyor.yml -robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\deployer\installer" /XF "*.debug" ".gitignore" -robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\deployer\patch" /XF "*.debug" ".gitignore" +robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\installer" /XF "*.debug" ".gitignore" +robocopy /S /ns /nc /nfl /ndl /np /njh /njs "%BUILD_PATH%" "assets\patch" /XF "*.debug" ".gitignore" : Are we building DD? (we were supposed to exit earlier!) if [%CONFIGURATION%] == [DD] ( set "DPL_INSTALLER_NAME=%DPL_INSTALLER_NAME%-DD" ) @@ -145,16 +147,16 @@ if not [%X86_64%] == [1] ( goto X86_INSTALL ) :::::::::::::::::::::::::::::::: : Extract DLL binaries -7z x -y "%ASSET_ARCHIVE_X64_PATH_LOCAL%" -o"assets\deployer\installer" >null +7z x -y "%ASSET_ARCHIVE_X64_PATH_LOCAL%" -o"assets\installer" >null if [%PACKAGE_PATCH_DLL_GET%] == [1] ( - 7z x -y "!ASSET_ARCHIVE_X64_PATH_LOCAL!" -o"assets\deployer\patch" >null + 7z x -y "!ASSET_ARCHIVE_X64_PATH_LOCAL!" -o"assets\patch" >null ) : Build the installer -7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-x64-Installer%INSTALLER_SUFFIX%.exe" .\assets\deployer\installer\* +7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-x64-Installer%INSTALLER_SUFFIX%.exe" .\assets\installer\* : Build the patch -7z a "%DPL_INSTALLER_NAME%-x64-Patch%INSTALLER_SUFFIX%.zip" .\assets\deployer\patch\* +7z a "%DPL_INSTALLER_NAME%-x64-Patch%INSTALLER_SUFFIX%.zip" .\assets\patch\* : Upload artifacts appveyor PushArtifact "%DPL_INSTALLER_NAME%-x64-Installer%INSTALLER_SUFFIX%.exe" @@ -168,16 +170,16 @@ goto EOF :::::::::::::::::::::::::::::::: : Extract DLL binaries -7z x -y "%ASSET_ARCHIVE_X86_PATH_LOCAL%" -o"assets\deployer\installer" >null +7z x -y "%ASSET_ARCHIVE_X86_PATH_LOCAL%" -o"assets\installer" >null if [%PACKAGE_PATCH_DLL_GET%] == [1] ( - 7z x -y "!ASSET_ARCHIVE_X86_PATH_LOCAL!" -o"assets\deployer\patch" >null + 7z x -y "!ASSET_ARCHIVE_X86_PATH_LOCAL!" -o"assets\patch" >null ) : Build the installer -7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-Installer%INSTALLER_SUFFIX%.exe" .\assets\deployer\installer\* +7z a -sfx7z.sfx "%DPL_INSTALLER_NAME%-Installer%INSTALLER_SUFFIX%.exe" .\assets\installer\* : Build the patch -7z a "%DPL_INSTALLER_NAME%-Patch%INSTALLER_SUFFIX%.zip" .\assets\deployer\patch\* +7z a "%DPL_INSTALLER_NAME%-Patch%INSTALLER_SUFFIX%.zip" .\assets\patch\* : Upload artifacts appveyor PushArtifact "%DPL_INSTALLER_NAME%-Installer%INSTALLER_SUFFIX%.exe"