New per-architecture during-install-process readme texts

[OSXPackageBuilder.git] / common.sh

diff --git a/common.sh b/common.sh
index e6b615f..44918b0 100755 (executable)
--- a/common.sh
+++ b/common.sh
@@ -42,29 +42,43 @@
 release_name=$1
 
 #
-# check the release name
+# check the release name and assign the build variables accordingly
+#
+# NOTE: SYSROOT ought to be programmatically determined using XCODE_PATH, however since upgrading my build environment to El Capitan xcode-select returns a non-useful path, hence I am forced to set the SYSROOT explicitly for my build environment, which is now a hybrid of XCode 3.2.6 'running' on OS X 10.11. I am not going to risk upgrading XCode for fear of losing the ability to target down-level OS X versions.
 #
 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"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.7.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.7.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.7"
     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"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    SYSROOT="-isysroot /Developer/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"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.6.sdk"
+    SYSROOT="-isysroot /Developer/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"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.6.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.6"
     ARCH="-arch i386"
     STARTUP="LaunchDaemon"
@@ -72,31 +86,71 @@ case "${release_name}" in
   # Mac OS X 10.5 and all later releases
   "leopardupwards")
     XCODE_PATH="`/usr/bin/xcode-select -print-path`"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     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"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.5.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.5.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.5"
     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"
+    SYSROOT="-isysroot /Developer/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"
+    SYSROOT="-isysroot /Developer/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"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.4u.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.4"
     ARCH="-arch i386 -arch ppc"
     STARTUP="LaunchDaemon"
     ;;
+  # Mac OS X 10.4
+  "tigeri386")
+    XCODE_PATH="/Developer"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.4u.sdk"
+    SYSROOT="-isysroot /Developer/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"
+    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"
-    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.3.9.sdk"
+#    SYSROOT="-isysroot ${XCODE_PATH}/SDKs/MacOSX10.3.9.sdk"
+    SYSROOT="-isysroot /Developer/SDKs/MacOSX10.3.9.sdk"
     MACOSX_VERSION="-mmacosx-version-min=10.3"
     ARCH="-arch ppc"
     STARTUP="StartupItem"
@@ -171,7 +225,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