Changeset 3175 for pjproject/trunk/configure-iphone

Timestamp:

May 17, 2010 1:07:39 PM (14 years ago)

Author:

ming

Message:

Merge #1050, #1052, #1053, #1054 into the main trunk.

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• configure-iphone (copied) (copied from pjproject/branches/projects/iphone/configure-iphone) (3 diffs)

pjproject/trunk/configure-iphone

@@ -1 +1 @@
 #!/bin/bash
 
+F="configure-iphone"
+
 if test "$*" = "--help" -o "$*" = "-h"; then
-  echo "configure-iphone [SDK=name_path] [OPTIONS]"
+  echo "$F [OPTIONS]"
   echo ""
-  echo "SDK=name_path   Choose which SDK to use. Value can be SDK name (e.g."
-  echo "                iPhoneOS2.2.1.sdk) or the full path of the SDK"
-  echo "OPTIONS         Other options that will be passed directly to "
-  echo "                ./aconfigure script. Run ./aconfigure --help for"
-  echo "                more info."
+  echo "where:"
+  echo "  OPTIONS    Other options that will be passed directly to"
+  echo "             ./aconfigure script. Run ./aconfigure --help"
+  echo "             for more info."
+  echo ""
+  echo "Environment variables:"
+  echo "  IPHONESDK  Optionally specify which SDK to use. Value is the full "
+  echo "             path of the SDK. By default, the latest SDK installed"
+  echo "             will be used."
+  echo "  CC         Optionally specify the path of the ARM cross compiler"
+  echo "             to use. By default, the compiler is deduced from the"
+  echo "             SDK."
   echo ""
   exit 0
 fi
 
-F="configure-iphone"
-
 # Set the main iPhone developer directory, if not set
 if test "x${DEVPATH}" = "x"; then
   DEVPATH=/Developer/Platforms/iPhoneOS.platform/Developer
+  echo "$F: DEVPATH is not specified, using ${DEVPATH}"
 fi
 
@@ -27 +35 @@
 
 # Choose SDK version to use
-if test "x$SDK" = "x"; then
-  # If SDK is not set, use the latest one
+if test "$IPHONESDK" = ""; then
+  # If IPHONESDK is not set, use the latest one
   for f in `ls $DEVPATH/SDKs/`; do echo $f | sed 's/\(.sdk\)//'; done | sort | tail -1 > tmpsdkname
-  SDK=`cat tmpsdkname`.sdk
+  IPHONESDK=`cat tmpsdkname`.sdk
   rm -f tmpsdkname
-  echo "$F info: using ${SDK}"
-  SDKPATH=${DEVPATH}/SDKs/${SDK}
-elif test -d ${SDK}; then
-  # .. else if SDK is set and it points to a valid path, just use it
-  SDKPATH=${SDK}
+  SDKPATH=${DEVPATH}/SDKs/${IPHONESDK}
+  echo "$F: IPHONESDK is not specified, choosing ${IPHONESDK}"
+elif test -d ${IPHONESDK}; then
+  # .. else if IPHONESDK is set and it points to a valid path, just use it
+  SDKPATH=${IPHONESDK}
 else
   # .. else assume the SDK name is used.
-  SDKPATH=${DEVPATH}/SDKs/${SDK}
+  SDKPATH=${DEVPATH}/SDKs/${IPHONESDK}
 fi
 
@@ -48 +56 @@
 fi
 
-# Settings to feed to configure script
-export CFLAGS="-O2 -arch armv6 -isysroot ${SDKPATH}"
-export LDFLAGS="-O2 -arch armv6 -isysroot ${SDKPATH} -framework AudioToolbox -framework Foundation"
+# Default CFLAGS if it's not specified
+if test "$CFLAGS" = ""; then
+  CFLAGS="-O2 -Wno-unused-label"
+fi
+
+# Default LDFLAGS if it's not specified
+if test "$LDFLAGS" = ""; then
+  LDFLAGS="-O2"
+fi
+
+# Determine which gcc for this SDK. Binaries should have the
+# full path as it's not normally in user's PATH
+
+if test "${CC}" = ""; then
+  for archpath in `ls -d ${SDKPATH}/usr/lib/gcc/arm-apple-darwin*`; do
+    archname=`basename ${archpath}`
+    for gccver in `ls ${archpath}`; do
+       gccpath="${DEVPATH}/usr/bin/${archname}-gcc-${gccver}"
+       if test -e ${gccpath}; then
+          export CC="${gccpath}"
+          break
+       fi
+    done
+    if test ! "${CC}" = ""; then
+       echo "$F: CC is not specified, choosing ${CC}"
+       break
+    fi
+  done
+fi
+
+if test "${CC}" = ""; then
+    echo "$F error: unable to find gcc for ${IPHONESDK}. If you think you have the right gcc, set the full path in CC environment variable."
+    exit 1
+fi
+
+# Set CXX if not set
+if test "${CXX}" = ""; then
+  export CXX=`echo ${CC} | sed 's/gcc/g++/'`
+  echo "$F: CXX is not specified, using ${CXX}"
+fi
+
+# Other settings to feed to configure script. 
+#ARCH="-arch armv6"
+export CFLAGS="${CFLAGS} ${ARCH} -isysroot ${SDKPATH}"
+export LDFLAGS="${LDFLAGS} ${ARCH} -isysroot ${SDKPATH} -framework AudioToolbox -framework Foundation"
 export AR="${DEVPATH}/usr/bin/libtool -static -o"
 export RANLIB="echo ranlib"
 # Use gcc -E as preprocessor instead of cpp, since cpp will find the
-# header files in standard /usr/include
-export CPP="${DEVPATH}/usr/bin/arm-apple-darwin9-gcc -E -isysroot ${SDKPATH}"
+# header files in standard /usr/include instead of in isysroot
+export CPP="${CC} -E -isysroot ${SDKPATH}"
 
-# And finally invoke configure script itself
+# Print settings
+if test "1" = "1"; then
+  echo "$F: calling ./aconfigure with env vars:"
+  echo " CC = ${CC}"
+  echo " CXX = ${CXX}"
+  echo " SDKPATH = ${SDKPATH}"
+  echo " CFLAGS = ${CFLAGS}"
+  echo " LDFLAGS = ${LDFLAGS}"
+  echo " AR = ${AR}"
+  echo " RANLIB = ${RANLIB}"
+fi
+
+# And finally invoke the configure script itself
 ./aconfigure --host=arm-apple-darwin9 --disable-floating-point $*
 
+if test "$?" = "0"; then
+  echo "Done configuring for `basename $SDKPATH`"
+  echo ""
+fi
+