This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 8986b541ec68bed8bb46f8d691cd32f31d02c908
Author: Mihai Moldovan <io...@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 c4341a8..b485647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,6 +70,7 @@ x2goclient (4.0.5.3-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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to