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

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

commit 189782cf9f937351277b9cc1e498178408f1aed6
Author: Mihai Moldovan <io...@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 ec3b75f..056ed09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
     - 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.
 
  -- X2Go Release Manager <git-ad...@x2go.org>  Mon, 19 Sep 2016 09:07:07 +0200
 
diff --git a/macbuild.sh b/macbuild.sh
index 9ea2d32..e0db1f7 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -106,6 +106,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"
@@ -202,15 +204,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
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to