Changeset 11533:a0eb042207e8 in orange


Ignore:
Timestamp:
05/17/13 20:27:30 (11 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Message:

Changed Orange Canvas startup scripts to launch the new interface.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • install-scripts/install3.nsi

    r11086 r11533  
    198198 
    199199    SetOutPath $INSTDIR\OrangeCanvas 
    200     CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
    201     CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "$INSTDIR\OrangeCanvas\orngCanvas.pyw" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
     200    CreateShortCut "$DESKTOP\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "-m Orange.OrangeCanvas.main" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
     201    CreateShortCut "$SMPROGRAMS\Orange\Orange Canvas.lnk" "$PythonDir\pythonw.exe" "-m Orange.OrangeCanvas.main" $INSTDIR\OrangeCanvas\icons\orange.ico 0 
    202202 
    203203    WriteRegStr SHELL_CONTEXT "SOFTWARE\Python\PythonCore\${NPYVER}\PythonPath\Orange" "" "$INSTDIR\orng" 
     
    207207    WriteRegStr HKEY_CLASSES_ROOT ".ows" "" "OrangeCanvas" 
    208208    WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\DefaultIcon" "" "$INSTDIR\OrangeCanvas\icons\OrangeOWS.ico" 
    209     WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe $INSTDIR\OrangeCanvas\orngCanvas.pyw "%1"' 
     209    WriteRegStr HKEY_CLASSES_ROOT "OrangeCanvas\Shell\Open\Command\" "" '$PythonDir\python.exe -m Orange.OrangeCanvas.main "%1"' 
    210210 
    211211    WriteUninstaller "$INSTDIR\uninst.exe" 
  • install-scripts/mac/bundle-build-hg.sh

    r11528 r11533  
    2222TEMPLATE_VERSION=`curl --silent http://orange.biolab.si/download/bundle-templates/CURRENT.txt` 
    2323curl --silent http://orange.biolab.si/download/bundle-templates/Orange-template-${TEMPLATE_VERSION}.tar.gz | tar -xz -C $WORK_DIR 
    24 #svn export --non-interactive http://orange.biolab.si/svn/orange/externals/trunk/install-scripts/mac/bundle/ $TMP_BUNDLE_DIR 
    2524 
    2625# Make repos dir if it does not yet exist 
     
    2827    mkdir $REPOS_DIR 
    2928fi 
     29 
     30# Create bundle startup script 
     31cat <<-'EOF' > ${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/Orange 
     32    #!/bin/bash 
     33 
     34    source `dirname "$0"`/ENV 
     35 
     36    # LaunchServices passes the Carbon process identifier to the application with 
     37    # -psn parameter - we do not want it 
     38    if [[ $1 == -psn_* ]]; then 
     39        shift 1 
     40    fi 
     41 
     42    exec -a "$0" "$PYTHONEXECUTABLE" -m Orange.OrangeCanvas.main "$@" 
     43EOF 
     44 
     45chmod +x ${TMP_BUNDLE_DIR}/Orange.app/Contents/MacOS/Orange 
    3046 
    3147# Python interpreter in the bundle 
  • setup.py

    r11531 r11533  
    751751 
    752752ENTRY_POINTS = { 
    753 #    'gui_scripts': ( 
    754 #            'orange-canvas = Orange.OrangeCanvas.main:main', 
    755 #    ), 
     753    'gui_scripts': ( 
     754            'orange-canvas = Orange.OrangeCanvas.main:main', 
     755    ), 
    756756    'orange.canvas.help': ( 
    757757            'intersphinx = Orange.OrangeWidgets:intersphinx', 
     
    786786        cmdclass = cmdclass, 
    787787        ext_modules = ext_modules, 
    788         scripts = ( 
    789             'bin/orange-canvas', 
    790         ), 
    791788    ) 
    792789 
Note: See TracChangeset for help on using the changeset viewer.