[X2Go-Commits] [x2goclient] 39/217: macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.
git-admin at x2go.org
git-admin at x2go.org
Sat Aug 27 19:24:22 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 bbf966dcb3febd5873f544e6c0044ecf0433ecaa
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 3 23:28:02 2015 +0200
macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.
---
debian/changelog | 1 +
macbuild.sh | 8 +++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 183db4b..b1004f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -104,6 +104,7 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
- macbuild.sh: add new lazy_canonical_path() helper function.
- macbuild.sh: add new get_nesting_level() helper function.
- macbuild.sh: add new repeat_str() helper function.
+ - macbuild.sh: refactor nxproxy detection to use MACPORTS_PREFIX.
* debian/control:
- Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
- Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/macbuild.sh b/macbuild.sh
index e264e86..9ea2d32 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -110,7 +110,6 @@ DMGFILE="${BUILD_DIR}/${NAME}.dmg"
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
@@ -122,6 +121,8 @@ else
MACPORTS_PREFIX_SEARCH="/opt/local/"
fi
+NXPROXY="nxproxy"
+
: ${SDK:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}
: ${MACOSX_DEPLOYMENT_TARGET:="10.7"}
: ${FORCE_STDLIB:="0"}
@@ -164,6 +165,11 @@ else
fi
fi
+# Gather files.
+NXPROXY="$(lazy_canonical_path "${MACPORTS_PREFIX}/bin/${NXPROXY}")"
+
+[ -x "${NXPROXY}" ] || dependency_error "nxproxy" "nxproxy" "binary"
+
set -e
phase "Cleaning"
--
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