rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

OP-1879 remove openpilot hardcoding: update Darwin packaging to use make GCS_X_NAME variables

Browse Source
This commit is contained in:
James Duley 2015-05-18 22:05:54 +01:00 committed by LibrePilot Packager
parent 2dee2328d0
commit 1128af5282
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/Darwin.mk
View File

@ -15,6 +15,8 @@ endif
( \ ( \
ROOT_DIR="$(ROOT_DIR)" \ ROOT_DIR="$(ROOT_DIR)" \
BUILD_DIR="$(BUILD_DIR)" \ BUILD_DIR="$(BUILD_DIR)" \
GCS_BIG_NAME="$(GCS_BIG_NAME)" \
GCS_SMALL_NAME="$(GCS_SMALL_NAME)" \
PACKAGE_LBL="$(PACKAGE_LBL)" \ PACKAGE_LBL="$(PACKAGE_LBL)" \
PACKAGE_DIR="$(PACKAGE_DIR)" \ PACKAGE_DIR="$(PACKAGE_DIR)" \
PACKAGE_NAME="$(PACKAGE_NAME)" \ PACKAGE_NAME="$(PACKAGE_NAME)" \

2
package/osx/libraries
View File

@ -4,7 +4,7 @@ APP="${1?}"
PLUGINS="${APP}/Contents/Plugins" PLUGINS="${APP}/Contents/Plugins"
OP_PLUGINS="${APP}/Contents/Plugins/OpenPilot" 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_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" 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" OSG_EXTRA="libosgViewer.90.dylib"

8
package/osx/package
View File

@ -4,12 +4,12 @@
: ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?} : ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
# more variables # 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" OUT_FILE="${PACKAGE_DIR}/../${PACKAGE_NAME}${PACKAGE_SEP}${PACKAGE_LBL}${PACKAGE_SEP}osx.dmg"
SRC_DIR="${PACKAGE_DIR}/src" SRC_DIR="${PACKAGE_DIR}/src"
APPLICATION_NAME="OpenPilot GCS.app" APPLICATION_NAME="${GCS_BIG_NAME}.app"
VOL_NAME="OpenPilot GCS" VOL_NAME="${GCS_BIG_NAME}"
# cleanup previous build # cleanup previous build
rm -rf "${SRC_DIR}" rm -rf "${SRC_DIR}"
rm -rf "${OUT_FILE}" rm -rf "${OUT_FILE}"
@ -31,7 +31,7 @@ cp "${ROOT_DIR}/LICENSE.txt" "${SRC_DIR}/Docs/"
cp "${ROOT_DIR}/GPLv3.txt" "${SRC_DIR}/Docs/" cp "${ROOT_DIR}/GPLv3.txt" "${SRC_DIR}/Docs/"
"${ROOT_DIR}/package/osx/libraries" \ "${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" \ "${ROOT_DIR}/package/osx/create-dmg/create-dmg" \
--volname "${VOL_NAME}" \ --volname "${VOL_NAME}" \