This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 7b51208 bin/build-osx-package: parameter order is important for OS X' chmod implementation. new db01403 bin/build-osx-package: add SDK and MACOSX_DEPLOYMENT_TARGET env variables to ${macbuild_env[]}. The 1 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: bin/build-osx-package | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit db01403202da7c95ea9b63e2fea54a90c99f5ca7 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 6 10:11:34 2017 +0200 bin/build-osx-package: add SDK and MACOSX_DEPLOYMENT_TARGET env variables to ${macbuild_env[]}. --- bin/build-osx-package | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/bin/build-osx-package b/bin/build-osx-package index e20379d..16b2805 100755 --- a/bin/build-osx-package +++ b/bin/build-osx-package @@ -236,12 +236,6 @@ build_packages() { # Make qt4 tools available. export PATH="${PATH}:/opt/local/libexec/qt4/bin/" - typeset -a macbuild_env - macbuild_env=("BUNDLE=1" "UNIVERSAL=0") - [ "${is_release}" -eq "0" ] && macbuild_env+=("DEBUG=1") || macbuild_env+=("DEBUG=0") - - "${macbuild_env[@]}" "./macbuild.sh" - typeset -i os_major="0" typeset -i os_minor="0" os_major="$(get_generic_major_version "${l_CODENAME}")" @@ -258,6 +252,20 @@ build_packages() { exit "1" fi + typeset -a macbuild_env + macbuild_env=("BUNDLE=1" "UNIVERSAL=0" "MACOSX_DEPLOYMENT_TARGET=${os_major}.${os_minor}") + + typeset sdk_val="SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${os_major}." + + # Use 10.11 SDK on 10.10, since we have installed Xcode 7. That's fine, since we set MACOSX_DEPLOYMENT_TARGET correctly. + [ "${os_minor}" -eq "10" ] && sdk_val="${sdk_val}11" || sdk_val="${sdk_val}${os_minor}" + sdk_val="${sdk_val}.sdk" + macbuild_env+=("${sdk_val}") + + [ "${is_release}" -eq "0" ] && macbuild_env+=("DEBUG=1") || macbuild_env+=("DEBUG=0") + + "${macbuild_env[@]}" "./macbuild.sh" + # FIXME: this is not generic at all. typeset top_commit_id="$(git rev-parse --no-flags "HEAD^{commit}")" typeset base_name="${PROJECT}-${UPSTREAM_VERSION}." -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org