Changeset 10215:0c7bfe44bc85 in orange


Ignore:
Timestamp:
02/14/12 17:42:39 (2 years ago)
Author:
ales_erjavec
Branch:
default
rebase_source:
c5136661fa42d7fa7d174818e69700219c26c22a
Message:

Fixed install paths in install3.nsi. If the site-packages dir has the old orange dir (lower case) rename it to orange-old-backup before installing files.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/install3.nsi

    r10214 r10215  
    3838Var PythonDir 
    3939Var AdminInstall 
     40Var SITEDIR 
    4041 
    4142Page license 
     
    174175    not_installed_before: 
    175176 
    176     StrCpy $INSTDIR  "$PythonDir\lib\site-packages\orange" 
    177     SetOutPath "$INSTDIR\Orange" 
    178     File /r /x .svn ${ORANGEDIR}\* 
     177    StrCpy $SITEDIR "$PythonDir\lib\site-packages" 
     178     
     179    IfFileExists "$SITEDIR\orange\orngEnviron.py" 0 no_old_orange_conflict 
     180        Rename "$SITEDIR\orange" "$SITEDIR\orange-old-backup" 
     181         
     182    no_old_orange_conflict: 
     183     
     184    StrCpy $INSTDIR  "$PythonDir\lib\site-packages\Orange" 
     185    SetOutPath "$INSTDIR" 
     186    File /r /x .hg ${ORANGEDIR}\* 
    179187 
    180188    CreateDirectory "$SMPROGRAMS\Orange" 
    181     CreateShortCut "$SMPROGRAMS\Orange\Orange for Beginners.lnk" "$INSTDIR\Orange\doc\ofb\default.htm" 
    182     CreateShortCut "$SMPROGRAMS\Orange\Orange Modules Reference.lnk" "$INSTDIR\Orange\doc\modules\default.htm" 
    183     CreateShortCut "$SMPROGRAMS\Orange\Orange Reference Guide.lnk" "$INSTDIR\Orange\doc\reference\default.htm" 
     189    CreateShortCut "$SMPROGRAMS\Orange\Orange for Beginners.lnk" "$INSTDIR\doc\ofb\default.htm" 
     190    CreateShortCut "$SMPROGRAMS\Orange\Orange Modules Reference.lnk" "$INSTDIR\doc\modules\default.htm" 
     191    CreateShortCut "$SMPROGRAMS\Orange\Orange Reference Guide.lnk" "$INSTDIR\doc\reference\default.htm" 
    184192 
    185193    CreateShortCut "$SMPROGRAMS\Orange\Orange.lnk" "$INSTDIR" 
    186194    CreateShortCut "$SMPROGRAMS\Orange\Uninstall Orange.lnk" "$INSTDIR\uninst.exe" 
    187195 
    188     SetOutPath $INSTDIR\Orange\OrangeCanvas 
    189     CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\Orange\OrangeCanvas\orngCanvas.pyw" $INSTDIR\Orange\OrangeCanvas\icons\orange.ico 0 
    190     CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\Orange\OrangeCanvas\orngCanvas.pyw" $INSTDIR\Orange\OrangeCanvas\icons\orange.ico 0 
    191  
    192     WriteRegStr SHELL_CONTEXT "SOFTWARE\Python\PythonCore\${NPYVER}\PythonPath\Orange" "" "$INSTDIR;$INSTDIR\Orange\orng;$INSTDIR\Orange\OrangeWidgets;$INSTDIR\Orange\OrangeCanvas" 
     196    SetOutPath $INSTDIR\OrangeCanvas 
     197    CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
     198    CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
     199 
     200    WriteRegStr SHELL_CONTEXT "SOFTWARE\Python\PythonCore\${NPYVER}\PythonPath\Orange" "" "$INSTDIR\orng" 
    193201    WriteRegStr SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\Orange" "DisplayName" "Orange (remove only)" 
    194202    WriteRegStr SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\Orange" "UninstallString" '"$INSTDIR\uninst.exe"' 
    195203 
    196204    WriteRegStr HKEY_CLASSES_ROOT ".ows" "" "OrangeCanvas" 
    197     WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\DefaultIcon" "" "$INSTDIR\Orange\OrangeCanvas\icons\OrangeOWS.ico" 
    198     WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe $INSTDIR\Orange\OrangeCanvas\orngCanvas.pyw "%1"' 
     205    WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\DefaultIcon" "" "$INSTDIR\OrangeCanvas\icons\OrangeOWS.ico" 
     206    WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe $INSTDIR\OrangeCanvas\orngCanvas.pyw "%1"' 
    199207 
    200208    WriteUninstaller "$INSTDIR\uninst.exe" 
Note: See TracChangeset for help on using the changeset viewer.