aw/valentina
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
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)

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

@ -382,34 +382,38 @@ win32:*-g++ {
package_printsupport.files += $$[QT_INSTALL_PLUGINS]/printsupport/windowsprintersupport.dll
INSTALLS += package_printsupport
SCP_FOUND = false
exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe"
SCP_FOUND = true
} else {
exists("C:/Program Files/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files/Inno Setup 5/iscc.exe"
SCP_FOUND = true
}
}
if($$SCP_FOUND) {
package_inno.path = $${OUT_PWD}/../../../package
package_inno.files += \
$$PWD/../../../dist/win/inno/LICENSE_VALENTINA \
$$PWD/../../../dist/win/inno/valentina.iss
INSTALLS += package_inno
# Do the packaging
# First, mangle all of INSTALLS values. We depend on them.
unset(MANGLED_INSTALLS)
for(x, INSTALLS):MANGLED_INSTALLS += install_$${x}
build_package.path = $${OUT_PWD}/../../../package
build_package.commands = $$INNO_ISCC \"$${OUT_PWD}/../../../package/valentina.iss\"
build_package.depends = $${MANGLED_INSTALLS}
INSTALLS += build_package
noWindowsInstaller{ # For enable run qmake with CONFIG+=noWindowsInstaller
#do nothing
} else {
message("Inno Setup was not found!")
SCP_FOUND = false
exists("C:/Program Files (x86)/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files (x86)/Inno Setup 5/iscc.exe"
SCP_FOUND = true
} else {
exists("C:/Program Files/Inno Setup 5/iscc.exe") {
INNO_ISCC = "C:/Program Files/Inno Setup 5/iscc.exe"
SCP_FOUND = true
}
}
if($$SCP_FOUND) {
package_inno.path = $${OUT_PWD}/../../../package
package_inno.files += \
$$PWD/../../../dist/win/inno/LICENSE_VALENTINA \
$$PWD/../../../dist/win/inno/valentina.iss
INSTALLS += package_inno
# Do the packaging
# First, mangle all of INSTALLS values. We depend on them.
unset(MANGLED_INSTALLS)
for(x, INSTALLS):MANGLED_INSTALLS += install_$${x}
build_package.path = $${OUT_PWD}/../../../package
build_package.commands = $$INNO_ISCC \"$${OUT_PWD}/../../../package/valentina.iss\"
build_package.depends = $${MANGLED_INSTALLS}
INSTALLS += build_package
} else {
message("Inno Setup was not found!")
}
}
}