X-Git-Url: http://www.privoxy.org/gitweb/misc.html?a=blobdiff_plain;f=common.sh;h=44918b08679923e34f84af58b23da5640f20a756;hb=45827f4223261f345af0da7b1256d6e8938142c4;hp=ff46c90d60fb36a7cfbdde43c1639947004ba807;hpb=a0b4fc0e8c97b17fc577332c9153799334a0d763;p=OSXPackageBuilder.git
diff --git a/common.sh b/common.sh
index ff46c90..44918b0 100755
--- a/common.sh
+++ b/common.sh
@@ -42,13 +42,16 @@
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 (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"
@@ -56,15 +59,17 @@ case "${release_name}" in
# 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 Universal
+ # 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"
@@ -72,7 +77,8 @@ case "${release_name}" in
# 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 ${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"
@@ -80,15 +86,17 @@ 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"
@@ -96,7 +104,8 @@ case "${release_name}" in
# 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 ${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"
@@ -104,23 +113,44 @@ case "${release_name}" in
# 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 ${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
+ # 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"
@@ -195,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