Merge

--HG--
branch : develop

dist/valentina.nsi

@@ -1,5 +1,12 @@
-; -------------------------------
+; NSIS installer script for Valentina
-; Start
+; --------------- Headers --------------
+!include "MUI2.nsh"
+!include "FileAssociation.nsh"
+  
+; --------------- General --------------
+CRCCheck force
+XPStyle on
+SetCompressor /FINAL /SOLID lzma
 
 !define MUI_PRODUCT "Valentina"
 !define MUI_FILE "valentina"
@@ -7,74 +14,28 @@
 !define MUI_BRANDINGTEXT "Valentina ${MUI_VERSION}"
 !define WEBSITE_LINK "http://www.valentina-project.org/"
 !define PUBLISHER "Roman Telezhynskyi"
-  CRCCheck On
 
-  ; Bij deze moeten we waarschijnlijk een absoluut pad gaan gebruiken
+InstallDir "$LOCALAPPDATA\${MUI_PRODUCT}"                 ; Default installation folder
-  ; dit moet effe uitgetest worden.
+Name "${MUI_BRANDINGTEXT}"                                ; Name displayed on installer
-  !include "${NSISDIR}\Contrib\Modern UI\System.nsh"
-  !include "FileAssociation.nsh"
- 
-;--------------------------------
-;General
-
-  Name "${MUI_BRANDINGTEXT}"
 Icon "valentina\${MUI_FILE}.ico"
 Caption "${MUI_BRANDINGTEXT}"
-  SetCompressor bzip2
+OutFile "${MUI_FILE}-install-v.${MUI_VERSION}_32bit.exe"  ; Resulting installer filename
-  OutFile "${MUI_FILE}-install-v.${MUI_VERSION}_32bit.exe"
+InstallDirRegKey HKCU "$LOCALAPPDATA\${MUI_PRODUCT}" ""   ; Get installation folder from registry if available
-  
+LicenseData "valentina\LICENSE"
-  ; Request application privileges for Windows Vista
+RequestExecutionLevel user                                ; Request application privileges for Windows Vista
-  RequestExecutionLevel user
   
 ShowInstDetails show
 ShowUninstDetails show
 
+; ----------- Icon and Bitmap ---------  
 !define MUI_ICON "valentina\${MUI_FILE}.ico"
 !define MUI_UNICON "valentina\${MUI_FILE}.ico"
 ;!define MUI_SPECIALBITMAP "Bitmap.bmp"
 
-;--------------------------------
+; -------------------------------------
-;Folder selection page
-
-  ;Default installation folder
-  InstallDir "$LOCALAPPDATA\${MUI_PRODUCT}"
- 
-  ;Get installation folder from registry if available
-  InstallDirRegKey HKCU "$LOCALAPPDATA\${MUI_PRODUCT}" ""
- 
-;--------------------------------
-;Modern UI Configuration
-
-  InstallColors 061C79 E5F0E2
-  LicenseBkColor E5F0E2
-  InstProgressFlags smooth colored
-  
-  !define MUI_WELCOMEPAGE  
-  !define MUI_LICENSEPAGE
-  !define MUI_DIRECTORYPAGE
 !define MUI_ABORTWARNING
-  !define MUI_UNINSTALLER
-  !define MUI_UNCONFIRMPAGE
-  !define MUI_FINISHPAGE
-
-;--------------------------------
-;Page
-
-  !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "valentina\license"
-  !insertmacro MUI_PAGE_COMPONENTS
-  !insertmacro MUI_PAGE_DIRECTORY
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_WELCOME
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-  
-;--------------------------------
-;Language Selection Dialog Settings
 
+;------------- Language Selection Dialog Settings --------------
 ;Remember the installer language
 !define MUI_LANGDLL_REGISTRY_ROOT "HKCU" 
 !define MUI_LANGDLL_REGISTRY_KEY "Software\${MUI_PRODUCT}" 
@@ -82,9 +43,31 @@
 !define REG_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\${MUI_PRODUCT}"
 !define REGISTRY_ROOT "HKCU"
 
-;--------------------------------
+;-------------- Install Pages -------------
-;Language
 
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_LICENSE "valentina\license"
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+    ; These indented statements modify settings for MUI_PAGE_FINISH
+    !define MUI_FINISHPAGE_NOAUTOCLOSE
+    !define MUI_FINISHPAGE_RUN "$INSTDIR\${MUI_FILE}.exe"
+    !define MUI_FINISHPAGE_RUN_CHECKED
+    !define MUI_FINISHPAGE_RUN_TEXT "Launch ${MUI_PRODUCT}"
+    !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+    !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README"
+!insertmacro MUI_PAGE_FINISH
+
+;-------------- Uninstall Pages -------------
+!insertmacro MUI_UNPAGE_WELCOME
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+	; These indented statements modify settings for MUI_UNPAGE_FINISH
+	!define MUI_UNFINISHPAGE_NOAUTOCLOSE
+!insertmacro MUI_UNPAGE_FINISH
+   
+;--------------- Languages ---------------
 !define MUI_LANGDLL_ALLLANGUAGES
 !insertmacro MUI_LANGUAGE "English" ;first language is the default language
 !insertmacro MUI_LANGUAGE "German"
@@ -95,71 +78,73 @@
 !insertmacro MUI_LANGUAGE "Hebrew"
 !insertmacro MUI_LANGUAGE "Italian"
 !insertmacro MUI_LANGUAGE "Dutch"
+!insertmacro MUI_LANGUAGE "Spanish"
+!insertmacro MUI_LANGUAGE "SpanishInternational"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Korean" 
+!insertmacro MUI_LANGUAGE "Danish"
+!insertmacro MUI_LANGUAGE "Swedish"
+!insertmacro MUI_LANGUAGE "Norwegian"
+!insertmacro MUI_LANGUAGE "NorwegianNynorsk"
+!insertmacro MUI_LANGUAGE "Finnish"
+!insertmacro MUI_LANGUAGE "Greek"
+!insertmacro MUI_LANGUAGE "Portuguese"
+!insertmacro MUI_LANGUAGE "PortugueseBR"
+!insertmacro MUI_LANGUAGE "Polish"
+!insertmacro MUI_LANGUAGE "Slovak"
+!insertmacro MUI_LANGUAGE "Croatian"
+!insertmacro MUI_LANGUAGE "Bulgarian"
+!insertmacro MUI_LANGUAGE "Hungarian"
+!insertmacro MUI_LANGUAGE "Thai"
+!insertmacro MUI_LANGUAGE "Romanian"
+!insertmacro MUI_LANGUAGE "Latvian"
+!insertmacro MUI_LANGUAGE "Macedonian"
+!insertmacro MUI_LANGUAGE "Estonian"
+!insertmacro MUI_LANGUAGE "Turkish"
+!insertmacro MUI_LANGUAGE "Lithuanian"
+!insertmacro MUI_LANGUAGE "Slovenian"
+!insertmacro MUI_LANGUAGE "Serbian"
+!insertmacro MUI_LANGUAGE "SerbianLatin"
+!insertmacro MUI_LANGUAGE "Arabic"
+!insertmacro MUI_LANGUAGE "Farsi"
+!insertmacro MUI_LANGUAGE "Indonesian"
+!insertmacro MUI_LANGUAGE "Mongolian"
+!insertmacro MUI_LANGUAGE "Luxembourgish"
+!insertmacro MUI_LANGUAGE "Albanian"
+!insertmacro MUI_LANGUAGE "Breton"
+!insertmacro MUI_LANGUAGE "Belarusian"
+!insertmacro MUI_LANGUAGE "Icelandic"
+!insertmacro MUI_LANGUAGE "Malay"
+!insertmacro MUI_LANGUAGE "Bosnian"
+!insertmacro MUI_LANGUAGE "Kurdish"
+!insertmacro MUI_LANGUAGE "Irish"
+!insertmacro MUI_LANGUAGE "Uzbek"
+!insertmacro MUI_LANGUAGE "Galician"
+!insertmacro MUI_LANGUAGE "Afrikaans"
+!insertmacro MUI_LANGUAGE "Catalan"
+!insertmacro MUI_LANGUAGE "Esperanto"
 
