From 4fbd12ed7d211d3a39c73373e3368b04567e6283 Mon Sep 17 00:00:00 2001
From: Peter Petrik <zilolv@gmail.com>
Date: Mon, 29 Jun 2020 11:03:19 +0200
Subject: [PATCH] bump version to 3.15

---
 config/dev.conf                    |  2 +-
 config/nightly2.conf               |  2 +-
 qgis-mac-packager.bash             | 27 ++++++++++-----------------
 qgis_bundle/recipes/geos/recipe.sh |  3 ++-
 qgis_package/qgis_package.bash     | 24 ++++++++++++------------
 5 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/config/dev.conf b/config/dev.conf
index 63965955..3615188f 100644
--- a/config/dev.conf
+++ b/config/dev.conf
@@ -2,7 +2,7 @@
 
 CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-export QGIS_VERSION=3.13
+export QGIS_VERSION=3.15
 export VERSION_qt=5.14.2
 export RELEASE_VERSION=0.4.1
 export RELEASE=dev
diff --git a/config/nightly2.conf b/config/nightly2.conf
index 643bbeb7..1fcc211e 100644
--- a/config/nightly2.conf
+++ b/config/nightly2.conf
@@ -2,7 +2,7 @@
 
 CONFIGDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-export QGIS_VERSION=3.13
+export QGIS_VERSION=3.15
 export VERSION_qt=5.14.2
 export RELEASE_VERSION=0.4.1
 export RELEASE=nightly2
diff --git a/qgis-mac-packager.bash b/qgis-mac-packager.bash
index f4c4d8e1..76f16a92 100755
--- a/qgis-mac-packager.bash
+++ b/qgis-mac-packager.bash
@@ -25,49 +25,42 @@ shift
 source $CONFIG_FILE
 
 if [[ "$BUILD_DIR/build" != $QGIS_BUILD_DIR ]]; then
-  echo "error $BUILD_DIR/build is not equal $QGIS_BUILD_DIR from $CONFIG_FILE"
-  exit 1
+  error "error $BUILD_DIR/build is not equal $QGIS_BUILD_DIR from $CONFIG_FILE"
 fi
 
 if [[ "$BUILD_DIR/install" != $QGIS_INSTALL_DIR ]]; then
-  echo "error $BUILD_DIR/install is not equal $QGIS_INSTALL_DIR from $CONFIG_FILE"
-  exit 1
+  error "error $BUILD_DIR/install is not equal $QGIS_INSTALL_DIR from $CONFIG_FILE"
 fi
 
 if [[ "$BUILD_DIR/QGIS" != $QGIS_SOURCE_DIR ]]; then
-  echo "error $BUILD_DIR/QGIS is not equal $QGIS_SOURCE_DIR from $CONFIG_FILE"
-  exit 1
+  error "error $BUILD_DIR/QGIS is not equal $QGIS_SOURCE_DIR from $CONFIG_FILE"
 fi
 
 echo "Verifying the QGIS repo is cloned locally in $QGIS_SOURCE_DIR"
 if [ ! -f "$QGIS_SOURCE_DIR/INSTALL.md" ]; then
-  echo "missing $QGIS_SOURCE_DIR/INSTALL.md"
-  exit 1
+  error "missing $QGIS_SOURCE_DIR/INSTALL.md"
 fi
 
-
 echo "Verifying the Qt package installation"
 if [ ! -d "$QT_BASE" ]; then
-  echo "missing QT in $QT_BASE, install version ${VERSION_qt} from ${QGIS_DOWNLOAD_ROOT_URL}/deps/"
-  exit 1
+  error "missing QT in $QT_BASE, install version ${VERSION_qt} from ${QGIS_DOWNLOAD_ROOT_URL}/deps/"
 fi
 
 echo "Verifying the qgis-deps package installation"
 if [ ! -d "$QGIS_DEPS_STAGE_PATH" ]; then
-  echo "missing QT in $QGIS_DEPS_STAGE_PATH, install version ${QGIS_DEPS_SDK_VERSION} from ${QGIS_DOWNLOAD_ROOT_URL}/deps/"
-  exit 1
+  error "missing QGIS-DEPS in $QGIS_DEPS_STAGE_PATH, install version ${QGIS_DEPS_SDK_VERSION} from ${QGIS_DOWNLOAD_ROOT_URL}/deps/"
 fi
 
 echo "Building QGIS"
-$DIR/qgis_build/qgis_build.bash $CONFIG_FILE
+$DIR/qgis_build/qgis_build.bash "$CONFIG_FILE"
 
 echo "Bundle QGIS"
-$DIR/qgis_bundle/qgis_bundle.bash $CONFIG_FILE
+$DIR/qgis_bundle/qgis_bundle.bash "$CONFIG_FILE"
 
 echo "Package QGIS"
-$DIR/qgis_package/qgis_package.bash $CONFIG_FILE $PACKAGE
+$DIR/qgis_package/qgis_package.bash "$CONFIG_FILE" "$BUILD_DIR/$PACKAGE"
 
 echo "All done (qgis-mac-packager.bash)"
