X-Git-Url: http://www.privoxy.org/gitweb/show-status?a=blobdiff_plain;f=common.sh;h=44918b08679923e34f84af58b23da5640f20a756;hb=8cd596aa2a6ddca7f0873fdc9e6521e9f28ad7f6;hp=320ac176777802c60470744240af2efe5b963e93;hpb=a2d32da683d8ebfa1bc1cb709a625bebfd9099b6;p=OSXPackageBuilder.git

diff --git a/common.sh b/common.sh
index 320ac17..44918b0 100755
--- a/common.sh
+++ b/common.sh
@@ -28,7 +28,8 @@
 #                USA
 #
 # Modification : If you modify this file please consider whether your 
-#                changes ought to be passed back to the macsetup module.
+#                changes ought to be passed back to the OSXPackageBuilder
+#                module.
 #
 
 #========================================
@@ -41,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"
@@ -71,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"
@@ -124,8 +179,8 @@ darwin_major_rel_num="`/usr/bin/uname -r | /usr/bin/sed 's/\..*//'`"
 # check the release number
 #
 case "${darwin_major_rel_num}" in
-  # Mac OS X 10.7, 10.6, 10.5
-  11|10|9)
+  # Mac OS X 10.5 or higher
+  9|1*)
     GNAME="`/usr/bin/dscl /Local/Default -list /groups | /usr/bin/grep -E '^(_)?privoxy?'`"
     UNAME="`/usr/bin/dscl /Local/Default -list /users | /usr/bin/grep -E '^(_)?privoxy?'`"
     SCRIPT="privoxy-create-dscl.sh"
@@ -147,3 +202,31 @@ case "${darwin_major_rel_num}" in
     ;;
 esac
 
+#
+# identify the directory containing Privoxy's source
+#
+cd ..
+DIRS_FOUND=0
+SOURCE_DIR=""
+if [ -d dist ]; then
+	DIRS_FOUND=1
+fi
+if [ -d current ]; then
+	DIRS_FOUND=$(( DIRS_FOUND + 10 ))
+fi
+case "${DIRS_FOUND}" in
+	# only 'current' found
+	10)
+		SOURCE_DIR="current"
+	;;
+	# only 'dist' found
+	1)
+		SOURCE_DIR="dist"
+	;;
+	# either both or neither found
+	11|0)
+		read -p 'Could not select the Privoxy source directory. Please supply the directory name (e.g. current or dist): ' SOURCE_DIR
+	;;
+esac
+cd OSXPackageBuilder
+echo "Using ../${SOURCE_DIR} as location of Privoxy source"
\ No newline at end of file