-;  !insertmacro MUI_LANGUAGE "Spanish"
+; ------------- Reserve Files ---------------------
-;  !insertmacro MUI_LANGUAGE "SpanishInternational"
+;If you are using solid compression, files that are required before
-;  !insertmacro MUI_LANGUAGE "SimpChinese"
+;the actual installation should be stored first in the data block,
-;  !insertmacro MUI_LANGUAGE "TradChinese"
+;because this will make your installer start faster.
-;  !insertmacro MUI_LANGUAGE "Japanese"
-;  !insertmacro MUI_LANGUAGE "Korean" 
-;  !insertmacro MUI_LANGUAGE "Danish"
-;  !insertmacro MUI_LANGUAGE "Swedish"
-;  !insertmacro MUI_LANGUAGE "Norwegian"
-;  !insertmacro MUI_LANGUAGE "NorwegianNynorsk"
-;  !insertmacro MUI_LANGUAGE "Finnish"
-;  !insertmacro MUI_LANGUAGE "Greek"
-;  !insertmacro MUI_LANGUAGE "Portuguese"
-;  !insertmacro MUI_LANGUAGE "PortugueseBR"
-;  !insertmacro MUI_LANGUAGE "Polish"
-;  !insertmacro MUI_LANGUAGE "Slovak"
-;  !insertmacro MUI_LANGUAGE "Croatian"
-;  !insertmacro MUI_LANGUAGE "Bulgarian"
-;  !insertmacro MUI_LANGUAGE "Hungarian"
-;  !insertmacro MUI_LANGUAGE "Thai"
-;  !insertmacro MUI_LANGUAGE "Romanian"
-;  !insertmacro MUI_LANGUAGE "Latvian"
-;  !insertmacro MUI_LANGUAGE "Macedonian"
-;  !insertmacro MUI_LANGUAGE "Estonian"
-;  !insertmacro MUI_LANGUAGE "Turkish"
-;  !insertmacro MUI_LANGUAGE "Lithuanian"
-;  !insertmacro MUI_LANGUAGE "Slovenian"
-;  !insertmacro MUI_LANGUAGE "Serbian"
-;  !insertmacro MUI_LANGUAGE "SerbianLatin"
-;  !insertmacro MUI_LANGUAGE "Arabic"
-;  !insertmacro MUI_LANGUAGE "Farsi"
-;  !insertmacro MUI_LANGUAGE "Indonesian"
-;  !insertmacro MUI_LANGUAGE "Mongolian"
-;  !insertmacro MUI_LANGUAGE "Luxembourgish"
-;  !insertmacro MUI_LANGUAGE "Albanian"
-;  !insertmacro MUI_LANGUAGE "Breton"
-;  !insertmacro MUI_LANGUAGE "Belarusian"
-;  !insertmacro MUI_LANGUAGE "Icelandic"
-;  !insertmacro MUI_LANGUAGE "Malay"
-;  !insertmacro MUI_LANGUAGE "Bosnian"
-;  !insertmacro MUI_LANGUAGE "Kurdish"
-;  !insertmacro MUI_LANGUAGE "Irish"
-;  !insertmacro MUI_LANGUAGE "Uzbek"
-;  !insertmacro MUI_LANGUAGE "Galician"
-;  !insertmacro MUI_LANGUAGE "Afrikaans"
-;  !insertmacro MUI_LANGUAGE "Catalan"
-;  !insertmacro MUI_LANGUAGE "Esperanto"
-;  !insertmacro MUI_LANGUAGE "Asturian"
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
-  Function .onInit
+; ------------- Installer Functions ---------------
-  !insertmacro MUI_LANGDLL_DISPLAY ;This has to come after the language macros
+Function checkAlreadyInstalled
-  
+	; check for already installed instance
+	ClearErrors 
 	ReadRegStr $R0 "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "UninstallString"
 	StrCmp $R0 "" done
- 
 	MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \
 	"${MUI_PRODUCT} is already installed. $\n$\nClick `OK` to remove the \
 	previous version or `Cancel` to cancel this upgrade." \
-  IDOK uninst
+	IDOK UnInstall
 	Abort
- 
 	;Run the uninstaller
-  uninst:
+	UnInstall:
     ClearErrors
     ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file
 
@@ -169,36 +154,29 @@
       ;whether the user has chosen to uninstall. If you are using an uninstaller
       ;components page, make sure all sections are uninstalled.
     no_remove_uninstaller:
- 
+		MessageBox MB_OK|MB_ICONSTOP "Error while uninstalling \
+		previously installed version. Please uninstall it manually \
+		and start the installer again."
+		Quit  
     done:
 FunctionEnd
 
-;--------------------------------
+Function .onInit
-;Reserve Files
+  !insertmacro MUI_LANGDLL_DISPLAY ;This has to come after the language macros
+  Call checkAlreadyInstalled
+FunctionEnd
 
-  ;If you are using solid compression, files that are required before
+;-------------- Uninstaller Functions -------------
-  ;the actual installation should be stored first in the data block,
+Function un.onInit
-  ;because this will make your installer start faster.
+  !insertmacro MUI_UNGETLANGUAGE
+FunctionEnd
  
-  !insertmacro MUI_RESERVEFILE_LANGDLL  
+;-------------- Installer -------------------------
- 
-;-------------------------------- 
-;Modern UI System
- 
-  ;!insertmacro MUI_SYSTEM 
-  !include "MUI2.nsh"
- 
-;--------------------------------
-;Data
- 
-  LicenseData "valentina\LICENSE"
- 
-;-------------------------------- 
-;Installer Sections     
 Section "Valentina  (required)"
+SectionIn RO ; define mandatory sections
  
 ;Add files
-  SetOutPath "$INSTDIR"
+SetOutPath "$INSTDIR" ; Set output path to the installation directory.
 File /r "c:\pack\valentina\*.*"
 
 ;create start-menu items  
@@ -218,6 +196,9 @@ Section "Valentina  (required)"
 ;write uninstall information to the registry
 !define UNINSTALLER_NAME "Uninstall.exe"
   
+; File associations
+${RegisterExtension} "$INSTDIR\${MUI_FILE}.exe" ".val" "Valentina_File"  
+
 WriteRegStr "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "DisplayName" "${MUI_PRODUCT}"
 WriteRegStr "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "DisplayIcon" "$\"$INSTDIR\${MUI_FILE}.exe$\""
 WriteRegStr "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "Publisher" "${PUBLISHER}"
@@ -232,9 +213,7 @@ Section "Valentina  (required)"
 WriteRegStr "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "UninstallString" "$\"$INSTDIR\${UNINSTALLER_NAME}$\""
 WriteRegStr "${REGISTRY_ROOT}" "${REG_UNINSTALL}" "Comments" "Uninstalls ${MUI_PRODUCT}."
  
-  WriteUninstaller "$INSTDIR\${UNINSTALLER_NAME}"
+WriteUninstaller "$INSTDIR\${UNINSTALLER_NAME}" ; Location of the uninstaller
-  
-  ${registerExtension} "$INSTDIR\${MUI_FILE}.exe" ".val" "Valentina_File"
  
 SectionEnd 
  
@@ -255,13 +234,13 @@ Section "Uninstall"
 Delete "${START_LINK_DIR}\*.*"
 RmDir  "${START_LINK_DIR}"
 
+; Removing file associations  
+${UnRegisterExtension} ".val" "Valentina_File"  
+ 
 ;Delete Uninstaller And Unistall Registry Entries
 DeleteRegKey "${REGISTRY_ROOT}" "SOFTWARE\${MUI_PRODUCT}"
 DeleteRegKey "${REGISTRY_ROOT}" "${REG_UNINSTALL}"  
 
-  ${unregisterExtension} ".val" "Valentina_File"
- 
 SectionEnd
  
- 
 ;eof

src/app/app.pro

