[X2Go-Commits] [x2goclient] 86/87: macbuild.sh: new env var/parameter UNIVERSAL in macbuild.sh.

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit 37cc1a9cd654b68dbad17e3ea1f9c8ffc3196322
Author: Mihai Moldovan <ionic at 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 ccf0e3e..fca4fa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -254,6 +254,9 @@ x2goclient (4.0.3.2-0x2go1) unstable; 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).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Thu, 19 Feb 2015 12:49:22 +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/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git