[X2Go-Commits] [x2goclient] 34/179: macbuild.sh: add new MACPORTS_PREFIX detection/variable.
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 20 23:54:58 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit ed94127ebb312a5ee9ceede1d26d250bc20656e9
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 3 23:16:27 2015 +0200
macbuild.sh: add new MACPORTS_PREFIX detection/variable.
---
debian/changelog | 1 +
macbuild.sh | 18 ++++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8b8cad0..e92b4c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- compat.h: include QtCore/qglobal.h for Q_OS_... macros.
- pulsemanager.{cpp,h}: new class for PulseAudio management.
- x2goclient.pro{,.maemo}: reference new pulsemanager.{cpp,h} files.
+ - macbuild.sh: add new MACPORTS_PREFIX detection/variable.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
diff --git a/macbuild.sh b/macbuild.sh
index 64a93ec..6e37740 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -32,6 +32,7 @@ usage() {
printf "\tDEBUG\t\t\t\tenables or disables debug builds [boolean]\n\t\t\t\t\tdefault: disabled\n"
printf "\tBUNDLE\t\t\t\tenables or disables library bundling and the creation of a .dmg installer [boolean]\n\t\t\t\t\tdefault: enabled\n"
printf "\tUNIVERSAL\t\t\tenables or disables x86 support. x86_64 support is always enabled [boolean]\n\t\t\t\t\tdefault: enabled\n"
+ printf "\tMACPORTS_PREFIX\t\t\tsets the (MacPorts) prefix used to detect PulseAudio and nxproxy binaries\n\t\t\t\t\tdefault: /opt/local/\n"
printf "\n"
printf "Boolean values help:\n"
printf "\ta value of ${NO_VAL} will be treated as false\n"
@@ -54,6 +55,16 @@ PROJECT="${TOP_DIR}/${NAME}.pro"
PKG_DMG="${TOP_DIR}/pkg-dmg"
NXPROXY="$(which nxproxy)"
+# Try to find the MacPorts prefix.
+typeset MACPORTS_PREFIX_SEARCH=""
+if type -P port >/dev/null 2>&1; then
+ MACPORTS_PREFIX_SEARCH="$(type -P port)"
+ MACPORTS_PREFIX_SEARCH="${MACPORTS_PREFIX_SEARCH%%bin/port}"
+else
+ # Port not being part find in ${PATH} doesn't necessarily mean it isn't available.
+ # Try to guess.
+ MACPORTS_PREFIX_SEARCH="/opt/local/"
+fi
: ${SDK:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}
: ${MACOSX_DEPLOYMENT_TARGET:="10.7"}
@@ -61,6 +72,9 @@ NXPROXY="$(which nxproxy)"
: ${DEBUG:="0"}
: ${BUNDLE:="1"}
: ${UNIVERSAL:="1"}
+: ${MACPORTS_PREFIX:="${MACPORTS_PREFIX_SEARCH}"}
+
+unset MACPORTS_PREFIX_SEARCH
FORCE_STDLIB="$(make_boolean "${FORCE_STDLIB}")"
DEBUG="$(make_boolean "${DEBUG}")"
@@ -114,10 +128,6 @@ pushd "${BUILD_DIR}"
phase "Running lrelease"
lrelease "${PROJECT}"
-
-# WILL BE REMOVED IN OTHER BRANCH - ONLY HERE FOR COMPAT REASONS
-MACPORTS_PREFIX="/opt/local"
-
phase "Running qmake"
qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \
CONFIG+="${BUILD_ARCH}" \
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list