CMakeLists.txt

@@ -21,11 +21,11 @@ endif()
 # Define project name and version tags
 ###############################################################################################
 # this is not only the QMS version it will be the package version, too.
-project(QMapShack VERSION 1.11.0)
+project(QMapShack VERSION 1.11.1)
 
 # FOR A RELEASE:
 # remove "development" for a release
-set(VERSION_SUFFIX )
+set(VERSION_SUFFIX "")
 # !!! Do not forget to update versions in the sub-repos, too!!!
 
 
@@ -52,6 +52,7 @@ include(ConfigureChecks.cmake)
 
 # Translation related
 option(UPDATE_TRANSLATIONS  "Update source translation translations/*.ts files"     OFF)
+option(KEEP_OLD_TRANSLATIONS "Keep obsolete translations"                           ON)
 
 # Feature related
 option(BUILD_QMAPSHACK      "Build QMapShack Binary"                                ON)
@@ -66,6 +67,12 @@ endif(WIN32)
 # Compiler related
 option(BUILD_FOR_LOCAL_SYSTEM "Build for local system ONLY (resulting binary might not work on other systems!)" OFF)
 
+if(KEEP_OLD_TRANSLATIONS)
+    set(KEEP_OLD_TRANSLATIONS "")
+else(KEEP_OLD_TRANSLATIONS)
+    set(KEEP_OLD_TRANSLATIONS "-no-obsolete")
+endif(KEEP_OLD_TRANSLATIONS)
+
 
 ###############################################################################################
 # All OS and compiler specific tweaks
@@ -84,6 +91,7 @@ if(WIN32)
     set(PROJ_DEV_PATH "C:\\PROJ" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ")
     set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")
     set(QUAZIP_DEV_PATH "C:\\quazip" CACHE PATH "Path to directory containing quazip include and lib, e.g. M:\\lib\\quazip5")
+    set(JPEG_DEV_PATH "C:\\JPEG" CACHE PATH "Path to directory containing JPEG include and lib, e.g. M:\\lib\\JPEG")
     set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${QT_DEV_PATH})
 endif(WIN32)
 
@@ -198,6 +206,7 @@ if(BUILD_QMAPTOOL)
     install( FILES        src/icons/48x48/QMapTool.png      DESTINATION     ${DATA_INSTALL_PREFIX}/pixmaps )
     install( DIRECTORY    src/icons/qmaptool/hicolor        DESTINATION     ${ICON_INSTALL_DIR} )
     install( FILES        qmaptool.1                        DESTINATION     ${MAN_INSTALL_DIR}/man1  )
+    install( FILES        qmt_map2jnx.1                     DESTINATION     ${MAN_INSTALL_DIR}/man1  )
     install( FILES        qmt_rgb2pct.1                     DESTINATION     ${MAN_INSTALL_DIR}/man1  )
 endif(BUILD_QMAPTOOL)
 endif (UNIX AND NOT WIN32 AND NOT APPLE)

CMakeLists.txt.user

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.5.0, 2018-03-05T11:10:51. -->
+<!-- Written by QtCreator 4.5.0, 2018-04-18T17:12:21. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
@@ -64,12 +64,13 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{51546969-344d-413b-bc16-18294a0c7ceb}</value>
    <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">4</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">1</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
     <valuelist type="QVariantList" key="CMake.Configuration">
      <value type="QString">BUILD_FOR_LOCAL_SYSTEM:BOOL=ON</value>
      <value type="QString">BUILD_QMAPSHACK:BOOL=ON</value>
      <value type="QString">BUILD_QMAPTOOL:BOOL=ON</value>
+     <value type="QString">CMAKE_BUILD_TYPE:STRING=Debug</value>
      <value type="QString">CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}</value>
      <value type="QString">CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}</value>
      <value type="QString">CMAKE_INSTALL_PREFIX:PATH=/usr</value>
@@ -173,8 +174,8 @@
      <value type="int">14</value>
     </valuelist>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
-    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">-c test.cfg</value>
+    <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory">/home/oeichler/Code/cpp/build-QMapShack</value>
     <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory.default">/home/oeichler/Code/cpp/build-QMapShack/bin</value>
     <value type="int" key="PE.EnvironmentAspect.Base">2</value>
     <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>

