Changeset 10214:aa068e239307 in orange


Ignore:
Timestamp:
02/14/12 16:01:38 (2 years ago)
Author:
ales_erjavec
Branch:
default
rebase_source:
692d6bc4da3b8fcda026cb819ce83259a363bb5d
Message:

Fixed install3.nsi script file (to use the new paths within the new Orange hierarchy).

Location:
install-scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/createCommon__.btm

    r8826 r10214  
    7878    REM # pack 
    7979    cdd %SCRIPTDIR 
    80     set COMMON_NSI_OPTIONS=/DORANGEDIR=%TMPDIR\orange /DPYVER=%pyver /DNPYVER=%npver /DPARTY=%PARTY /DQTVER=%@SUBSTR[%THIRD_PARTY_DIR,2,2] install3.nsi 
     80    set COMMON_NSI_OPTIONS=/DORANGEDIR=%TMPDIR\Orange /DPYVER=%pyver /DNPYVER=%npver /DPARTY=%PARTY /DQTVER=%@SUBSTR[%THIRD_PARTY_DIR,2,2] install3.nsi 
    8181    nsis /O%TMPDIR\win-%PKG_TYPE-core-packWithNSIS-%THIRD_PARTY_DIR-py%npver.log /DOUTFILENAME="%TMPDIR\%PURE_ORANGE-py%npver.exe" %COMMON_NSI_OPTIONS %+ 
    8282    break_on_error 
  • install-scripts/install3.nsi

    r9425 r10214  
    175175 
    176176    StrCpy $INSTDIR  "$PythonDir\lib\site-packages\orange" 
    177     SetOutPath $INSTDIR 
     177    SetOutPath "$INSTDIR\Orange" 
    178178    File /r /x .svn ${ORANGEDIR}\* 
    179179 
    180180    CreateDirectory "$SMPROGRAMS\Orange" 
    181     CreateShortCut "$SMPROGRAMS\Orange\Orange for Beginners.lnk" "$INSTDIR\doc\ofb\default.htm" 
    182     CreateShortCut "$SMPROGRAMS\Orange\Orange Modules Reference.lnk" "$INSTDIR\doc\modules\default.htm" 
    183     CreateShortCut "$SMPROGRAMS\Orange\Orange Reference Guide.lnk" "$INSTDIR\doc\reference\default.htm" 
    184  
    185     CreateShortCut "$SMPROGRAMS\Orange\Orange.lnk" "$INSTDIR\" 
     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" 
     184 
     185    CreateShortCut "$SMPROGRAMS\Orange\Orange.lnk" "$INSTDIR" 
    186186    CreateShortCut "$SMPROGRAMS\Orange\Uninstall Orange.lnk" "$INSTDIR\uninst.exe" 
    187187 
    188     SetOutPath $INSTDIR\OrangeCanvas 
    189     CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
    190     CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
    191  
    192     WriteRegStr SHELL_CONTEXT "SOFTWARE\Python\PythonCore\${NPYVER}\PythonPath\Orange" "" "$INSTDIR;$INSTDIR\OrangeWidgets;$INSTDIR\OrangeCanvas" 
     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" 
    193193    WriteRegStr SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\Orange" "DisplayName" "Orange (remove only)" 
    194194    WriteRegStr SHELL_CONTEXT "Software\Microsoft\Windows\CurrentVersion\Uninstall\Orange" "UninstallString" '"$INSTDIR\uninst.exe"' 
    195195 
    196196    WriteRegStr HKEY_CLASSES_ROOT ".ows" "" "OrangeCanvas" 
    197     WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\DefaultIcon" "" "$INSTDIR\OrangeCanvas\icons\OrangeOWS.ico" 
    198     WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe $INSTDIR\orangeCanvas\orngCanvas.pyw "%1"' 
     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"' 
    199199 
    200200    WriteUninstaller "$INSTDIR\uninst.exe" 
Note: See TracChangeset for help on using the changeset viewer.