Check-in [eefa1b7799]
Overview
Comment:Updated logic for Mac OS X version checking to be compatible with Mac OS X 10.9 (Mavericks)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:eefa1b77996713e3e4ad9e7baab996bb84708958
User & Date: kvanals on 2013-10-18 01:04:24
Other Links: manifest | tags
Context
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
2013-10-18
01:04
Updated logic for Mac OS X version checking to be compatible with Mac OS X 10.9 (Mavericks) check-in: eefa1b7799 user: kvanals tags: trunk
2013-10-17
23:05
Added Mac OS X 10.9 (Mavericks) Support check-in: 1df62da199 user: kvanals tags: trunk
Changes

Modified build/cackey_osx_build/Template_pmbuild/index.xml.in from [7500ec4b2f] to [a2bec49396].

    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="lt" value="'@@NEXTOSXVER@@'">
           82  +		<requirement id="tosv" operator="le" value="'@@THISOSXVER@@'">
    83     83   			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</message>
    84     84   		</requirement>
    85     85   		<requirement id="tosv" operator="ge" value="'@@CUROSXVER@@'">
    86     86   			<message>This CACKey release requires Mac OS X @@CUROSXVER@@.</message>
    87     87   		</requirement>
    88     88   	</requirements>
    89     89   	<flags/>

Modified build/cackey_osx_build/build_osx.sh from [f8fa8f8240] to [398a7f7251].

    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         -	NEXTOSXVER=10.6
           73  +	THISOSXVER=10.5
    74     74   	CUROSXVER=10.5
    75     75   	for HOST in powerpc-apple-darwin9 i386-apple-darwin9; do
    76     76   		genbuild
    77     77   	done
    78     78   	libbuild
    79     79   	pkgbuild
    80     80   }
................................................................................
    86     86   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
    87     87   	LIB=""
    88     88   	ARCHLIST=""
    89     89   	DLIB=""
    90     90   	DARCHLIST=""
    91     91   	OSX=Snowleopard
    92     92   	PKTARGETOS=3
    93         -	NEXTOSXVER=10.7
           93  +	THISOSXVER=10.6
    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
   100    100   }
................................................................................
   106    106   	LIBRARY=/Developer/SDKs/MacOSX10.7.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   107    107   	LIB=""
   108    108   	ARCHLIST=""
   109    109   	DLIB=""
   110    110   	DARCHLIST=""
   111    111   	OSX=Lion
   112    112   	PKTARGETOS=3
   113         -	NEXTOSXVER=10.8
          113  +	THISOSXVER=10.7
   114    114   	CUROSXVER=10.7
   115    115   	for HOST in i386-apple-darwin11 x86_64-apple-darwin11; do
   116    116   		genbuild
   117    117   	done
   118    118   	libbuild
   119    119   	pkgbuild
   120    120   }
................................................................................
   126    126   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   127    127   	LIB=""
   128    128   	ARCHLIST=""
   129    129   	DLIB=""
   130    130   	DARCHLIST=""
   131    131   	OSX=Sltomav
   132    132   	PKTARGETOS=3
   133         -	NEXTOSXVER=10.10
          133  +	THISOSXVER=10.9
   134    134   	CUROSXVER=10.6
   135    135   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
   136    136   		genbuild
   137    137   	done
   138    138   	libbuild
   139    139   	pkgbuild
   140    140   }
................................................................................
   146    146   	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
   147    147   	LIB=""
   148    148   	ARCHLIST=""
   149    149   	DLIB=""
   150    150   	DARCHLIST=""
   151    151   	OSX=Sltomav
   152    152   	PKTARGETOS=3
   153         -	NEXTOSXVER=10.9
          153  +	THISOSXVER=10.9
   154    154   	CUROSXVER=10.6
   155    155   	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
   156    156   		genbuild
   157    157   	done
   158    158   	libbuild
   159    159   	pkgbuild
   160    160   }
................................................................................
   223    223   		PMDOC="`echo "${PMDOC}" | sed 's|l.in|l|g' | sed 's|build/cackey_osx_build/Template_pmbuild/||g'`"
   224    224   		UUID="`python -c 'import uuid; print uuid.uuid1()' | dd conv=ucase 2>/dev/null`"
   225    225   		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
   226    226   		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   227    227   		sed "s|@@OSXVERSION@@|${OSX}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   228    228   		sed "s|@@UUID@@|${UUID}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   229    229   		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|@@NEXTOSXVER@@|${NEXTOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
          230  +		sed "s|@@THISOSXVER@@|${THISOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   231    231   		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   232    232   		sed "s|@@LIBCACKEYG@@|${LIBCACKEYG}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   233    233   		cp build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
   234    234   		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
   235    235   	done
   236    236   	EXT=pkg
   237    237   	if [ ${OSX} == "Snowleopard" ]; then