From 4243804f55b6dc9eaec41c48c754e035bc796a98 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Mon, 19 Jun 2017 19:11:41 +0300
Subject: [PATCH] New key to disable creating a Windows installer.

--HG--
branch : develop
---
 appveyor.yml                    |  4 +--
 src/app/valentina/valentina.pro | 58 ++++++++++++++++++---------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 236ee15de..9fc25325c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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)
diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro
index 84b2fa0a4..b6ea57ef0 100644
--- a/src/app/valentina/valentina.pro
+++ b/src/app/valentina/valentina.pro
@@ -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!")
+        }
     }
 }