Changeset 359

Show
Ignore:
Timestamp:
04/22/08 22:44:55 (2 years ago)
Author:
calh
Message:

windows installer is nearly building (!!)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r358 r359  
    222222 
    223223        @# XULRunner 
     224        cp $(SRC)/Resources/application.ini $(RES)/ 
     225        cp $(SRC)/Resources/LICENSE.txt $(RES)/ 
    224226ifeq (mac, $(PLATFORM)) 
    225227        cp -R $(SRC)/Frameworks/XUL.framework $(APP)/Contents/Frameworks/ 
    226228        cp $(APP)/Contents/Frameworks/XUL.framework/Versions/Current/xulrunner \ 
    227229                $(APP)/Contents/MacOS/xulrunner 
    228         cp $(SRC)/Resources/application.ini $(RES)/ 
    229         cp $(SRC)/Resources/LICENSE.txt $(RES)/ 
    230230        cp $(SRC)/Resources/icons.icns $(RES)/ 
    231 else 
     231endif 
     232ifeq (win, $(PLATFORM)) 
    232233        cp -R $(SRC)/Resources/xulrunner $(RES)/ 
    233234        cp $(SRC)/Resources/Flickr\ Uploadr.exe $(RES)/ 
     235        cp $(SRC)/Resources/libexpat.dll $(RES)/ 
     236        cp $(SRC)/Resources/icons.ico $(RES)/ 
    234237endif 
    235238 

  • trunk/uploadr/win_installer/build.nsi

    r358 r359  
    8484        File /oname=chrome\icons\default\main.ico       "Flickr Uploadr\chrome\icons\default\main.ico" 
    8585        File /oname=chrome\icons\default\updates.ico    "Flickr Uploadr\chrome\icons\default\updates.ico" 
    86         File /oname=chrome\uploadr.jar                  "Flickr Uploadr\Resources\chrome\uploadr.jar" 
    87         File /oname=chrome\chrome.manifest              "Flickr Uploadr\Resources\chrome\chrome.manifest.prod" 
     86        File /oname=chrome\uploadr.jar                  "Flickr Uploadr\chrome\uploadr.jar" 
     87        File /oname=chrome\chrome.manifest              "Flickr Uploadr\chrome\chrome.manifest" 
    8888 
    8989        ; XPCOM components 
    9090        CreateDirectory "$INSTDIR\components" 
    91         File /oname=components\gm.dll MacUploadr.app\Contents\Resources\components\gm.dll 
    92         File /oname=components\flIGM.xpt MacUploadr.app\Contents\Resources\components\flIGM.xpt 
    93         File /oname=components\key.dll MacUploadr.app\Contents\Resources\components\key.dll 
    94         File /oname=components\flIKey.xpt MacUploadr.app\Contents\Resources\components\flIKey.xpt 
    95         File /oname=components\clh.js MacUploadr.app\Contents\Resources\components\clh.js 
    96         File /oname=components\flICLH.xpt MacUploadr.app\Contents\Resources\components\flICLH.xpt 
    97         File /oname=libexpat.dll MacUploadr.app\Contents\Resources\libexpat.dll 
     91        File /oname=components\gm.dll                   "Flickr Uploadr\components\gm.dll" 
     92        File /oname=components\flIGM.xpt                "Flickr Uploadr\components\flIGM.xpt" 
     93        File /oname=components\key.dll                  "Flickr Uploadr\components\key.dll" 
     94        File /oname=components\flIKey.xpt               "Flickr Uploadr\components\flIKey.xpt" 
     95        File /oname=components\clh.js                   "Flickr Uploadr\components\clh.js" 
     96        File /oname=components\flICLH.xpt               "Flickr Uploadr\components\flICLH.xpt" 
    9897 
    9998        ; CRT 
    …… 
    103102 
    104103        ; XULRunner and friends 
    105         File /r /x .svn MacUploadr.app\Contents\Resources\defaults 
    106         File /r /x .svn MacUploadr.app\Contents\Resources\xulrunner 
    107         File MacUploadr.app\Contents\Resources\application.ini 
    108         File MacUploadr.app\Contents\Resources\LICENSE.txt 
    109         File MacUploadr.app\Contents\Resources\icons.ico 
    110         File MacUploadr.app\Contents\Resources\magic.mgk 
    111         File MacUploadr.app\Contents\Resources\modules.mgk 
    112         File MacUploadr.app\Contents\Resources\delegates.mgk 
    113         File "MacUploadr.app\Contents\Resources\Flickr Uploadr.exe" 
     104        File /r /x .svn "Flickr Uploadr\defaults" 
     105        File /r /x .svn "Flickr Uploadr\xulrunner" 
     106        File "Flickr Uploadr\application.ini" 
     107        File "Flickr Uploadr\LICENSE.txt" 
     108        File "Flickr Uploadr\icons.ico" 
     109        File "Flickr Uploadr\magic.mgk" 
     110        File "Flickr Uploadr\modules.mgk" 
     111        File "Flickr Uploadr\delegates.mgk" 
     112        File "Flickr Uploadr\libexpat.dll" 
     113        File "Flickr Uploadr\Flickr Uploadr.exe" 
    114114 
    115115        ; Uninstaller