diff --git a/appveyor.yml b/appveyor.yml index fe3114fd4..ec942dcf7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -41,7 +41,7 @@ install: - "%PYTHON3% -m pip install --upgrade google-api-python-client" - "%PYTHON3% -V" - set QTDIR=C:\Qt\%qt% - - set PATH=%PATH%;%QTDIR%;%QTDIR%\bin;C:\MinGW\bin + - set PATH=%PATH%;%QTDIR%;%QTDIR%\bin;C:\MinGW\bin;%ProgramFiles(x86)%\NSIS before_build: - qmake --version @@ -85,10 +85,13 @@ after_build: echo "zipping done" & echo "what's inside?" & call 7z.exe l "pencil2d-win32-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%.zip" & + echo "creating installer" & + makensis /DBITS=32 "/DVERSION=%date:~-4,4%-%date:~-10,2%-%date:~7,2%" /DINSTALLFILES=..\..\build\Pencil2D ..\util\installer\installer.nsi & if %upload%==yes ( echo "deploying to google drive" & cd %APPVEYOR_BUILD_FOLDER%\util & call %PYTHON%\\python.exe nightly-build-upload.py "%WIN32_NIGHTLY_PARENT%" "%APPVEYOR_BUILD_FOLDER%\build\pencil2d-win32-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%.zip" & + call %PYTHON%\\python.exe nightly-build-upload.py "%WIN32_NIGHTLY_PARENT%" "%APPVEYOR_BUILD_FOLDER%\util\installer\pencil2d-win32-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%-install.exe" & echo "32 Bit deployed" ) ) - if %PLATFORM_%==amd64 ( @@ -111,8 +114,11 @@ after_build: echo "zipping done" & echo "what's inside?" & call 7z.exe l "pencil2d-win64-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%.zip" & + echo "creating installer" & + makensis /DBITS=64 "/DVERSION=%date:~-4,4%-%date:~-10,2%-%date:~7,2%" /DINSTALLFILES=..\..\build\Pencil2D ..\util\installer\installer.nsi & if %upload%==yes ( echo "deploying to google drive" & cd %APPVEYOR_BUILD_FOLDER%\util & call %PYTHON%\\python.exe nightly-build-upload.py "%WIN64_NIGHTLY_PARENT%" "%APPVEYOR_BUILD_FOLDER%\build\pencil2d-win64-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%.zip" & + call %PYTHON%\\python.exe nightly-build-upload.py "%WIN64_NIGHTLY_PARENT%" "%APPVEYOR_BUILD_FOLDER%\util\installer\pencil2d-win64-%date:~-4,4%"-"%date:~-10,2%"-"%date:~7,2%-install.exe" & echo "64 Bit Deployed" ) )