-cd $PWD
+cd "$PWD"
 
 exit 0
\ No newline at end of file
diff --git a/qgis_bundle/recipes/geos/recipe.sh b/qgis_bundle/recipes/geos/recipe.sh
index ca98c282..7387ac2a 100644
--- a/qgis_bundle/recipes/geos/recipe.sh
+++ b/qgis_bundle/recipes/geos/recipe.sh
@@ -9,6 +9,7 @@ function check_geos() {
 
 function bundle_geos() {
     try cp -av $DEPS_LIB_DIR/libgeos_c.* $BUNDLE_LIB_DIR
+    try cp -av $DEPS_LIB_DIR/libgeos.* $BUNDLE_LIB_DIR
 }
 
 function postbundle_geos() {
@@ -56,7 +57,7 @@ function postbundle_geos() {
  install_name_change $DEPS_LIB_DIR/$LINK_libgeos_c @rpath/$LINK_libgeos_c $BUNDLE_CONTENTS_DIR/MacOS/lib/libqgis_app.$QGIS_VERSION.0.dylib
  install_name_change $DEPS_LIB_DIR/$LINK_libgeos_c @rpath/$LINK_libgeos_c $BUNDLE_CONTENTS_DIR/MacOS/lib/libqgispython.$QGIS_VERSION.0.dylib
 
- install_name_change $DEPS_LIB_DIR/libgeos.3.8.1.dylib @rpath/libgeos.3.8.1.dylib $BUNDLE_CONTENTS_DIR/MacOS/lib/libgeos_c.1.13.3.dylib
+ install_name_change $DEPS_LIB_DIR/$LINK_libgeos @rpath/$LINK_libgeos $BUNDLE_CONTENTS_DIR/MacOS/lib/$LINK_libgeos_c
 
  install_name_change $DEPS_LIB_DIR/$LINK_libgeos_c @rpath/$LINK_libgeos_c $BUNDLE_CONTENTS_DIR/MacOS/lib/libgrass_vector.${VERSION_grass_major}.${VERSION_grass_minor}.dylib
  install_name_change $DEPS_LIB_DIR/$LINK_libgeos_c @rpath/$LINK_libgeos_c $BUNDLE_CONTENTS_DIR/MacOS/lib/$LINK_spatialite
diff --git a/qgis_package/qgis_package.bash b/qgis_package/qgis_package.bash
index ac5ec305..5f74f2ce 100755
--- a/qgis_package/qgis_package.bash
+++ b/qgis_package/qgis_package.bash
@@ -16,17 +16,17 @@ source $CONFIG_FILE
 
 PACKAGE=$2
 
-QGIS_APP=$BUNDLE_DIR/QGIS.app
+QGIS_APP="$BUNDLE_DIR/QGIS.app"
 if [ ! -d "$QGIS_APP" ]; then
   error "missing bundled app $QGIS_APP"
 fi
 
 if [ -f "$PACKAGE" ]; then
   info "$PACKAGE exists, removing"
-  rm -f $PACKAGE
+  rm -f "$PACKAGE"
 fi
 
-IDENTITY=`cat $SIGN_FILE`
+IDENTITY=$(cat "$SIGN_FILE")
 if [ ${#IDENTITY} -ne 40 ]; then
   error "SIGN FILE $SIGN_FILE invalid. key must have 40 chars" ;
 fi
@@ -39,22 +39,22 @@ info "Print identities"
 security find-identity -v -p codesigning
 
 info "Signing the QGIS.app"
-codesign -s $IDENTITY -v --force --keychain $KEYCHAIN_FILE $QGIS_APP --deep
-codesign --deep-verify --verbose $QGIS_APP
+codesign -s "$IDENTITY" -v --force --keychain "$KEYCHAIN_FILE" "$QGIS_APP" --deep
+codesign --deep-verify --verbose "$QGIS_APP"
 
 info "Create dmg image"
 dmgbuild \
-  -Dapp=$QGIS_APP \
+  -Dapp="$QGIS_APP" \
   -s `dirname $0`/../resources/dmgsettings.py \
   "QGIS.app" \
-  $PACKAGE
+  "$PACKAGE"
 
 info "Signing the dmg"
-codesign -s $IDENTITY -v --force --keychain $KEYCHAIN_FILE $PACKAGE
-codesign --deep-verify --verbose
+codesign -s "$IDENTITY" -v --force --keychain "$KEYCHAIN_FILE" "$PACKAGE"
+codesign --deep-verify --verbose "$PACKAGE"
 
 info "Create checksum"
-sha256sum $PACKAGE > $PACKAGE.sha256sum
+sha256sum "$PACKAGE" > "$PACKAGE.sha256sum"
 
-FSIZE=`du -h $PACKAGE`
-info "Dmg created with size $FSIZE"
\ No newline at end of file
+F_SIZE=$(du -h "$PACKAGE")
+info "Dmg created with size $F_SIZE"
\ No newline at end of file