Check-in [c5f0715d66]
Overview
Comment:Fixed another Mac OS X Installer issue
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:c5f0715d66ef69daad969dad715ff080d3e8d03d
User & Date: kvanals on 2014-01-08 13:56:00
Other Links: manifest | tags
Context
2014-01-17
13:35
Work towards fixing listing of slots to not list redundant slots check-in: afd6df445d user: rkeene tags: trunk
2014-01-08
13:56
Fixed another Mac OS X Installer issue check-in: c5f0715d66 user: kvanals tags: trunk
2013-12-30
15:39
Fixed issue in OS X Installer that didn't allow it to install on Mac OS X 10.9.1 Beta check-in: a09bdf7797 user: kvanals tags: trunk
Changes

Modified build/cackey_osx_build/Template_pmbuild/index.xml.in from [a2bec49396] to [6bfcbad535].

    75     75   To use, be sure to import the certificate authorities into Keychain Access.\
    76     76   \
    77     77   A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
    78     78   			</resource>
    79     79   		</locale>
    80     80   	</resources>
    81     81   	<requirements>
    82         -		<requirement id="tosv" operator="le" value="'@@THISOSXVER@@'">
    83         -			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</message>
    84         -		</requirement>
    85     82   		<requirement id="tosv" operator="ge" value="'@@CUROSXVER@@'">
    86     83   			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</message>
    87     84   		</requirement>
    88     85   	</requirements>
    89     86   	<flags/>
    90     87   	<item type="file">01libcackey.xml</item>
    91     88   	<item type="file">02libcackey.xml</item>

Modified build/cackey_osx_build/build_osx.sh from [8dd8386c03] to [361c9900ba].

    66     66   	LIBRARY=/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/PCSC.framework/PCSC
    67     67   	LIB=""
    68     68   	ARCHLIST=""
    69     69   	DLIB=""
    70     70   	DARCHLIST=""
    71     71   	OSX=Leopard
    72     72   	PKTARGETOS=3
    73         -	THISOSXVER=10.5.99
    74     73   	CUROSXVER=10.5
    75     74   	for HOST in powerpc-apple-darwin9 i386-apple-darwin9; do
    76     75   		genbuild
    77     76   	done
    78     77   	libbuild
    79     78   	pkgbuild
    80     79   }
................................................................................
    86     85   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
    87     86   	LIB=""
    88     87   	ARCHLIST=""
    89     88   	DLIB=""
    90     89   	DARCHLIST=""
    91     90   	OSX=Snowleopard
    92     91   	PKTARGETOS=3
    93         -	THISOSXVER=10.6.99
    94     92   	CUROSXVER=10.6
    95     93   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
    96     94   		genbuild
    97     95   	done
    98     96   	libbuild
    99     97   	pkgbuild
   100     98   }
................................................................................
   106    104   	LIBRARY=/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   107    105   	LIB=""
   108    106   	ARCHLIST=""
   109    107   	DLIB=""
   110    108   	DARCHLIST=""
   111    109   	OSX=Lion
   112    110   	PKTARGETOS=3
   113         -	THISOSXVER=10.7.99
   114    111   	CUROSXVER=10.7
   115    112   	for HOST in i386-apple-darwin11 x86_64-apple-darwin11; do
   116    113   		genbuild
   117    114   	done
   118    115   	libbuild
   119    116   	pkgbuild
   120    117   }
................................................................................
   126    123   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   127    124   	LIB=""
   128    125   	ARCHLIST=""
   129    126   	DLIB=""
   130    127   	DARCHLIST=""
   131    128   	OSX=Sltomav
   132    129   	PKTARGETOS=3
   133         -	THISOSXVER=10.9.99
   134    130   	CUROSXVER=10.6
   135    131   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
   136    132   		genbuild
   137    133   	done
   138    134   	libbuild
   139    135   	pkgbuild
   140    136   }
................................................................................
   146    142   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   147    143   	LIB=""
   148    144   	ARCHLIST=""
   149    145   	DLIB=""
   150    146   	DARCHLIST=""
   151    147   	OSX=Sltomav
   152    148   	PKTARGETOS=3
   153         -	THISOSXVER=10.9.99
   154    149   	CUROSXVER=10.6
   155    150   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
   156    151   		genbuild
   157    152   	done
   158    153   	libbuild
   159    154   	pkgbuild
   160    155   }
................................................................................
   223    218   		PMDOC="`echo "${PMDOC}" | sed 's|l.in|l|g' | sed 's|build/cackey_osx_build/Template_pmbuild/||g'`"
   224    219   		UUID="`python -c 'import uuid; print uuid.uuid1()' | dd conv=ucase 2>/dev/null`"
   225    220   		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
   226    221   		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   227    222   		sed "s|@@OSXVERSION@@|${OSX}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   228    223   		sed "s|@@UUID@@|${UUID}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   229    224   		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   230         -		sed "s|@@THISOSXVER@@|${THISOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   231    225   		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   232    226   		sed "s|@@LIBCACKEYG@@|${LIBCACKEYG}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   233    227   		cp build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   234    228   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   235    229   	done
   236    230   	EXT=pkg
   237    231   	if [ ${OSX} == "Snowleopard" ]; then