Index: build/cackey_osx_build/Template_pmbuild/index.xml.in ================================================================== --- build/cackey_osx_build/Template_pmbuild/index.xml.in +++ build/cackey_osx_build/Template_pmbuild/index.xml.in @@ -29,14 +29,12 @@ \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural \f0\fs26 \cf0 Release information:\ pkg: CACKey\ author: US Army Corps of Engineers\ -Mac build contact: Kenneth Van Alstyne \ - US Army Corps of Engineers\ - Information Technology Laboratory\ - Vicksburg, MS 39180\ +Mac build contact: Kenneth Van Alstyne \ + US Department of Homeland Security\ contact: Roy Keene \ ------------------------------------------------\ \ The following files in the source directory are the intellectual property of the\ Free Software Foundation and are licensed under the terms of the GNU General\ Index: build/cackey_osx_build/build_osx.sh ================================================================== --- build/cackey_osx_build/build_osx.sh +++ build/cackey_osx_build/build_osx.sh @@ -1,20 +1,27 @@ #!/bin/bash # Shell Script to make Mac OS X Releases of CACKey # Kenneth Van Alstyne # kenneth.l.vanalstyne@usace.army.mil CACKEY_VERSION=`cat configure.ac | grep AC_INIT | cut -d " " -f 2 | sed 's_)__'` + +# Check to see if we're building on Mac OS X 10.7 "Lion" +if [ "`uname -r | cut -d . -f 1`" = "11" ]; then + LIONBUILD=1 +fi # Usage function usage() { echo "Usage: build_osx.sh " echo Where target is one of: - echo " panther - (Builds 10.3 Library for PPCG3)" - echo " tiger - (Builds Universal 10.4 Library for PPCG3/i386)" + echo " panther - (Builds 10.3 Library for PPCG3) (LEGACY)" + echo " tiger - (Builds Universal 10.4 Library for PPCG3/i386) (LEGACY)" echo " leopard - (Builds Universal 10.5 Library for PPCG4/i386)" echo " snowleopard - (Builds Universal 10.6 Library for i386/x86_64)" + echo " lion - (Builds Universal 10.7 Library for i386/x86_64)" echo " all - (Builds for all supported targets)" + echo " legacy - (Builds for all supported targets older than 10.7)" echo " clean - (Cleans up)" echo "Run from CACKey Build Root." exit $? } @@ -37,10 +44,11 @@ mkdir macbuild mkdir macbuild/Panther mkdir macbuild/Tiger mkdir macbuild/Leopard mkdir macbuild/Snowleopard + mkdir macbuild/Lion mkdir macbuild/pkg fi if [ ! -f config.guess ]; then cp ${LIBTOOLDIR}/config.guess . fi @@ -128,10 +136,30 @@ genbuild done libbuild pkgbuild } + +# Build function for Lion +lion() { + makedir + HEADERS=/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/ + LIBRARY=/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/PCSC.framework/PCSC + LIB="" + ARCHLIST="" + DLIB="" + DARCHLIST="" + OSX=Lion + PKTARGETOS=3 + NEXTOSXVER=10.8 + CUROSXVER=10.7 + for HOST in i386-apple-darwin11 x86_64-apple-darwin11; do + genbuild + done + libbuild + pkgbuild +} # Generic build function genbuild() { make distclean ARCH=`echo ${HOST} | cut -d "-" -f 1` @@ -140,11 +168,19 @@ ARCH="ppc -mcpu=G4" else ARCH="ppc -mcpu=G3" fi fi - CFLAGS="-arch ${ARCH}" ./configure --with-pcsc-headers=${HEADERS} --with-pcsc-libs=${LIBRARY} --host=${HOST} + if [ "${LIONBUILD}" = 1 ]; then + if [ "${ARCH}" == "ppc -mcpu=G4" ]; then + CC=powerpc-apple-darwin11-gcc-4.2.1 CPP=powerpc-apple-darwin11-cpp-4.2.1 CFLAGS="-m32 -I/Developer/Platforms/iPhoneOS.platform//Developer/usr/lib/gcc/powerpc-apple-darwin10/4.2.1/include -isysroot /Developer/SDKs/MacOSX10.5.sdk" CPPFLAGS="-D_LIBC_LIMITS_H_" ./configure --with-pcsc-headers=${HEADERS} --with-pcsc-libs=${LIBRARY} --host=${HOST} + else + CFLAGS="-arch ${ARCH}" ./configure --with-pcsc-headers=${HEADERS} --with-pcsc-libs=${LIBRARY} --host=${HOST} + fi + else + CFLAGS="-arch ${ARCH}" ./configure --with-pcsc-headers=${HEADERS} --with-pcsc-libs=${LIBRARY} --host=${HOST} + fi make cp libcackey.dylib macbuild/${OSX}/libcackey.dylib.`echo ${ARCH} | cut -d ' ' -f 1` cp libcackey_g.dylib macbuild/${OSX}/libcackey_g.dylib.`echo ${ARCH} | cut -d ' ' -f 1` } @@ -209,16 +245,24 @@ usage exit $? ;; "panther") + if [ "${LIONBUILD}" = "1" ]; then + echo "Building for platforms older than Mac OS X 10.5 (Leopard) is not supported on Lion..." + exit 1 + fi ./autogen.sh panther exit $? ;; "tiger") + if [ "${LIONBUILD}" = "1" ]; then + echo "Building for platforms older than Mac OS X 10.5 (Leopard) is not supported on Lion..." + exit 1 + fi ./autogen.sh tiger exit $? ;; @@ -231,19 +275,39 @@ "snowleopard") ./autogen.sh snowleopard exit $? ;; + + "lion") + ./autogen.sh + lion + exit $? + ;; "all") + ./autogen.sh + leopard + snowleopard + lion + echo "" + echo "All builds complete." + exit $? + ;; + + "legacy") + if [ "${LIONBUILD}" = "1" ]; then + echo "Building for platforms older than Mac OS X 10.5 (Leopard) is not supported on Lion..." + exit 1 + fi ./autogen.sh panther tiger leopard snowleopard echo "" - echo "All builds complete." + echo "All LEGACY builds complete." exit $? ;; "clean") clean