MacOSX/bundle-all.sh

+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $DIR/bundle-qmapshack.sh
+source $DIR/bundle-qmaptool.sh
\ No newline at end of file

MacOSX/bundle-qmapshack.sh

+#!/bin/bash
+
+set -a
+APP_NAME=QMapShack
+set +a
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $DIR/env-path.sh
+source $DIR/bundle.sh
+
+function extendAppStructure {
+    mkdir $BUILD_BUNDLE_RES_QM_DIR
+    mkdir $BUILD_BUNDLE_RES_GDAL_DIR
+    mkdir $BUILD_BUNDLE_RES_PROJ_DIR
+    mkdir $BUILD_BUNDLE_RES_ROUTINO_DIR
+    mkdir $BUILD_BUNDLE_RES_BIN_DIR
+}
+
+
+function copyAdditionalLibraries {
+    cp -v    $ROUTINO_LIB_LIB_DIR/libroutino.so $BUILD_BUNDLE_FRW_DIR
+    cp -v    $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtSensors.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtPositioning.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtMultimediaWidgets.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtMultimedia.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtWebKitWidgets.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtOpenGL.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtQuick.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtQml.framework $BUILD_BUNDLE_FRW_DIR
+    cp -v -R $QT_DIR/lib/QtWebChannel.framework $BUILD_BUNDLE_FRW_DIR
+    # TODO remove QT Bus, is only for linux needed
+    #cp -v -R $QT_DIR/lib/QtDBus.framework $BUILD_BUNDLE_FRW_DIR
+}
+
+
+function copyExternalFiles {
+    cp -v $GDAL_DIR/share/gdal/* $BUILD_BUNDLE_RES_GDAL_DIR
+    cp -v $PROJ_DIR/share/proj/* $BUILD_BUNDLE_RES_PROJ_DIR
+
+    cp -v $ROUTINO_LIB_XML_DIR/profiles.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
+    cp -v $ROUTINO_LIB_XML_DIR/translations.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
+    cp -v $ROUTINO_LIB_XML_DIR/tagging.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
+}
+
+
+function copyExtTools {
+    # at least gdalbuildvrt is used
+    cp -v $GDAL_DIR/bin/*                       $BUILD_BUNDLE_RES_BIN_DIR
+    cp -v $PROJ_DIR/bin/proj                    $BUILD_BUNDLE_RES_BIN_DIR
+    cp -v $ROUTINO_LIB_LIB_DIR/planetsplitter   $BUILD_BUNDLE_RES_BIN_DIR
+
+    # currently only used by QMapTool.
+    cp -v $BUILD_BIN_DIR/qmt_rgb2pct            $BUILD_BUNDLE_RES_BIN_DIR
+}
+
+
+function adjustLinkingExtTools {
+    for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
+    do
+        adjustLinkQt $F "/usr/local/opt/"
+        adjustLinkQt $F "/usr/local/Cellar/"
+        adjustLinkQt $F "/usr/local/lib/"
+    done
+}
+
+
+function printLinkingExtTools {
+    for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
+    do
+        printLinking $F
+    done
+}
+
+
+function archiveBundle {
+    ARCHIVE=$(printf "%s/%s-MacOSX_%s.tar.gz" "$BUILD_RELEASE_DIR" "$APP_NAME" "$APP_VERSION")
+    echo $ARCHIVE
+    rm $ARCHIVE
+
+    cd $BUILD_RELEASE_DIR
+    tar -zcvf $ARCHIVE $APP_BUNDLE $APP_BUNDLE_QMAPTOOL
+    cd ..
+}
+
+
+if [[ "$1" == "bundle" ]]; then
+    echo "---extract version -----------------"
+    extractVersion
+    readRevisionHash
+    echo "---build bundle --------------------"
+    buildAppStructure
+    extendAppStructure
+    echo "---replace version string ----------"
+    updateInfoPlist
+    echo "---qt deploy tool ------------------"
+    qtDeploy
+    echo "---copy libraries ------------------"
+    copyAdditionalLibraries
+    echo "---copy external files -------------"
+    copyQtTrqnslations
+    copyExternalFiles
+    echo "---adjust linking ------------------"
+    adjustLinking
+    echo "---external tools ------------------"
+    copyExtTools
+    adjustLinkingExtTools
+    printLinkingExtTools
+    echo "------------------------------------"
+    # chmod a+x $BUILD_BUNDLE_DIR/Contents/Frameworks/*
+fi
+
+if [[ "$1" == "archive" ]]; then
+    extractVersion
+    archiveBundle
+fi
\ No newline at end of file

MacOSX/bundle-qmaptool.sh

+#!/bin/bash
+
+set -a
+APP_NAME=QMapTool
+set +a
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $DIR/env-path.sh
+source $DIR/bundle.sh
+
+
+
+
+function linkToQMapShack {
+	# link to QMapShack application bundle
+    cd $BUILD_RELEASE_DIR
+    ln -s ../../QMapShack.app/Contents/Frameworks $BUILD_BUNDLE_FRW_DIR
+    ln -s ../../QMapShack.app/Contents/PlugIns $BUILD_BUNDLE_PLUGIN_DIR
+    ln -s ../../QMapShack.app/Contents/Tools/ $BUILD_BUNDLE_RES_BIN_DIR
+    ln -s ../../../QMapShack.app/Contents/Resources/gdal $BUILD_BUNDLE_RES_GDAL_DIR
+    ln -s ../../../QMapShack.app/Contents/Resources/proj $BUILD_BUNDLE_RES_PROJ_DIR
+    #ln -s ../../../QMapShack.app/Contents/Resources/translations $BUILD_BUNDLE_RES_QM_DIR
+    cd ..
+}
+
+
+function removeDuplicatedQtLibs {
+    rm -rf $BUILD_BUNDLE_FRW_DIR
+    rm -rf $BUILD_BUNDLE_PLUGIN_DIR
+}
+
+
+if [[ "$1" == "bundle" ]]; then
+    echo "---extract version -----------------"
+    extractVersion
+    readRevisionHash
+    echo "---build bundle --------------------"
+    buildAppStructure
+    echo "---replace version string ----------"
+    updateInfoPlist
+    echo "---qt deploy tool ------------------"
+    qtDeploy
+    removeDuplicatedQtLibs
+    echo "---copy external files -------------"
+    copyQtTrqnslations
+    echo "---link to QMS ------------------"
+    linkToQMapShack
+    echo "---adjust linking ------------------"
+    adjustLinking
+    echo "------------------------------------"
+fi
\ No newline at end of file

MacOSX/bundle.sh

 #!/bin/bash
 
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $DIR/env-path.sh
-
 APP_VERSION=0
 BUILD_TIME=$(date +"%y-%m-%dT%H:%M:%S")
 BUILD_HASH_KEY=0
@@ -28,13 +25,13 @@ function buildIcon {
 
 function buildAppStructure {
     # structure bundle
-    # QmapShack.app/
+    # *.app/
     #   Contents/
     #      Info.plist
     #      MacOS/
-    #         QMapShack
+    #         <binary>
     #      Resources/
-    #         QMapShack.icns
+    #         *.icns
     #      Frameworks/
     #         <libs>
     #      PlugIns
@@ -42,32 +39,56 @@ function buildAppStructure {
     
     rm -rf $BUILD_BUNDLE_DIR
     mkdir $BUILD_BUNDLE_DIR
+    mkdir $BUILD_BUNDLE_CONTENTS_DIR
+    mkdir $BUILD_BUNDLE_APP_DIR
+    mkdir $BUILD_BUNDLE_RES_DIR
+    mkdir $BUILD_BUNDLE_RES_QM_DIR
+    mkdir $BUILD_BUNDLE_FRW_DIR
+    mkdir $BUILD_BUNDLE_PLUGIN_DIR
 
+    # TODO not all copied from predefined data is needed in every case (eg icon)
     # predefined data
-    cp -v -R $SRC_RESOURCES_DIR/Contents $BUILD_BUNDLE_DIR
+    for i in "${APP_LANG[@]}"
+    do
+        BUILD_BUNDLE_LOCVERSION_DIR=$BUILD_BUNDLE_RES_DIR/${i}.lproj
+        mkdir $BUILD_BUNDLE_LOCVERSION_DIR
+        cp -v $SRC_RESOURCES_DIR/locversion.plist $BUILD_BUNDLE_LOCVERSION_DIR
+        /usr/libexec/PlistBuddy -c "Set :LprojLocale $i" "$BUILD_BUNDLE_LOCVERSION_DIR/locversion.plist"
+        echo "$i"
+     done
+
+    cp -v $SRC_RESOURCES_DIR/$APP_NAME.icns $BUILD_BUNDLE_RES_DIR
+    cp -v $SRC_RESOURCES_DIR/*.qss $BUILD_BUNDLE_RES_DIR
+    cp -v $SRC_RESOURCES_DIR/Info.plist $BUILD_BUNDLE_CONTENTS_DIR
 
-    # new icon, if one has been created (otherwise the one from predefined data
+    # new icon, if one has been created (otherwise the one from predefined data)
     if [ -f "$BUILD_BIN_DIR/$APP_NAME.icns" ]; then
+        echo "cp -v $BUILD_BIN_DIR/$APP_NAME.icns $BUILD_BUNDLE_RES_DIR/"
         cp -v $BUILD_BIN_DIR/$APP_NAME.icns $BUILD_BUNDLE_RES_DIR/
     fi
     
     # binary
-    mkdir $BUILD_BUNDLE_APP_DIR
-    cp -v $BUILD_BIN_DIR/qmapshack  $BUILD_BUNDLE_APP_DIR/$APP_NAME
+    cp -v $BUILD_BIN_DIR/$APP_NAME_LOWER  $BUILD_BUNDLE_APP_DIR/$APP_NAME
 
-    mkdir $BUILD_BUNDLE_RES_QM_DIR
-    mkdir $BUILD_BUNDLE_RES_GDAL_DIR
-    mkdir $BUILD_BUNDLE_RES_PROJ_DIR
-    mkdir $BUILD_BUNDLE_RES_ROUTINO_DIR
-    mkdir $BUILD_BUNDLE_RES_BIN_DIR
-    cp -v $BUILD_BIN_DIR/*.qm $BUILD_BUNDLE_RES_QM_DIR
+    # app translations
+    cp -v $BUILD_DIR/src/$APP_NAME_LOWER/*.qm $BUILD_BUNDLE_RES_QM_DIR
+}
+
+
+function copyQtTrqnslations {
+    for i in "${APP_LANG[@]}"
+    do
+        cp -v $QT_DIR/translations/*_${i}.qm $BUILD_BUNDLE_RES_QM_DIR
+    done
 }
 
+
 function qtDeploy {
     # -no-strip 
     $QT_DIR/bin/macdeployqt $BUILD_BUNDLE_DIR -always-overwrite -verbose=3
 }
 
+
 function printLinkingApp {
     printLinking $BUILD_BUNDLE_APP_FILE
 
@@ -104,6 +125,7 @@ function printLinkingApp {
     done   
 }
 
+
 function adjustLinking {
  
     for F in `find $BUILD_BUNDLE_PLUGIN_DIR -type f -type f \( -iname "*.dylib" -o -iname "*.so" \)` 
@@ -128,6 +150,7 @@ function adjustLinking {
     adjustLinkQt $BUILD_BUNDLE_APP_FILE "libroutino"
 }
 
+
 function adjustLinkQt {
     F=$1 # file
     L=$2 # search condition
@@ -193,64 +216,6 @@ function checkLibraries {
     done
 }
 
-function copyAdditionalLibraries {
-    cp -v    $ROUTINO_LIB_LIB_DIR/libroutino.so $BUILD_BUNDLE_FRW_DIR
-    cp -v    $QUAZIP_LIB_LIB_DIR/libquazip.1.dylib $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtSensors.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtPositioning.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtMultimediaWidgets.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtMultimedia.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtWebKitWidgets.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtOpenGL.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtQuick.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtQml.framework $BUILD_BUNDLE_FRW_DIR
-    cp -v -R $QT_DIR/lib/QtWebChannel.framework $BUILD_BUNDLE_FRW_DIR
-    # TODO remove QT Bus, is only for linux needed
-    #cp -v -R $QT_DIR/lib/QtDBus.framework $BUILD_BUNDLE_FRW_DIR
-}
-
-function copyExternalFiles {
-    cp -v $QT_DIR/translations/*_cs.qm $BUILD_BUNDLE_RES_QM_DIR
-    cp -v $QT_DIR/translations/*_de.qm $BUILD_BUNDLE_RES_QM_DIR
-    cp -v $QT_DIR/translations/*_en.qm $BUILD_BUNDLE_RES_QM_DIR
-    cp -v $QT_DIR/translations/*_es.qm $BUILD_BUNDLE_RES_QM_DIR
-    cp -v $QT_DIR/translations/*_fr.qm $BUILD_BUNDLE_RES_QM_DIR
-    cp -v $QT_DIR/translations/*_nl.qm $BUILD_BUNDLE_RES_QM_DIR
-
-    cp -v $GDAL_DIR/share/gdal/* $BUILD_BUNDLE_RES_GDAL_DIR
-    cp -v $PROJ_DIR/share/proj/* $BUILD_BUNDLE_RES_PROJ_DIR
-    
-    cp -v $ROUTINO_LIB_XML_DIR/profiles.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
-    cp -v $ROUTINO_LIB_XML_DIR/translations.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
-    cp -v $ROUTINO_LIB_XML_DIR/tagging.xml $BUILD_BUNDLE_RES_ROUTINO_DIR
-}
-
-
-function adjustLinkingExtTools {
-    for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
-    do
-        adjustLinkQt $F "/usr/local/opt/"
-        adjustLinkQt $F "/usr/local/Cellar/"
-        adjustLinkQt $F "/usr/local/lib/"
-    done
-}
-
-
-function printLinkingExtTools {
-    for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
-    do
-        printLinking $F
-    done
-}
-
-
-function copyExtTools {
-    # at least gdalbuildvrt is used
-    cp -v $GDAL_DIR/bin/*                       $BUILD_BUNDLE_RES_BIN_DIR
-    cp -v $PROJ_DIR/bin/proj                    $BUILD_BUNDLE_RES_BIN_DIR
-    cp -v $ROUTINO_LIB_LIB_DIR/planetsplitter   $BUILD_BUNDLE_RES_BIN_DIR
-}
-
 
 function printLinking {
     echo "--------------------"
@@ -259,30 +224,29 @@ function printLinking {
     echo "--------------------"
 }
 
-function archiveBundle {
-    ARCHIVE=$(printf "%s/%s-MacOSX_%s.tar.gz" "$BUILD_RELEASE_DIR" "$APP_NAME" "$APP_VERSION")
-    echo $ARCHIVE
-    rm $ARCHIVE
-
-    cd $BUILD_RELEASE_DIR
-    tar -zcvf $ARCHIVE $APP_BUNDLE
-    cd ..
-}
-
 
 function extractVersion {
     # Version CMakeList.txt
+
     # set(APPLICATION_VERSION_MAJOR "1")
     # set(APPLICATION_VERSION_MINOR "3")
     # set(APPLICATION_VERSION_PATCH "0.libroutino")
+    MAJOR_VERSION=$(sed -E -n 's/.*_VERSION_MAJOR.*([[:digit:]]+).*/\1/p' $QMS_SRC_DIR/src/$APP_NAME_LOWER/CMakeLists.txt)
+    MINOR_VERSION=$(sed -E -n 's/.*_VERSION_MINOR.*([[:digit:]]+).*/\1/p' $QMS_SRC_DIR/src/$APP_NAME_LOWER/CMakeLists.txt)
+    PATCH_VERSION=$(sed -E -n 's/.*_VERSION_PATCH.*([[:digit:]]+).*/\1/p' $QMS_SRC_DIR/src/$APP_NAME_LOWER/CMakeLists.txt)
+
+    if [[ -z "$MAJOR_VERSION" ]]; then
+         # project(QMapShack VERSION 1.11.0)
+        MAJOR_VERSION=$(sed -E -n 's/.*QMapShack VERSION.*([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+).*/\1/p' $QMS_SRC_DIR/CMakeLists.txt)
+        MINOR_VERSION=$(sed -E -n 's/.*QMapShack VERSION.*([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+).*/\2/p' $QMS_SRC_DIR/CMakeLists.txt)
+        PATCH_VERSION=$(sed -E -n 's/.*QMapShack VERSION.*([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+).*/\3/p' $QMS_SRC_DIR/CMakeLists.txt)
+    fi
 
-    MAJOR_VERSION=$(sed -n 's/.*APPLICATION_VERSION_MAJOR.*\"\(.*\)\".*/\1/p' $QMS_SRC_DIR/CMakeLists.txt)
-    MINOR_VERSION=$(sed -n 's/.*APPLICATION_VERSION_MINOR.*\"\(.*\)\".*/\1/p' $QMS_SRC_DIR/CMakeLists.txt)
-    PATCH_VERSION=$(sed -n 's/.*APPLICATION_VERSION_PATCH.*\"\(.*\)\".*/\1/p' $QMS_SRC_DIR/CMakeLists.txt)
-    echo "$MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION"
+    echo "Version: $MAJOR_VERSION $MINOR_VERSION $PATCH_VERSION"
     APP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
 }
 
