Changeset 186 for trunk


Ignore:
Timestamp:
09/18/10 08:41:24 (11 years ago)
Author:
sc
Message:

Puzzlebox-Synapse.nsi:

  • working on 0.4.0 release

scripts/display_windows_requirements.sh:

  • updated to allow msvcr71.dll
Location:
trunk/synapse
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/synapse/Puzzlebox-Synapse.nsi

    r185 r186  
    2525 
    2626Section "" ; (default section) 
    27 SetOutPath "$INSTDIR" 
    28 ; add files / whatever that need to be installed here. 
    2927WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Synapse\Puzzlebox Synapse" "" "$INSTDIR" 
    3028WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Synapse\Puzzlebox Synapse" "DisplayName" "Puzzlebox Synapse (remove only)" 
     
    3230 
    3331 
    34 ; File dist\msvcr71.dll 
     32SetOutPath "$INSTDIR" 
     33 File dist\msvcr71.dll 
    3534 File dist\puzzlebox_synapse_configuration.ini 
    3635 File dist\python25.dll 
     
    440439 
    441440 
    442 ExecWait '..\package\vcredist_x86.exe /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"' 
     441SetOutPath $INSTDIR\package 
     442 File ..\package\vcredist_x86.exe 
     443 
     444ExecWait '"$INSTDIR\package\vcredist_x86.exe" /q:a /c:"msiexec /i vcredist.msi /qn /l*v %temp%\vcredist_x86.log"' 
    443445 
    444446 
     
    481483   RMDir "$SMPROGRAMS\Puzzlebox Synapse" 
    482484 Delete "$DESKTOP\Puzzlebox Synapse.lnk" 
    483  
    484485 
    485486 
     
    859860 Delete $INSTDIR\mpl-data\matplotlib.conf 
    860861 Delete $INSTDIR\mpl-data\matplotlibrc 
    861 ; Delete $INSTDIR\msvcr71.dll 
     862 Delete $INSTDIR\msvcr71.dll 
    862863 Delete $INSTDIR\puzzlebox_synapse_configuration.ini 
    863864 Delete $INSTDIR\python25.dll 
     
    877878 RMDir $INSTDIR\mpl-data 
    878879 
    879  RMDIR $INSTDIR 
     880 
     881 Delete $INSTDIR\package\vcredist_x86.exe 
     882 RMDIR $INSTDIR\package 
     883 
    880884 
    881885Delete "$INSTDIR\Puzzlebox-Synapse-Uninstall.exe" 
    882886DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Puzzlebox Synapse\Puzzlebox Synapse" 
    883887DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Puzzlebox Synapse" 
    884 RMDir "$INSTDIR" 
     888 
     889 
     890 RMDIR $INSTDIR 
     891 
    885892 
    886893  ; if $INSTDIR was removed, skip these next ones 
  • trunk/synapse/scripts/display_windows_requirements.sh

    r184 r186  
    55                echo -n ';' 
    66        fi 
    7         if [ ! -z `echo $each | grep msvcr71.dll` ] 
    8         then 
    9                 echo -n ';' 
    10         fi 
     7 
     8        # No longer necessary 
     9        # http://support.microsoft.com/kb/326922 
     10        # The shared CRT DLL has been distributed by Microsoft in the  
     11        # past as a shared system component. This may cause problems when  
     12        # you run applications that are linked to a different version of  
     13        # the CRT on computers that do not have the correct versions of  
     14        # the CRT DLL installed. This is commonly referred to as the "DLL  
     15        # Conflict" problem. 
     16        #  
     17        # To address this issue, the CRT DLL is no longer considered a  # system file, therefore, distribute the CRT DLL with any 
     18        # application that relies on it. Because it is no longer a system       # component, install it in your applications Program Files 
     19        # directory with other application-specific code. This prevents  
     20        # your application from using other versions of the CRT library  
     21        # that may be installed on the system paths. 
     22        # 
     23        # if [ ! -z `echo $each | grep msvcr71.dll` ] 
     24        # then 
     25        #       echo -n ';' 
     26        # fi 
    1127        echo -n ' File ' 
    1228        echo $each 
Note: See TracChangeset for help on using the changeset viewer.