[X2Go-Commits] [buildscripts] 01/01: bin/build-osx-package: correctly pass env variables to macbuild.sh call, simplify SDK setting since we now can use the 10.10 SDK on 10.10.

git-admin at x2go.org git-admin at x2go.org
Thu Apr 6 11:28:54 CEST 2017


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

x2go pushed a commit to branch master
in repository buildscripts.

commit 8c6736be1686143a19c0c439bb58963dd64b81c4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 6 11:28:45 2017 +0200

    bin/build-osx-package: correctly pass env variables to macbuild.sh call, simplify SDK setting since we now can use the 10.10 SDK on 10.10.
---
 bin/build-osx-package | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/bin/build-osx-package b/bin/build-osx-package
index 16b2805..7bbaedd 100755
--- a/bin/build-osx-package
+++ b/bin/build-osx-package
@@ -254,17 +254,11 @@ build_packages() {
 
 			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}")
+			macbuild_env+=("SDK=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${os_major}.${os_minor}.sdk")
 
 			[ "${is_release}" -eq "0" ] && macbuild_env+=("DEBUG=1") || macbuild_env+=("DEBUG=0")
 
-			"${macbuild_env[@]}" "./macbuild.sh"
+			env "${macbuild_env[@]}" "./macbuild.sh"
 
 			# FIXME: this is not generic at all.
 			typeset top_commit_id="$(git rev-parse --no-flags "HEAD^{commit}")"

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list