aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New key to disable creating a Windows installer.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-06-19 19:11:41 +03:00
parent 663ab8aff1
commit 4243804f55
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.yml
View File

@ -146,7 +146,7 @@ before_build:
# to run your custom scripts instead of automatic MSBuild # to run your custom scripts instead of automatic MSBuild
build_script: build_script:
- cd build - 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) - if not "%QMAKE_GENERATOR%" == "MinGW Makefiles" (nmake -s) else (mingw32-make)
# to run your custom scripts instead of automatic tests # to run your custom scripts instead of automatic tests
@ -195,7 +195,7 @@ deploy:
package: valentina-win_auto-upload package: valentina-win_auto-upload
publish: true publish: true
override: true override: true
version: 0.5 version: 0.6
on: on:
DEPLOY: true DEPLOY: true
artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_COMMIT) artifact: valentina-win-$(QT_VERSION)-$(APPVEYOR_REPO_COMMIT)

4
src/app/valentina/valentina.pro
View File

@ -382,6 +382,9 @@ win32:*-g++ {
package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
INSTALLS += package_printsupport INSTALLS += package_printsupport
noWindowsInstaller{ # For enable run qmake with CONFIG+=noWindowsInstaller
#do nothing
} else {
SCP_FOUND = false SCP_FOUND = false
exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") { exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe" INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe"
@ -412,6 +415,7 @@ win32:*-g++ {
message("Inno Setup was not found!") message("Inno Setup was not found!")
} }
} }
}
win32 { win32 {
for(DIR, INSTALL_PDFTOPS) { for(DIR, INSTALL_PDFTOPS) {