Changeset 47

Show
Ignore:
Timestamp:
02/12/06 21:03:56 (3 years ago)
Author:
martin
Message:
  • Really remove the .svn files
  • change tokend build to be up to date with darwinbuild and source tree
  • don't build libusb docs (as that is not needed nor possible always)
Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r45 r47  
    7878        cp -R pcscd_autostart.pkg sca.mpkg/Contents/Packages/ 
    7979        cp -R opensc_tokend.pkg sca.mpkg/Contents/Packages/ 
     80        find sca.mpkg -name '.svn' | xargs rm -rf 
    8081        hdiutil create -srcfolder sca.mpkg -volname "SCA $(SCAVERSION)" sca-$(SCAVERSION).dmg 
    8182#       hdiutil internet-enable -yes sca-$(SCAVERSION).dmg 
    … …  
    206207build-libusb: 
    207208        cd libusb && \ 
    208         ./configure --prefix=/Library/OpenSC && \ 
     209        ./configure --prefix=/Library/OpenSC --disable-build-docs && \ 
    209210        make && \ 
    210211        make install prefix=$(BUILDHOME)/compiled-libusb/Library/OpenSC 
    … …  
    221222build-tokend: 
    222223        hdiutil attach $(TOKEND_IMAGE_LOCATION) 
    223         rm -rf $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-11 
    224         ditto opensc.tokend/Tokend-11 $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-11 
    225         cd $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-11 && \ 
     224        rm -rf $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-25868 
     225        ditto opensc.tokend $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-25868 
     226        cd $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-25868 && \ 
    226227        xcodebuild -configuration Deployment 
    227228        mkdir -p $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend 
    228         cp -r $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-11/build/Deployment/OpenSC.tokend $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend/ 
    229         cp opensc.tokend/conf/tokend.conf $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend/OpenSC.tokend/Contents/ 
     229        cp -r $(TOKEND_IMAGE_NAME)/$(TOKEND_BUILD_NAME)/Sources/Tokend-25868/build/Deployment/OpenSC.tokend $(BUILDHOME)/compiled-opensc_tokend/System/Library/Security/tokend/ 
    230230         
    231231build-tokend-end: