Changeset 310

Show
Ignore:
Timestamp:
03/27/08 16:44:35 (2 years ago)
Author:
rcrowley
Message:

One-command Mac build system.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/MacUploadr.app/Contents/Info.plist

    r274 r310  
    7171        </array> 
    7272        <key>CFBundleGetInfoString</key> 
    73         <string>Flickr Uploadr 3.1a4, (c) Yahoo!, Inc.</string> 
     73        <string>Flickr Uploadr 3.1a5, (c) Yahoo!, Inc.</string> 
    7474        <key>CFBundleIdentifier</key> 
    7575        <string>com.flickr.uploadr</string> 
    …… 
    8181        <string>APPL</string> 
    8282        <key>CFBundleShortVersionString</key> 
    83         <string>3.1a4</string> 
     83        <string>3.1a5</string> 
    8484        <key>CFBundleSignature</key> 
    8585        <string>FLUP</string> 
    …… 
    9898        </array> 
    9999        <key>CFBundleVersion</key> 
    100         <string>3.1a4</string> 
     100        <string>3.1a5</string> 
    101101</dict> 
    102102</plist> 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/application.ini

    r302 r310  
    1212Vendor=Flickr 
    1313Name=Flickr Uploadr 
    14 Version=3.1a4 
     14Version=3.1a5 
    1515BuildID=2008032401 
    1616Copyright=Copyright (c) 2007-2008 - Yahoo!, Inc. 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/conf.js

    r297 r310  
    2929 
    3030        // What version am I? 
    31         version: '3.1a4', 
     31        version: '3.1a5', 
    3232 
    3333        // What types of API events should be written to the console? 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/chrome/content/uploadr/extension.js

    r297 r310  
    1919 
    2020        // Event handlers 
    21         //   Please don't call these on your own.  Instead, check out the 
    22         //   helloworld extension on http://code.flickr.com/ and play along. 
     21        //   Check out the helloworld extension on http://code.flickr.com/ 
     22        //   and play along. 
    2323        Handler: function() { 
    2424                this.list = []; 

  • trunk/uploadr/MacUploadr.app/Contents/Resources/defaults/preferences/prefs.js

    r297 r310  
    4343pref('extensions.logging.enabled', false); 
    4444pref('general.skins.selectedSkin', 'uploadr'); 
    45 //pref('extensions.update.url', '???'); 
     45 
     46// Don't know what to put here, this is Firefox's version 
     47//pref('extensions.update.url', 'https://addons.mozilla.org/update/VersionCheck.php?reqVersion=%REQ_VERSION%&id=%ITEM_ID%&version=%ITEM_VERSION%&maxAppVersion=%ITEM_MAXAPPVERSION%&status=%ITEM_STATUS%&appID=%APP_ID%&appVersion=%APP_VERSION%&appOS=%APP_OS%&appABI=%APP_ABI%'); 
     48 
    4649pref('extensions.getMoreExtensionsURL', 'http://flickr.com/tools/uploadr/'); 
    4750pref('extensions.getMoreThemesURL', 'http://flickr.com/tools/uploadr/'); 

  • trunk/uploadr/Makefile

    r292 r310  
    3535endif 
    3636 
    37 # The base of this path (everything up to INTL) must exist before running make 
     37# Location to output finished DMGs 
     38OUT := ~/Desktop/ 
     39 
     40# The base of this path must exist before running make 
    3841PKG := ~/Desktop/build/$(INTL) 
    3942 
    4043# Version number for Uploadr 
    41 VER := 3.1a4 
    42  
    43 # Location of Mozilla tree 
     44VER := 3.1a5 
     45 
     46# Location of Mozilla tree for the MAR tools 
    4447MOZILLA := ~/mozilla 
    4548 
    …… 
    4952GM_VER := 1.1.10 
    5053 
    51 all: 
     54all: all-build all-mar 
     55 
     56all-build: 
    5257        make de-de build 
    5358        make en-US build 
    …… 
    5863        make pt-br build 
    5964        make zh-hk build 
    60 ifeq (update, $(filter update, $(MAKECMDGOALS))) 
     65 
     66all-mar: 
    6167        make de-de mar 
    6268        make en-US mar 
    …… 
    6773        make pt-br mar 
    6874        make zh-hk mar 
    69 endif 
    7075 
    7176de-de: 
    …… 
    95100build: 
    96101 
    97         # Saving the previous version 
    98         rm -rf $(PKG)/old 
    99         mv $(APP) $(PKG)/old 
     102        # Make sure the package directory exists 
     103        mkdir -p $(PKG) 
     104 
     105        # Saving the previous version for the partial MAR 
     106#       rm -rf $(PKG)/old 
     107#       mv $(APP) $(PKG)/old 
     108        rm -rf $(APP) 
     109        rm -f $(PKG)/Applications 
    100110 
    101111        # Package structure 
    …… 
    179189        cp $(SRC)/Resources/components/*.js $(BUILD)/Resources/components/ 
    180190 
    181         # Copy to DMG 
    182         cp -R $(PKG)/Flickr\ Uploadr.app /Volumes/Flickr\ Uploadr\ $(VER)/ 
    183         ln -s /Applications /Volumes/Flickr\ Uploadr\ $(VER)/Applications 
    184         cp mac_installer/install-pane-$(INTL).png \ 
    185                 /Volumes/Flickr\ Uploadr\ $(VER)/.i.png 
    186         ln -s .i.png /Volumes/Flickr\ Uploadr\ $(VER)/i.png 
     191        # Create DMG 
     192        ln -s /Applications $(PKG)/Applications 
     193        cp mac_installer/install-pane-$(INTL_SHORT).png $(PKG)/.i.png 
     194        cp mac_installer/DS_Store $(PKG)/.DS_Store 
     195        hdiutil create -srcfolder $(PKG) -volname "Flickr Uploadr $(VER)" \ 
     196                -format UDZO -imagekey zlib-level=9 \ 
     197                $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).dmg 
     198 
     199 
    187200 
    188201mar: 
    189202 
    190203        # Making MAR files 
    191         ln -s Flickr\ Uploadr.app $(PKG)/new 
    192         PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
     204        @ln -s Flickr\ Uploadr.app $(PKG)/new 
     205        @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
    193206                $(MOZILLA)/tools/update-packaging/make_full_update.sh \ 
    194                 $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar $(PKG)/new 
    195 #       PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
     207                $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar \ 
     208                $(PKG)/new > /dev/null 
     209#       @PATH="$(PATH):$(MOZILLA)/other-licenses/bsdiff:$(MOZILLA)/modules/libmar/tool" \ 
    196210#               $(MOZILLA)/tools/update-packaging/make_incremental_update.sh \ 
    197 #               $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar $(PKG)/old $(PKG)/new 
    198         rm $(PKG)/new 
     211#               $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar \ 
     212#               $(PKG)/old $(PKG)/new > /dev/null 
     213        @rm $(PKG)/new 
    199214 
    200215        # Size and hash for the XML file 
    201         @ls -l $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar | awk '{print "Complete size: ",$$5}' 
    202         @md5 $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar | awk '{print "Complete MD5:  ",$$4}' 
    203 #       @ls -l $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar | awk '{print "Partial size: ",$$5}' 
    204 #       @md5 $(PKG)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar | awk '{print "Partial MD5:  ",$$4}' 
     216        @ls -l $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar | \ 
     217                awk '{print "$(INTL) complete size: ",$$5}' 
     218        @md5 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).complete.mar | \ 
     219                awk '{print "$(INTL) complete MD5:  ",$$4}' 
     220#       @ls -l $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar | \ 
     221#               awk '{print "$(INTL) partial size: ",$$5}' 
     222#       @md5 $(OUT)/FlickrUploadr-$(VER)-$(INTL_SHORT).partial.mar | \ 
     223#               awk '{print "$(INTL) partial MD5:  ",$$4}'