This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/cleanup in repository x2goclient. from f7162c8 Merge branch 'master' into feature/cleanup new bf12092 macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. new fc2b2d0 macbuild.sh: use sh default assignment instead of default value. new 7b0e513 macbuild.sh: app bundle and dmg file will be automatically removed when removing the client build directory. new 8f1ebda macbuild.sh: Remove 'function' keyword, as it's causing undefined behavior according to SUS. new 867649e macbuild.sh: define, implement and use new function 'make_boolean()'. new a266d77 macbuild.sh: move functions to the start of the macbuild.sh script. new 1ec8142 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 13 ++++++++++++ macbuild.sh | 58 ++++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 24 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit bf12092eb45cebe40c3bd05b60d97f4048d6fb7a Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 02:46:02 2015 +0100 macbuild.sh: only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. --- debian/changelog | 1 + macbuild.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 15a271a..b84512e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -220,6 +220,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium fixing... - Remove config_mac.sh. macbuild.sh handles this now. - Use the correct client build dir in macbuild.sh: client_build. + - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 9263d26..35bdb48 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -30,7 +30,7 @@ SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK} MATCH_NUMBERS='^[0-9]+$' if [[ "${SDK_MINOR_VERSION}" =~ ${MATCH_NUMBERS} ]]; then - STDLIB="libstdc++" + [ "${SDK_MINOR_VERSION}" -gt "6" ] && STDLIB="libstdc++" [ "${SDK_MINOR_VERSION}" -gt "8" ] && STDLIB="libc++" else echo "Unable to determine OS X version. Unknown value '${SDK_MINOR_VERSION}'." >&2 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit fc2b2d0f6ecc94b532cdcafdec7e7e6a01cceadc Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:06:21 2015 +0100 macbuild.sh: use sh default assignment instead of default value. Removes the need to redundantly specify the variable name. --- debian/changelog | 2 ++ macbuild.sh | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b84512e..03dff24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -221,6 +221,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Remove config_mac.sh. macbuild.sh handles this now. - Use the correct client build dir in macbuild.sh: client_build. - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. + - Use sh default assignment instead of default value in macbuild.sh. + Removes the need to redundantly specify the variable name. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 35bdb48..aedcabe 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -11,10 +11,10 @@ PKG_DMG="${TOP_DIR}/pkg-dmg" NXPROXY="$(which nxproxy)" -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"}" +: ${SDK:="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk"} +: ${MACOSX_DEPLOYMENT_TARGET:="10.7"} +: ${DEBUG:="0"} +: ${BUNDLE:="1"} case "${DEBUG}" in ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") BUILD_MODE="release";; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 7b0e51301de37fe192a269c05c95a0bba77baaef Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:08:01 2015 +0100 macbuild.sh: app bundle and dmg file will be automatically removed when removing the client build directory. Remove redundancy. --- debian/changelog | 2 ++ macbuild.sh | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03dff24..0ca168a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -223,6 +223,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Only use --stdlib compiler flag on 10.7+. Unsupported on 10.6 and below. - Use sh default assignment instead of default value in macbuild.sh. Removes the need to redundantly specify the variable name. + - App bundle and dmg file will be automatically removed when removing the + client build directory. Remove redundancy from macbuild.sh. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index aedcabe..27e4988 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -49,8 +49,6 @@ function phase() { phase "Cleaning" make clean -rm -rf "${APPBUNDLE}" -rm -rf "${DMGFILE}" [ -e "${BUILD_DIR}" ] && rm -rf "${BUILD_DIR}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 8f1ebda3760f85c12471988387276481cb3955f5 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:16:09 2015 +0100 macbuild.sh: Remove 'function' keyword, as it's causing undefined behavior according to SUS. --- debian/changelog | 2 ++ macbuild.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0ca168a..50e5758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -225,6 +225,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium Removes the need to redundantly specify the variable name. - App bundle and dmg file will be automatically removed when removing the client build directory. Remove redundancy from macbuild.sh. + - Remove 'function' keyword in macbuild.sh, as it's causing undefined + behavior according to SUS. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 27e4988..9e6ba76 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -39,7 +39,7 @@ fi set -e -function phase() { +phase() { echo echo "***" echo "*** ${1}..." -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 867649e6702a06d13dd695051910ec49ee2de28e Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:21:13 2015 +0100 macbuild.sh: define, implement and use new function 'make_boolean()'. Takes a pseudo-boolean value and outputs either 0 or 1. --- debian/changelog | 2 ++ macbuild.sh | 25 ++++++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50e5758..60cfbee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -227,6 +227,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium client build directory. Remove redundancy from macbuild.sh. - Remove 'function' keyword in macbuild.sh, as it's causing undefined behavior according to SUS. + - Define and implement new function 'make_boolean()' in macbuild.sh. Takes + a pseudo-boolean value and outputs either 0 or 1. Use this function. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index 9e6ba76..c5e25d5 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -16,15 +16,22 @@ NXPROXY="$(which nxproxy)" : ${DEBUG:="0"} : ${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 + +make_boolean() { + OPTION="${1}" + + case "${OPTION}" in + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") OPTION="0";; + (*) OPTION="1";; + esac + + printf "${OPTION}" +} + +DEBUG="$(make_boolean "${DEBUG}")" +BUNDLE="$(make_boolean "${BUNDLE}")" + +[ "${DEBUG}" -eq "0" ] && BUILD_MODE="release" || BUILD_MODE="debug" SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit a266d775091b24c045213ce3f638b6c716dc1a8b Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:24:33 2015 +0100 macbuild.sh: move functions to the start of the macbuild.sh script. --- debian/changelog | 1 + macbuild.sh | 40 ++++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index 60cfbee..8d33d91 100644 --- a/debian/changelog +++ b/debian/changelog @@ -229,6 +229,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium behavior according to SUS. - Define and implement new function 'make_boolean()' in macbuild.sh. Takes a pseudo-boolean value and outputs either 0 or 1. Use this function. + - Move functions to the start of the macbuild.sh script. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index c5e25d5..bd35460 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -1,4 +1,24 @@ #!/bin/bash + +make_boolean() { + OPTION="${1}" + + case "${OPTION}" in + ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") OPTION="0";; + (*) OPTION="1";; + esac + + printf "${OPTION}" +} + +phase() { + echo + echo "***" + echo "*** ${1}..." + echo "***" + echo +} + NAME="x2goclient" TOP_DIR="$(dirname "$0")" @@ -16,18 +36,6 @@ NXPROXY="$(which nxproxy)" : ${DEBUG:="0"} : ${BUNDLE:="1"} - -make_boolean() { - OPTION="${1}" - - case "${OPTION}" in - ("0"|"no"|""|"No"|"nO"|"NO"|"false"|"FALSE") OPTION="0";; - (*) OPTION="1";; - esac - - printf "${OPTION}" -} - DEBUG="$(make_boolean "${DEBUG}")" BUNDLE="$(make_boolean "${BUNDLE}")" @@ -46,14 +54,6 @@ fi set -e -phase() { - echo - echo "***" - echo "*** ${1}..." - echo "***" - echo -} - phase "Cleaning" make clean -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch feature/cleanup in repository x2goclient. commit 1ec814218139f829329d938661e61a02c36e2885 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Feb 18 03:27:19 2015 +0100 macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh. Switches the build architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 and x86 (UNIVERSAL=1). --- debian/changelog | 3 +++ macbuild.sh | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8d33d91..5ad85b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -230,6 +230,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Define and implement new function 'make_boolean()' in macbuild.sh. Takes a pseudo-boolean value and outputs either 0 or 1. Use this function. - Move functions to the start of the macbuild.sh script. + - New env var/parameter UNIVERSAL in macbuild.sh. Switches the build + architecture to either exclusively x86_64 (UNIVERSAL=0) or both x86_64 + and x86 (UNIVERSAL=1). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 diff --git a/macbuild.sh b/macbuild.sh index bd35460..e25caf5 100755 --- a/macbuild.sh +++ b/macbuild.sh @@ -35,12 +35,17 @@ NXPROXY="$(which nxproxy)" : ${MACOSX_DEPLOYMENT_TARGET:="10.7"} : ${DEBUG:="0"} : ${BUNDLE:="1"} +: ${UNIVERSAL:="1"} DEBUG="$(make_boolean "${DEBUG}")" BUNDLE="$(make_boolean "${BUNDLE}")" +UNIVERSAL="$(make_boolean "${UNIVERSAL}")" [ "${DEBUG}" -eq "0" ] && BUILD_MODE="release" || BUILD_MODE="debug" +BUILD_ARCH="x86_64" +[ "${UNIVERSAL}" -eq "1" ] && BUILD_ARCH="${BUILD_ARCH} x86" + SDK_MINOR_VERSION="$(/usr/bin/perl -pe 's#.*?10\.(\d+).*?\.sdk$#\1#' <<< "${SDK}")" MATCH_NUMBERS='^[0-9]+$' @@ -67,7 +72,7 @@ lrelease "${PROJECT}" phase "Running qmake" qmake -config "${BUILD_MODE}" -spec macx-g++ "${PROJECT}" \ - CONFIG+="x86_64" \ + CONFIG+="${BUILD_ARCH}" \ QMAKE_MAC_SDK="${SDK}" \ QMAKE_MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET}" \ OSX_STDLIB="${STDLIB}" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org