X-Git-Url: http://www.privoxy.org/gitweb/index.html?a=blobdiff_plain;f=common.sh;h=1b97b0901e8c1a6521990b6bdd6f841f9175294a;hb=7aa8c87243a3efd18aa72ea4d1db1da10bc54cf7;hp=e6b615fdd53f4d0c02b6a263010e6f8ad2fe38c1;hpb=29beb00a50eac776824da88de003336d9ef751a7;p=OSXPackageBuilder.git

diff --git a/common.sh b/common.sh
index e6b615f..1b97b09 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 all supported architectures
   "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"
@@ -77,7 +85,7 @@ case "${release_name}" in
     ARCH="-arch x86_64 -arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
     ;;
-  # Mac OS X 10.5
+  # Mac OS X 10.5 all supported architectures
   "leopard")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
@@ -85,7 +93,23 @@ case "${release_name}" in
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
     ;;
-  # Mac OS X 10.4
+  # 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 all supported architectures
   "tiger")
     XCODE_PATH="/Developer"
     SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
@@ -93,6 +117,22 @@ case "${release_name}" in
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
     ;;
+  # Mac OS X 10.4
+  "tigeri386")
+    XCODE_PATH="/Developer"
+    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.4"
+    ARCH="-arch i386"
+    STARTUP="LaunchDaemon"
+    ;;
+  # Mac OS X 10.4
+  "tigerppc")
+    XCODE_PATH="/Developer"
+    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    MACOSX_VERSION="-mmacosx-version-min=10.4"
+    ARCH="-arch ppc"
+    STARTUP="LaunchDaemon"
+    ;;
   # Mac OS X 10.3
   "panther")
     XCODE_PATH="/Developer"
@@ -171,7 +211,7 @@ case "${DIRS_FOUND}" in
 	;;
 	# either both or neither found
 	11|0)
-		read -p 'Could not select the Privoxy source directory. Please supply the directory name: ' SOURCE_DIR
+		read -p 'Could not select the Privoxy source directory. Please supply the directory name (e.g. current or dist): ' SOURCE_DIR
 	;;
 esac
 cd OSXPackageBuilder