diff --git a/.appveyor.yml b/.appveyor.yml index cdd5d00..fd426c6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,17 +14,17 @@ init: - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %VCARCH% before_build: - - set PATH="%QTDIR%\bin";"C:\Program Files (x86)\Inno Setup 5";%PATH% + - set PATH="%QTDIR%\bin";%PATH% build_script: - call "%APPVEYOR_BUILD_FOLDER%\build\windows.bat" artifacts: - path: deploy\*.exe - name: installers + path: deploy\*.zip + name: archives deploy: - artifact: installers + artifact: archives auth_token: secure: ix7WdDQD0JcTBi17m9okMiMff3BKaGuKnRroi6m+dvsB4xxtnInfYuwgAD3Uayuw description: 'Deployed from continuous integration.' diff --git a/apkstudio.pro b/apkstudio.pro index 4d223fc..e4d377a 100644 --- a/apkstudio.pro +++ b/apkstudio.pro @@ -57,7 +57,6 @@ RESOURCES += \ build/windows.bat \ resources/all.qrc \ resources/apkstudio.desktop \ - resources/apkstudio.iss \ .appveyor.yml \ .travis.yml \ README.md diff --git a/build/windows.bat b/build/windows.bat index 55a6d3f..e00ebc7 100755 --- a/build/windows.bat +++ b/build/windows.bat @@ -15,4 +15,4 @@ mkdir %APPVEYOR_BUILD_FOLDER%\deploy set SETUP_FILE_PREFIX=ApkStudio if not "%APPVEYOR_REPO_TAG_NAME%"=="" set SETUP_FILE_PREFIX=%SETUP_FILE_PREFIX%-%APPVEYOR_REPO_TAG_NAME% -iscc /O"%APPVEYOR_BUILD_FOLDER%\deploy" /F"%SETUP_FILE_PREFIX%-%VCARCH%" "%APPVEYOR_BUILD_FOLDER%\resources\apkstudio.iss" +7z a "%APPVEYOR_BUILD_FOLDER%\deploy\%SETUP_FILE_PREFIX%-%VCARCH%.zip" "%DEPLOYMENT_DIR%\*" diff --git a/resources/apkstudio.iss b/resources/apkstudio.iss deleted file mode 100644 index 199577c..0000000 --- a/resources/apkstudio.iss +++ /dev/null @@ -1,21 +0,0 @@ -#define DeploymentDir GetEnv("DEPLOYMENT_DIR") - -[Files] -Source: "{#DeploymentDir}\*"; DestDir: "{app}"; Flags: recursesubdirs - -[Setup] -AppName="APK Studio" -AppVersion=1.0 -Compression=lzma2 -DefaultDirName="{pf}\VPZ\APK Studio" -DefaultGroupName="VPZ\APK Studio" -SolidCompression=yes -UninstallDisplayIcon="{app}\ApkStudio.exe" - -[Run] -Filename: "{app}\ApkStudio.exe"; Description: "Launch APK Studio"; Flags: nowait postinstall runasoriginaluser skipifsilent unchecked - -[Icons] -Name: "{userdesktop}\APK Studio"; Filename: "{app}\ApkStudio.exe" -Name: "{group}\APK Studio"; Filename: "{app}\ApkStudio.exe" -Name: "{group}\Uninstall"; Filename: "{uninstallexe}"