New key to disable creating a Windows installer.
--HG-- branch : develop
This commit is contained in:
parent
663ab8aff1
commit
4243804f55
|
@ -146,7 +146,7 @@ before_build:
|
|||
# to run your custom scripts instead of automatic MSBuild
|
||||
build_script:
|
||||
- cd build
|
||||
- if "%DEPLOY%" == "true" (qmake ..\Valentina.pro -r CONFIG+=no_ccache CONFIG+=checkWarnings) else (qmake ..\Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings)
|
||||
- if "%DEPLOY%" == "true" (qmake ..\Valentina.pro -r CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noWindowsInstaller) else (qmake ..\Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings)
|
||||
- if not "%QMAKE_GENERATOR%" == "MinGW Makefiles" (nmake -s) else (mingw32-make)
|
||||
|
||||
# to run your custom scripts instead of automatic tests
|
||||
|
@ -195,7 +195,7 @@ deploy:
|
|||
package: valentina-win_auto-upload
|
||||
publish: true
|
||||
override: true
|
||||
version: 0.5
|
||||
version: 0.6
|
||||
on:
|
||||
DEPLOY: true
|
||||
artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_COMMIT)
|
||||
|
|
|
@ -382,6 +382,9 @@ win32:*-g++ {
|
|||
package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
|
||||
INSTALLS += package_printsupport
|
||||
|
||||
noWindowsInstaller{ # For enable run qmake with CONFIG+=noWindowsInstaller
|
||||
#do nothing
|
||||
} else {
|
||||
SCP_FOUND = false
|
||||
exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") {
|
||||
INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe"
|
||||
|
@ -411,6 +414,7 @@ win32:*-g++ {
|
|||
} else {
|
||||
message("Inno Setup was not found!")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
win32 {
|
||||
|
|
Loading…
Reference in New Issue
Block a user