Check-in [c44a109dc7]
Overview
Comment:Added Snow Leopard Host Build Support for CACKey OSX Build Scripts
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:c44a109dc7b388ddb024ac3625ed925f2706f487
User & Date: kvanals on 2010-10-27 22:22:24
Other Links: manifest | tags
Context
2010-10-27
22:39
Corrected directory permissions on CACKey OSX Package check-in: df48b96fd1 user: kvanals tags: trunk
22:22
Added Snow Leopard Host Build Support for CACKey OSX Build Scripts check-in: c44a109dc7 user: kvanals tags: trunk
2010-10-21
03:43
CACKey 0.5.21 check-in: 89933f697d user: rkeene tags: trunk, 0.5.21
Changes

Modified build/cackey_osx_build/Template_pmbuild/02libcackey.xml.in from [d3fdf08402] to [50dd83aab6].

     1      1   <pkgref spec="1.12" uuid="@@UUID@@">
     2      2   	<config>
     3         -		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackeyg.pkg</identifier>
            3  +		<identifier>mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.@@LIBCACKEYG@@</identifier>
     4      4   		<version>1</version>
     5      5   		<description></description>
     6      6   		<post-install type="none"/>
     7      7   		<requireAuthorization/>
     8      8   		<installFrom relative="true" mod="true">../../macbuild/@@OSXVERSION@@/libcackey_g.dylib</installFrom>
     9      9   		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
    10     10   		<flags>

Modified build/cackey_osx_build/Template_pmbuild/index.xml.in from [7d23f00ebd] to [2a6c73b78b].

    13     13   	<description>CACKey</description>
    14     14   	<contents>
    15     15   		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
    16     16   			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackey.pkg"/>
    17     17   			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.cackey.pkg"/>
    18     18   		</choice>
    19     19   		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
    20         -			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.libcackeyg.pkg"/>
           20  +			<pkgref id="mil.army.usace.cackeyForMacOsX@@OSXVERSION@@.@@LIBCACKEYG@@"/>
    21     21   		</choice>
    22     22   	</contents>
    23     23   	<resources bg-scale="none" bg-align="topleft">
    24     24   		<locale lang="en">
    25     25   			<resource mime-type="text/rtf" kind="embedded" type="license">
    26     26   				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
    27     27   {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}

Modified build/cackey_osx_build/build_osx.sh from [7a60e7702d] to [fd25e7d355].

    24     24   	rm -rf macbuild
    25     25   	rm -rf build/cackey_osx_build/*.pmdoc
    26     26   	make distclean
    27     27   }
    28     28   
    29     29   # Directory creation function
    30     30   makedir() {
           31  +	if [ "`uname -r | cut -d . -f 1`" -lt "10" ]; then
           32  +		LIBTOOLDIR=/Developer/usr/share/libtool
           33  +	else
           34  +		LIBTOOLDIR=/Developer/usr/share/libtool/config
           35  +	fi
    31     36   	if [ ! -d macbuild ]; then
    32     37   		mkdir macbuild
    33     38   		mkdir macbuild/Panther
    34     39   		mkdir macbuild/Tiger
    35     40   		mkdir macbuild/Leopard
    36     41   		mkdir macbuild/Snowleopard
    37     42   		mkdir macbuild/pkg
    38     43   	fi
    39     44   	if [ ! -f config.guess ]; then
    40         -		cp /Developer/usr/share/libtool/config.guess .
           45  +		cp ${LIBTOOLDIR}/config.guess .
    41     46   	fi
    42     47   	if [ ! -f config.sub ]; then
    43         -		cp /Developer/usr/share/libtool/config.sub .
           48  +		cp ${LIBTOOLDIR}/config.sub .
    44     49   	fi
    45     50   	if [ ! -f install-sh ]; then
    46         -		cp /Developer/usr/share/libtool/install-sh .
           51  +		cp ${LIBTOOLDIR}/install-sh .
    47     52   	fi
    48     53   }
    49     54   
    50     55   # Build function for Panther
    51     56   panther() {
    52     57   	makedir
    53     58   	HEADERS=/Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
................................................................................
   112    117   	HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
   113    118   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   114    119   	LIB=""
   115    120   	ARCHLIST=""
   116    121   	DLIB=""
   117    122   	DARCHLIST=""
   118    123   	OSX=Snowleopard
   119         -	PKTARGETOS=3
          124  +	if [ "`uname -r | cut -d . -f 1`" -lt "10" ]; then
          125  +		PKTARGETOS=3
          126  +	else
          127  +		PKTARGETOS=4
          128  +	fi
   120    129   	NEXTOSXVER=10.7
   121    130   	CUROSXVER=10.6
   122    131   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
   123    132   		genbuild
   124    133   	done
   125    134   	libbuild
   126    135   	pkgbuild
................................................................................
   154    163   	done
   155    164   	lipo -create ${DARCHLIST} -output macbuild/${OSX}/libcackey_g.dylib
   156    165   	rm macbuild/${OSX}/libcackey*.dylib.*
   157    166   }
   158    167   
   159    168   # Function to build Mac OS X Packages
   160    169   pkgbuild() {
          170  +	if [ "`uname -r | cut -d . -f 1`" -lt "10" ]; then
          171  +		LIBCACKEYG=libcackeyg.pkg
          172  +	else
          173  +		LIBCACKEYG=libcackey_g.pkg
          174  +	fi
   161    175   	rm -f build/cackey_osx_build/cackey.dylib
   162    176   	ln macbuild/${OSX}/libcackey.dylib build/cackey_osx_build/cackey.dylib
   163    177   	for PMDOC in build/cackey_osx_build/Template_pmbuild/*.in; do
   164    178   		PMDOC="`echo "${PMDOC}" | sed 's|l.in|l|g' | sed 's|build/cackey_osx_build/Template_pmbuild/||g'`"
   165    179   		UUID="`python -c 'import uuid; print uuid.uuid1()' | dd conv=ucase 2>/dev/null`"
   166    180   		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
   167    181   		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   168    182   		sed "s|@@OSXVERSION@@|${OSX}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   169    183   		sed "s|@@UUID@@|${UUID}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   170    184   		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   171    185   		sed "s|@@NEXTOSXVER@@|${NEXTOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   172    186   		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
          187  +		sed "s|@@LIBCACKEYG@@|${LIBCACKEYG}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
          188  +		cp build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   173    189   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   174    190   	done
   175    191   	if [ ${OSX} == "Panther" ]; then
   176    192   		EXT=mpkg
   177    193   		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | grep -v -i require > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
   178    194   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
   179    195   	else
................................................................................
   224    240   
   225    241   	"all")
   226    242   		./autogen.sh
   227    243   		panther
   228    244   		tiger
   229    245   		leopard
   230    246   		snowleopard
          247  +		echo ""
          248  +		echo "All builds complete."
   231    249   		exit $?
   232    250   	;;
   233    251   
   234    252   	"clean")
   235    253   		clean
   236    254   		exit $?
   237    255   	;;
   238    256   
   239    257   	*)
   240    258   		usage
   241    259   		exit $?
   242    260   	;;
   243    261   esac