Changeset 506

Show
Ignore:
Timestamp:
01/22/09 17:23:35 (10 months ago)
Author:
jdecq
Message:

add the vcredist in the update package

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/uploadr/Makefile

    r505 r506  
    1 f# 
     1# 
    22# Flickr Uploadr 
    33# 
    …… 
    382382                $(BUILD)/build.nsi 
    383383endif 
    384         cp win_installer/vcredist_x86.exe $(BUILD)/vcredist_x86.exe 
     384        cp win_installer/vcredist_x86.exe $(APP)/vcredist_x86.exe 
    385385 
    386386        $(MAKE_NSIS) -DVERSION=$(VER) \ 
    …… 
    397397        rm $(BUILD)/strings.nsh 
    398398        rm $(BUILD)/config.ini 
    399         rm $(BUILD)/vcredist_x86.exe 
    400399endif 
    401400 

  • trunk/uploadr/win_installer/build.nsi

    r501 r506  
    103103 
    104104        ; CRT 
    105         File "vcredist_x86.exe" 
     105        File "Flickr Uploadr\vcredist_x86.exe" 
    106106        ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a /c:""msiexec /i vcredist.msi /qb!"" "' 
    107         Delete "$INSTDIR\vcredist_x86.exe" 
    108107 
    109108        ; XULRunner and friends 

  • trunk/uploadr/win_installer/build_dev.nsi

    r495 r506  
    9797 
    9898        ; CRT 
    99         File "vcredist_x86.exe" 
     99        File "Flickr Uploadr\vcredist_x86.exe" 
    100100        ExecWait '"$INSTDIR\vcredist_x86.exe" /q:a /c:"VCREDI~1.EXE /q:a /c:""msiexec /i vcredist.msi /qb!"" "' 
    101101        Delete "$INSTDIR\vcredist_x86.exe"