+
 function readRevisionHash {
     cd $QMS_SRC_DIR
     BUILD_HASH_KEY=$(hg --debug id -i)
@@ -298,43 +262,24 @@ function updateInfoPlist {
     /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $APP_VERSION"            "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
     /usr/libexec/PlistBuddy -c "Set :BuildHashKey $BUILD_HASH_KEY"            "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
     /usr/libexec/PlistBuddy -c "Set :BuildTime $BUILD_TIME"                   "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
+
+    /usr/libexec/PlistBuddy -c "Set :CFBundleIconFile $APP_NAME"              "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
+    /usr/libexec/PlistBuddy -c "Set :CFBundleExecutable $APP_NAME"            "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
+    /usr/libexec/PlistBuddy -c "Set :CFBundleName $APP_NAME"                  "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
+
+    /usr/libexec/PlistBuddy -c "Set :CFBundleIdentifier org.qlandkarte.$APP_NAME" "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
 }
 
 
 if [[ "$1" == "icon" ]]; then
     buildIcon
 fi
-if [[ "$1" == "bundle" ]]; then
-    echo "---extract version -----------------"
-    extractVersion
-    readRevisionHash
-    echo "---build bundle --------------------"
-    buildAppStructure
-    echo "---replace version string ----------"
-    updateInfoPlist
-    echo "---qt deploy tool ------------------"
-    qtDeploy
-    echo "---copy libraries ------------------"
-    copyAdditionalLibraries
-    echo "---copy external files -------------"
-    copyExternalFiles
-    echo "---adjust linking ------------------"
-    adjustLinking
-    echo "---external tools ------------------"
-    copyExtTools
-    adjustLinkingExtTools
-    printLinkingExtTools
-    echo "------------------------------------"
-    # chmod a+x $BUILD_BUNDLE_DIR/Contents/Frameworks/*
-fi
 if [[ "$1" == "info" ]]; then
     printLinkingApp
 fi
 if [[ "$1" == "info-before" ]]; then
     printLinking $BUILD_RELEASE_DIR/$APP_NAME
+    # TODO
     printLinking $LIB_ROUTINO_LIB_DIR/libroutino.so
 fi
-if [[ "$1" == "archive" ]]; then
-    extractVersion
-    archiveBundle
-fi
+

MacOSX/env-path.sh

@@ -30,9 +30,12 @@ if [[ "$BUILD_RELEASE_DIR" == "" ]]; then
 fi
 
 set -a
-APP_NAME=QMapShack
+declare APP_LANG=("ca" "cs" "de" "en" "es" "fr" "nl" "ru")
+APP_NAME_LOWER="$(tr [A-Z] [a-z] <<< "$APP_NAME")"
 APP_BUNDLE=$APP_NAME.app
 
+APP_BUNDLE_QMAPTOOL=QMapTool.app
+
 SRC_OSX_DIR=$QMS_SRC_DIR/MacOSX
 SRC_RESOURCES_DIR=$SRC_OSX_DIR/resources
 

MacOSX/resources/Contents/Resources/cs.lproj/locversion.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>cs</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
\ No newline at end of file

MacOSX/resources/Contents/Resources/de.lproj/locversion.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>de</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
\ No newline at end of file

MacOSX/resources/Contents/Resources/es.lproj/locversion.plist

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>es</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
\ No newline at end of file

MacOSX/resources/qms-style.qss

+
+QToolBar {
+    padding-left: 5px;
+    spacing: 2px;
+    background: #ececec;
+    border: none
+}
+
+QToolBar > QToolButton {
+    border-radius: 5px;
+    padding: 0px;
+    background-color: #ececec;
+    border: none;
+    width: 24px;
+    height: 24px;
+}
+
+QToolBar > QToolButton:checked {
+    border: 1px solid #cdcdcd;
+    background-color: #d7d7d7;
+}
+
+QToolBar > QToolButton:pressed {
+    border: 1px solid #cdcdcd;
+    background-color: #d7d7d7;
+}
+
+QToolBar > QToolButton:hover {
+    border: 1px solid #cdcdcd;
+    background-color: #d7d7d7;
+}

changelog.txt

+V 1.11.1
+Add: Geo search: Setup for API keys and other login information
+Add: Nominatim OSM as search service
+Add: Geonames as search service
+Add: TwoNav: Read additional data fields hdop, vdop, sat and atemp
+Add: Some online sources for DEM.
+Add: Replace initial startup text by a short tutorial and add links to Wiki
+Fix: Newer TwoNav devices are not found by device watcher
+Fix: Avoid connection to MySQL DB when Password dialog is canceled or password is empty.
+[Issue #314] VRT Builder can't handle long list of files in Windows
+[Issue #315] Improve order of maps in maps tab
+[Issue #316] DEM window: list not only .VRT files but also .WCS ones
+[Issue #323] Initial offline BRouter tile selection unusable without map background
+[Issue #324] FilterReplaceElevation: no indication which view is used as source for DEM data
+[Issue #330] Add accumulative search to search item
+[Issue #332] Incorrect Elevations when using 'Replace Elevation Data' Filter when Units are set to Imperial
+[Issue #328] Use tracks for routing
+[Issue #327] ChangeTrackStartpoint - new track filter?
+[Issue #280] "Search Google" limitation and possible alternative
+
+QMapTool V1.1.0:
+Add: JNX export
+
+
 V 1.11.0
 Add: QMapTool and friends as sub-project
 Add: Reverse route

cmake/Modules/FindJPEG.cmake

@@ -25,11 +25,14 @@ else (JPEG_LIBRARIES AND JPEG_INCLUDE_DIRS)
     NAMES
       jpeglib.h
     PATHS
+if(WIN32)
+        ${JPEG_DEV_PATH}/include
+endif(WIN32)
         /usr/include
         /usr/local/include
         /opt/local/include
         /sw/include
-        ${CMAKE_SOURCE_DIR}/Win32/GDAL/include
+        ${CMAKE_SOURCE_DIR}/Win32/JPEG/include
   )
   mark_as_advanced(JPEG_INCLUDE_DIR)
 
@@ -41,11 +44,14 @@ else (WIN32)
         jpeg
 endif (WIN32)
     PATHS
+if(WIN32)
+        ${JPEG_DEV_PATH}/lib
+endif(WIN32)
         /usr/lib
         /usr/local/lib
         /opt/local/lib
         /sw/lib
-        ${CMAKE_SOURCE_DIR}/Win32/GDAL/lib
+        ${CMAKE_SOURCE_DIR}/Win32/JPEG/lib
   )
   mark_as_advanced(LIBJPEG_LIBRARY)
 

debian/changelog

+qmapshack (1.11.1-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 25 Apr 2018 07:31:09 +0200
+
+qmapshack (1.11.1-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update Vcs-* URLs for Salsa.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Drop patches, applied upstream.
+  * Add lintian overrides for spelling-error-in-binary false positives.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 19 Apr 2018 15:11:19 +0200
+
 qmapshack (1.11.0-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -18,9 +18,9 @@ Build-Depends: cmake,
                qttools5-dev,
                qttools5-dev-tools,
                qtscript5-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/qmapshack.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/qmapshack.git -b stretch-backports
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/qmapshack
+Vcs-Git: https://salsa.debian.org/debian-gis-team/qmapshack.git -b stretch-backports
 Homepage: https://bitbucket.org/maproom/qmapshack/wiki/Home
 
 Package: qmapshack