[X2Go-Commits] [x2goclient] 41/139: macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables.
git-admin at x2go.org
git-admin at x2go.org
Sun Jan 17 06:02:55 CET 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 4200516b145422935032ba3d9c5ea4f026c8fc21
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sun May 3 23:30:08 2015 +0200
macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables.
Create directories based on that. Use them when bundling.
---
debian/changelog | 2 ++
macbuild.sh | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 248aeef..5264f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,6 +89,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- 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.
+ - macbuild.sh: add EXE_DIR and FRAMEWORKS_DIR internal variables. Create
+ directories based on that. Use them when bundling.
* debian/control:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
diff --git a/macbuild.sh b/macbuild.sh
index f176f98..13184d8 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -104,6 +104,8 @@ TOP_DIR="$(dirname "$0")"
[[ "${TOP_DIR}" == /* ]] || TOP_DIR="${PWD}/${TOP_DIR#./}"
BUILD_DIR="${TOP_DIR}/client_build"
APPBUNDLE="${BUILD_DIR}/${NAME}.app"
+EXE_DIR="${APPBUNDLE}/Contents/exe/"
+FRAMEWORKS_DIR="${APPBUNDLE}/Contents/Frameworks/"
DMGFILE="${BUILD_DIR}/${NAME}.dmg"
PROJECT="${TOP_DIR}/${NAME}.pro"
PKG_DMG="${TOP_DIR}/pkg-dmg"
@@ -187,15 +189,17 @@ qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \
phase "Running make"
make -j2
+mkdir -p "${EXE_DIR}/"
+mkdir -p "${FRAMEWORKS_DIR}/"
+
phase "Copying nxproxy"
-mkdir -p "${APPBUNDLE}/Contents/exe"
-cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe"
+cp -av "${NXPROXY}" "${EXE_DIR}/"
if [ "${BUNDLE}" = "1" ]; then
dylibbundler \
- --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \
+ --fix-file "${EXE_DIR}/nxproxy" \
--bundle-deps \
- --dest-dir "${APPBUNDLE}/Contents/Frameworks" \
+ --dest-dir "${FRAMEWORKS_DIR}/" \
--install-path "@executable_path/../Frameworks/" \
--create-dir
--
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