From 1128af52828e405d22a3fae7260242a37e026d66 Mon Sep 17 00:00:00 2001
From: James Duley <jagduley@gmail.com>
Date: Mon, 18 May 2015 22:05:54 +0100
Subject: [PATCH] OP-1879 remove openpilot hardcoding: update Darwin packaging
 to use make GCS_X_NAME variables

---
 package/Darwin.mk     | 2 ++
 package/osx/libraries | 2 +-
 package/osx/package   | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/package/Darwin.mk b/package/Darwin.mk
index a9035a96e..8b3d86651 100644
--- a/package/Darwin.mk
+++ b/package/Darwin.mk
@@ -15,6 +15,8 @@ endif
 	( \
 	  ROOT_DIR="$(ROOT_DIR)" \
 	  BUILD_DIR="$(BUILD_DIR)" \
+	  GCS_BIG_NAME="$(GCS_BIG_NAME)" \
+	  GCS_SMALL_NAME="$(GCS_SMALL_NAME)" \
 	  PACKAGE_LBL="$(PACKAGE_LBL)" \
 	  PACKAGE_DIR="$(PACKAGE_DIR)" \
 	  PACKAGE_NAME="$(PACKAGE_NAME)" \
diff --git a/package/osx/libraries b/package/osx/libraries
index 537015884..b6ce04af2 100755
--- a/package/osx/libraries
+++ b/package/osx/libraries
@@ -4,7 +4,7 @@ APP="${1?}"
 PLUGINS="${APP}/Contents/Plugins"
 OP_PLUGINS="${APP}/Contents/Plugins/OpenPilot"
 QT_LIBS="QtCore QtGui QtMultimedia QtMultimediaWidgets QtNetwork QtOpenGL QtPrintSupport QtQml QtQuick QtScript QtSerialPort QtSql QtSvg QtWidgets QtV8 QtXml"
-QT_DIR=$(otool -L "${APP}/Contents/MacOS/OpenPilot GCS" | sed -n -e 's/\/QtCore\.framework.*//p' | sed -n -E 's:^.::p')
+QT_DIR=$(otool -L "${APP}/Contents/MacOS/${GCS_BIG_NAME}" | sed -n -e 's/\/QtCore\.framework.*//p' | sed -n -E 's:^.::p')
 QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib imageformats/libqsvg.dylib qmltooling/libqmldbg_tcp.dylib sqldrivers/libqsqlodbc.dylib sqldrivers/libqsqlpsql.dylib sqldrivers/libqsqlite.dylib imageformats/libqtga.dylib iconengines/libqsvgicon.dylib"
 
 OSG_EXTRA="libosgViewer.90.dylib"
diff --git a/package/osx/package b/package/osx/package
index 1fce408b0..c677685c5 100755
--- a/package/osx/package
+++ b/package/osx/package
@@ -4,12 +4,12 @@
 : ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
 
 # more variables
-APP_PATH="${BUILD_DIR}/openpilotgcs_release/OpenPilot GCS.app"
+APP_PATH="${BUILD_DIR}/${GCS_SMALL_NAME}_release/${GCS_BIG_NAME}.app"
 OUT_FILE="${PACKAGE_DIR}/../${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}${PACKAGE_SEP}osx.dmg"
 
 SRC_DIR="${PACKAGE_DIR}/src"
-APPLICATION_NAME="OpenPilot GCS.app"
-VOL_NAME="OpenPilot GCS"
+APPLICATION_NAME="${GCS_BIG_NAME}.app"
+VOL_NAME="${GCS_BIG_NAME}"
 # cleanup previous build
 rm -rf "${SRC_DIR}"
 rm -rf "${OUT_FILE}"
@@ -31,7 +31,7 @@ cp "${ROOT_DIR}/LICENSE.txt" "${SRC_DIR}/Docs/"
 cp "${ROOT_DIR}/GPLv3.txt" "${SRC_DIR}/Docs/"
 
 "${ROOT_DIR}/package/osx/libraries" \
-    "${SRC_DIR}/OpenPilot GCS.app" || exit 1
+    "${SRC_DIR}/${APPLICATION_NAME}" || exit 1
 
 "${ROOT_DIR}/package/osx/create-dmg/create-dmg" \
 --volname "${VOL_NAME}" \