@@ -113,12 +113,12 @@ CONFIG(debug, debug|release){
     unix {
         *-g++{
         QMAKE_CXXFLAGS += \
-            -isystem "/usr/include/qt5" \
+            -isystem "$$[QT_INSTALL_HEADERS]" \
-            -isystem "/usr/include/qt5/QtWidgets" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-            -isystem "/usr/include/qt5/QtXml" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
-            -isystem "/usr/include/qt5/QtGui" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
-            -isystem "/usr/include/qt5/QtXmlPatterns" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
-            -isystem "/usr/include/qt5/QtCore" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
             -isystem "$${OUT_PWD}/$${RCC_DIR}" \
@@ -127,12 +127,12 @@ CONFIG(debug, debug|release){
         #Turn on Clang warnings
         clang*{
         QMAKE_CXXFLAGS += \
-            -isystem "/usr/include/qt5" \
+            -isystem "$$[QT_INSTALL_HEADERS]" \
-            -isystem "/usr/include/qt5/QtWidgets" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-            -isystem "/usr/include/qt5/QtXml" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
-            -isystem "/usr/include/qt5/QtGui" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
-            -isystem "/usr/include/qt5/QtCore" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
-            -isystem "/usr/include/qt5/QtXmlPatterns" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
             -isystem "$${OUT_PWD}/$${UI_DIR}" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
             -isystem "$${OUT_PWD}/$${RCC_DIR}" \
@@ -193,11 +193,14 @@ unix {
 isEmpty(PREFIX) {
   PREFIX = /usr
 }
-BINDIR = $$PREFIX/bin
 DATADIR =$$PREFIX/share
 DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
 #MAKE INSTALL
-target.path = $$BINDIR
+unix:!macx{
+target.path = $$PREFIX/bin
+}else{
+target.path = $$PREFIX/
+}
 desktop.path = $$DATADIR/applications/
 desktop.files += ../../dist/$${TARGET}.desktop
 pixmaps.path = $$DATADIR/pixmaps/

src/libs/qmuparser/qmuparser.pro

@@ -50,7 +50,10 @@ HEADERS += \
 VERSION = 2.2.4
 
 unix {
-    target.path = /usr/lib
+    isEmpty(PREFIX) {
+     PREFIX = /usr/lib
+    }
+    target.path = $$PREFIX/lib
     INSTALLS += target
 
     *-g++{
@@ -79,12 +82,12 @@ CONFIG(debug, debug|release){
     unix {
         *-g++{
         QMAKE_CXXFLAGS += \
-            -isystem "/usr/include/qt5" \
+            -isystem "$$[QT_INSTALL_HEADERS]" \
-            -isystem "/usr/include/qt5/QtWidgets" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-            -isystem "/usr/include/qt5/QtXml" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
-            -isystem "/usr/include/qt5/QtGui" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
-            -isystem "/usr/include/qt5/QtXmlPatterns" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
-            -isystem "/usr/include/qt5/QtCore" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
             $$GCC_CXXFLAGS
         }

src/libs/vpropertyexplorer/vpropertyexplorer.pro

@@ -93,7 +93,10 @@ HEADERS +=\
     stable.h
 
 unix {
-    target.path = /usr/lib
+    isEmpty(PREFIX) {
+     PREFIX = /usr/lib
+    }
+    target.path = $$PREFIX/lib
     INSTALLS += target
 
     *-g++{
@@ -122,24 +125,24 @@ CONFIG(debug, debug|release){
     unix {
         *-g++{
         QMAKE_CXXFLAGS += \
-            -isystem "/usr/include/qt5" \
+            -isystem "$$[QT_INSTALL_HEADERS]" \
-            -isystem "/usr/include/qt5/QtWidgets" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-            -isystem "/usr/include/qt5/QtXml" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
-            -isystem "/usr/include/qt5/QtGui" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
-            -isystem "/usr/include/qt5/QtXmlPatterns" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
-            -isystem "/usr/include/qt5/QtCore" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
             $$GCC_CXXFLAGS
         }
         #Turn on Clang warnings
         clang*{
         QMAKE_CXXFLAGS += \
-            -isystem "/usr/include/qt5" \
+            -isystem "$$[QT_INSTALL_HEADERS]" \
-            -isystem "/usr/include/qt5/QtWidgets" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-            -isystem "/usr/include/qt5/QtXml" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \
-            -isystem "/usr/include/qt5/QtGui" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \
-            -isystem "/usr/include/qt5/QtCore" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \
-            -isystem "/usr/include/qt5/QtXmlPatterns" \
+            -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \
             -isystem "$${OUT_PWD}/$${MOC_DIR}" \
             $$CLANG_CXXFLAGS
         }