Changeset 509

Show
Ignore:
Timestamp:
02/04/09 15:01:32 (10 months ago)
Author:
jdecq
Message:

=appending build number in installers file name

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r506 r509  
    5454# Version number for Uploadr - this comes from application.ini 
    5555VER := `grep ^Version= $(SRC)/Resources/application.ini | sed 's/Version=\(.*\)/\1/'` 
     56# Dated version for the NSIS installer - this comes from application.ini 
     57VER_DATE := `grep ^BuildID= $(SRC)/Resources/application.ini | sed 's/BuildID=\([0-9]\{4\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1.\2.\3.\4/'` 
    5658 
    5759######################################################################## 
    …… 
    7577 
    7678# below here, don't modify anything 
    77  
    78 # Dated version for the NSIS installer - this comes from application.ini 
    79 VER_DATE := `grep ^BuildID= $(SRC)/Resources/application.ini | sed 's/BuildID=\([0-9]\{4\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)\([0-9]\{2\}\)/\1.\2.\3.\4/'` 
    8079 
    8180# Location for build staging 
    …… 
    343342        cp mac_installer/install-pane-$(INTL_SHORT).png $(BUILD)/.i.png 
    344343        cp mac_installer/DS_Store $(BUILD)/.DS_Store 
    345         rm -f $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).dmg 
     344        rm -f $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT).dmg 
     345        rm -f $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT)-dev.dmg 
    346346ifeq (dev, $(filter dev, $(MAKECMDGOALS))) 
    347347        hdiutil create -srcfolder $(BUILD) -volname "Flickr Uploadr $(VER)" \ 
    348348                -format UDZO -imagekey zlib-level=9 \ 
    349                 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT)-dev.dmg 
     349                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT)-dev.dmg 
    350350else 
    351351        hdiutil create -srcfolder $(BUILD) -volname "Flickr Uploadr $(VER)" \ 
    352352                -format UDZO -imagekey zlib-level=9 \ 
    353                 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).dmg 
     353                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT).dmg 
    354354endif 
    355355endif 
    …… 
    389389ifeq (dev, $(filter dev, $(MAKECMDGOALS))) 
    390390        mv $(BUILD)/FlickrUploadr-$(VER)-XX.exe \ 
    391                 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT)-dev.exe 
     391                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT)-dev.exe 
    392392else 
    393393        mv $(BUILD)/FlickrUploadr-$(VER)-XX.exe \ 
    394                 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).exe 
     394                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT).exe 
    395395endif 
    396396        rm $(BUILD)/build.nsi 
    …… 
    419419        @ln -s Flickr\ Uploadr $(BUILD)/new 
    420420endif 
    421         @rm -f $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar 
     421        @rm -f $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT).complete.mar 
    422422        @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
    423423                $(MOZILLA)/tools/update-packaging/make_full_update.sh \ 
    424                 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT)-$(PLATFORM).complete.mar \ 
     424                $(OUT)/FlickrUploadr-$(VER)-$(VER_DATE)-$(INTL_SHORT)-$(PLATFORM).complete.mar \ 
    425425                $(BUILD)/new &> /dev/null 
    426426#       @rm -f $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar