This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 59a0bca3bec7ebe63fe955849b62778e6d9b6b12 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 16 03:24:32 2015 +0100 macbuild.sh: make bundling optional (but enabled by default) via the new BUNDLE environment variable. --- debian/changelog | 2 ++ macbuild.sh | 59 +++++++++++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82654e9..9c5075c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -235,6 +235,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium - Fix TOP_DIR handling in macbuild.sh. - Switch to BASH interpreter for macbuild.sh. - Also accept "FALSE" and "false" as binary values in macbuild.sh. + - Make bundling optional (but enabled by default) via the new BUNDLE + environment variable in macbuild.sh. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 12:49:22 +0100 diff --git a/macbuild.sh b/macbuild.sh index ffe2d5b..4df34b4 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -18,12 +18,18 @@ LIBZ="libz.1.dylib" SDK="${SDK:-"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"}" MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-"10.7"}" DEBUG="${DEBUG:-"0"}" +BUNDLE="${BUNDLE:-"1"}" case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; (*) BUILD_MODE="debug";; esac +case "${BUNDLE}" in + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUNDLE="0";; + (*) BUNDLE="1";; +esac + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -71,30 +77,33 @@ make -j2 phase "Copying nxproxy" mkdir -p "${APPBUNDLE}/Contents/exe" cp "${NXPROXY}" "${APPBUNDLE}/Contents/exe" -dylibbundler \ - --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ - --bundle-deps \ - --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ - --install-path "@executable_path/../Frameworks/" \ - --create-dir - -phase "Bundling up using macdeployqt" -macdeployqt "${APPBUNDLE}" -verbose=2 - -phase "Creating DMG" -${PKG_DMG} \ - --source "${APPBUNDLE}" \ - --sourcefile \ - --target "${DMGFILE}" \ - --volname "x2goclient" \ - --verbosity 2 \ - --mkdir "/.background" \ - --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ - --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ - --copy "${TOP_DIR}/LICENSE" \ - --copy "${TOP_DIR}/COPYING" \ - --symlink "/Applications: " \ - --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ - --format "UDBZ" + +if [ "${BUNDLE}" = "1" ]; then + dylibbundler \ + --fix-file "${APPBUNDLE}/Contents/exe/nxproxy" \ + --bundle-deps \ + --dest-dir "${APPBUNDLE}/Contents/Frameworks" \ + --install-path "@executable_path/../Frameworks/" \ + --create-dir + + phase "Bundling up using macdeployqt" + macdeployqt "${APPBUNDLE}" -verbose=2 + + phase "Creating DMG" + ${PKG_DMG} \ + --source "${APPBUNDLE}" \ + --sourcefile \ + --target "${DMGFILE}" \ + --volname "x2goclient" \ + --verbosity 2 \ + --mkdir "/.background" \ + --copy "${TOP_DIR}/res/img/png/macinstaller_background.png:/.background" \ + --copy "${TOP_DIR}/res/osxbundle/macdmg.DS_Store:/.DS_Store" \ + --copy "${TOP_DIR}/LICENSE" \ + --copy "${TOP_DIR}/COPYING" \ + --symlink "/Applications: " \ + --icon "${TOP_DIR}/res/img/icons/x2go-mac.icns" \ + --format "UDBZ" +fi popd -- Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git