From: Ian Silvester <iansilvester@fastmail.fm>
Date: Wed, 16 Jan 2013 01:16:07 +0000 (+0000)
Subject: Extended the range of build variants
X-Git-Url: http://www.privoxy.org/gitweb/user-manual/contact.html?p=OSXPackageBuilder.git;a=commitdiff_plain;h=a0b4fc0e8c97b17fc577332c9153799334a0d763

Extended the range of build variants
---

diff --git a/build.sh b/build.sh
index dd2d58c..9644b47 100755
--- a/build.sh
+++ b/build.sh
@@ -36,7 +36,7 @@
 # must provide target
 #
 if [ $# -eq 0 -o $# -gt 2 ]; then
-  echo "Usage: $0 lion | snowleopard64 | snowleopard | leopardupwards | leopard | tiger | panther  [-pcre]"
+  echo "Usage: $0 lion | snowleopardx64 | snowleopard | snowleopardi386 | leopardupwards | leopard | leopardi386 | leopardppc | tiger | panther  [-pcre]"
   exit 1
 fi
 
diff --git a/common.sh b/common.sh
index e6b615f..ff46c90 100755
--- a/common.sh
+++ b/common.sh
@@ -45,7 +45,7 @@ release_name=$1
 # check the release name
 #
 case "${release_name}" in
-  # Mac OS X 10.7 (64bit only)
+  # Mac OS X 10.7 (x86_64 only)
   "lion")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.7.sdk"
@@ -53,16 +53,24 @@ case "${release_name}" in
     ARCH="-arch x86_64"
     STARTUP="LaunchDaemon"
     ;;
-  # Mac OS X 10.6 64bit
-  "snowleopard64")
+  # Mac OS X 10.6 x86_64
+  "snowleopardx64")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
     ARCH="-arch x86_64"
     STARTUP="LaunchDaemon"
     ;;
-  # Mac OS X 10.6
+  # Mac OS X 10.6 Universal
   "snowleopard")
+    XCODE_PATH="`/usr/bin/xcode-select -print-path`"
+    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.6"
+    ARCH="-arch x86_64 -arch i386"
+    STARTUP="LaunchDaemon"
+    ;;
+  # Mac OS X 10.6 i386
+  "snowleopardi386")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
@@ -85,6 +93,22 @@ case "${release_name}" in
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
     ;;
+  # Mac OS X 10.5 i386
+  "leopardi386")
+    XCODE_PATH="`/usr/bin/xcode-select -print-path`"
+    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.5"
+    ARCH="-arch i386"
+    STARTUP="LaunchDaemon"
+    ;;
+  # Mac OS X 10.5 PPC
+  "leopardppc")
+    XCODE_PATH="`/usr/bin/xcode-select -print-path`"
+    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.5"
+    ARCH="-arch ppc"
+    STARTUP="LaunchDaemon"
+    ;;
   # Mac OS X 10.4
   "tiger")
     XCODE_PATH="/Developer"