Overview
| Comment: | Added Mac OS X 10.9 (Mavericks) Support |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: | 1df62da1993cd9ef1fe30263b794803efc36066d |
| User & Date: | kvanals on 2013-10-17 23:05:14 |
| Other Links: | manifest | tags |
Context
|
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 | |
| 20:32 | CACKey 0.7.0 check-in: d6a874f3b5 user: rkeene tags: trunk, 0.7.0 | |
Changes
Modified build/cackey_osx_build/Template_pmbuild/index.xml.in from [7d02eca4b2] to [7500ec4b2f].
30 30 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;} 31 31 {\colortbl;\red255\green255\blue255;} 32 32 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural 33 33 34 34 \f0\fs26 \cf0 Release information:\ 35 35 pkg: CACKey\ 36 36 author: US Army Corps of Engineers\ 37 -Mac build contact: Kenneth Van Alstyne <DC1SAN_SUPPORT@hq.dhs.gov>\ 37 +Mac build contact: Kenneth Van Alstyne <Kenneth.VanAlstyne@associates.hq.dhs.gov>\ 38 38 US Department of Homeland Security\ 39 39 contact: Roy Keene <DC1-UNIX@hq.dhs.gov>\ 40 40 ------------------------------------------------\ 41 41 \ 42 42 The PKCS11.tokend connector module included in this package is licensed under\ 43 43 the APSL. See: http://devel.kvanals.org/PKCS11_Tokend\ 44 44 \
Modified build/cackey_osx_build/build_osx.sh from [c66d1aadeb] to [f8fa8f8240].
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 17 echo " snowleopard - (Builds Universal 10.6 Library for i386/x86_64)" 18 18 echo " lion - (Builds Universal 10.7 Library for i386/x86_64)" 19 - echo " sltoml - (Builds Universal 10.6/10.7/10.8 Library for i386/x86_64)" 19 + echo " sltomav - (Builds Universal 10.6/10.7/10.8/10.9 Library for i386/x86_64)" 20 20 echo " all - (Builds for all supported targets)" 21 21 echo " clean - (Cleans up)" 22 22 echo "Run from CACKey Build Root." 23 23 exit $? 24 24 } 25 25 26 26 # Clean up function ................................................................................ 41 41 LIBTOOLDIR=/Developer/usr/share/libtool/config 42 42 fi 43 43 if [ ! -d macbuild ]; then 44 44 mkdir macbuild 45 45 mkdir macbuild/Leopard 46 46 mkdir macbuild/Snowleopard 47 47 mkdir macbuild/Lion 48 - mkdir macbuild/Sltoml 48 + mkdir macbuild/Sltomav 49 49 mkdir macbuild/pkg 50 50 fi 51 51 if [ ! -f config.guess ]; then 52 52 cp ${LIBTOOLDIR}/config.guess . 53 53 fi 54 54 if [ ! -f config.sub ]; then 55 55 cp ${LIBTOOLDIR}/config.sub . ................................................................................ 116 116 genbuild 117 117 done 118 118 libbuild 119 119 pkgbuild 120 120 } 121 121 122 122 # Build function for Snow Leopard/Lion/Mountain Lion 123 -sltoml() { 123 +sltomav() { 124 124 makedir 125 125 HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/ 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 - OSX=Sltoml 131 + OSX=Sltomav 132 132 PKTARGETOS=3 133 - NEXTOSXVER=10.9 133 + NEXTOSXVER=10.10 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 } 141 141 142 142 # Build function for Snow Leopard/Lion/Mountain Lion 143 -sltoml() { 143 +sltomav() { 144 144 makedir 145 145 HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/ 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 - OSX=Sltoml 151 + OSX=Sltomav 152 152 PKTARGETOS=3 153 153 NEXTOSXVER=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 ................................................................................ 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 238 238 cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Snowleopard|for Mac OS X SnowLeopard|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new 239 239 mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml 240 240 fi 241 - if [ ${OSX} == "Sltoml" ]; then 242 - cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Sltoml|for Mac OS X SLtoML|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new 241 + if [ ${OSX} == "Sltomav" ]; then 242 + cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Sltomav|for Mac OS X SLtoMav|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new 243 243 mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml 244 244 fi 245 245 /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -d build/cackey_osx_build/${OSX}_pmbuild.pmdoc -o macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT} 246 246 tar --create --directory macbuild/pkg/ --file macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar CACKey_${CACKEY_VERSION}_${OSX}.${EXT} 247 247 gzip -9 macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar 248 248 rm -rf macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT} 249 249 rm -f build/cackey_osx_build/cackey.dylib ................................................................................ 272 272 273 273 "lion") 274 274 ./autogen.sh 275 275 lion 276 276 exit $? 277 277 ;; 278 278 279 - "sltoml") 279 + "sltomav") 280 280 ./autogen.sh 281 - sltoml 281 + sltomav 282 282 exit $? 283 283 ;; 284 284 285 285 "all") 286 286 ./autogen.sh 287 287 leopard 288 - sltoml 288 + sltomav 289 289 echo "" 290 290 echo "All builds complete." 291 291 exit $? 292 292 ;; 293 293 294 294 "clean") 295 295 clean