Modified build/cackey_osx_build/build_osx.sh from [353b3acaa2] to [14980c7d5f].

    10     10   fi
    11     11   
    12     12   # Usage function
    13     13   usage() {
    14     14   	echo "Usage: build_osx.sh <target>"
    15     15   	echo Where target is one of:
    16     16   	echo "    leopard  - (Builds Universal 10.5 Library for PPCG4/i386)"
    17         -	echo "    sltoyos - (Builds Universal 10.6/10.7/10.8/10.9/10.10 Library for i386/x86_64)"
           17  +	echo "    slandup - (Builds Universal 10.6 and Up Library for i386/x86_64)"
    18     18   	echo "    all - (Builds for all supported targets)"
    19     19   	echo "    clean - (Cleans up)"
    20     20   	echo "Run from CACKey Build Root."
    21     21   	echo ""
    22     22   	echo "NOTE:  Leopard build requires legacy XCode 3 components in"
    23     23   	echo "       /Developer because of PowerPC support."
    24     24   	echo "       All builds require gnutar, automake, and autoconf."
................................................................................
    43     43   		LIBTOOLDIR=/Developer/usr/share/libtool
    44     44   	else
    45     45   		LIBTOOLDIR=/Developer/usr/share/libtool/config
    46     46   	fi
    47     47   	if [ ! -d macbuild ]; then
    48     48   		mkdir macbuild
    49     49   		mkdir macbuild/Leopard
    50         -		mkdir macbuild/Sltoyos
           50  +		mkdir macbuild/Slandup
    51     51   		mkdir macbuild/pkg
    52     52   	fi
    53     53   	if [ ! -f config.guess ]; then
    54     54   		cp ${LIBTOOLDIR}/config.guess .
    55     55   	fi
    56     56   	if [ ! -f config.sub ]; then
    57     57   		cp ${LIBTOOLDIR}/config.sub .
................................................................................
    77     77   		genbuild
    78     78   	done
    79     79   	libbuild
    80     80   	pkgbuild
    81     81   }
    82     82   
    83     83   # Build function for Snow Leopard/Lion/Mountain Lion/Mavericks/Yosemite
    84         -sltoyos() {
           84  +slandup() {
    85     85   	makedir
    86     86   	HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
    87     87   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
    88     88   	LIB=""
    89     89   	ARCHLIST=""
    90     90   	DLIB=""
    91     91   	DARCHLIST=""
    92         -	OSX=Sltoyos
           92  +	OSX=Slandup
    93     93   	PKTARGETOS=3
    94     94   	CUROSXVER=10.6
    95     95   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
    96     96   		genbuild
    97     97   	done
    98     98   	libbuild
    99     99   	pkgbuild
................................................................................
   165    165   		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   166    166   		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   167    167   		sed "s|@@LIBCACKEYG@@|${LIBCACKEYG}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   168    168   		cp build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   169    169   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   170    170   	done
   171    171   	EXT=pkg
   172         -	if [ ${OSX} == "Sltoyos" ]; then
   173         -		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Sltoyos|for Mac OS X SLtoYos|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
          172  +	if [ ${OSX} == "Slandup" ]; then
          173  +		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Slandup|for Mac OS X SLandUp|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
   174    174   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
   175    175   	fi
   176    176   	/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -d build/cackey_osx_build/${OSX}_pmbuild.pmdoc -o macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
   177    177   	tar --create --directory macbuild/pkg/ --file macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
   178    178   	gzip -9 macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar
   179    179   	rm -rf macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
   180    180   	rm -f build/cackey_osx_build/cackey.dylib
................................................................................
   191    191   
   192    192   	"leopard")
   193    193   		./autogen.sh
   194    194   		leopard
   195    195   		exit $?
   196    196   	;;
   197    197   
   198         -	"sltoyos")
          198  +	"slandup")
   199    199   		./autogen.sh
   200         -		sltoyos
          200  +		slandup
   201    201   		exit $?
   202    202   	;;
   203    203   
   204    204   	"all")
   205    205   		./autogen.sh
   206    206   		leopard
   207         -		sltoyos
          207  +		slandup
   208    208   		echo ""
   209    209   		echo "All builds complete."
   210    210   		exit $?
   211    211   	;;
   212    212   
   213    213   	"clean")
   214    214   		clean