Changeset 11216:93e23bd7ec3e in orange for setup.py


Ignore:
Timestamp:
11/30/12 16:15:30 (17 months ago)
Author:
Ales Erjavec <ales.erjavec@…>
Branch:
default
Parents:
11215:a55eaa72e6ef (diff), 11045:a66a74b38e91 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merged from upstream (biolab/orange).

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • setup.py

    r11014 r11216  
    640640             all_with_extension(path="doc/datasets", extensions=("tab", "csv", "basket")) +\ 
    641641             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    642         "Orange.OrangeCanvas": ["icons/*.png", "orngCanvas.pyw", "WidgetTabs.txt"], 
    643         "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", "report/index.html"], 
    644         "Orange.OrangeWidgets.Associate": ["icons/*.png"], 
    645         "Orange.OrangeWidgets.Classify": ["icons/*.png"], 
    646         "Orange.OrangeWidgets.Data": ["icons/*.png"], 
    647         "Orange.OrangeWidgets.Evaluate": ["icons/*.png"], 
    648         "Orange.OrangeWidgets.Prototypes": ["icons/*.png"], 
    649         "Orange.OrangeWidgets.Regression": ["icons/*.png"], 
    650         "Orange.OrangeWidgets.Unsupervised": ["icons/*.png"], 
    651         "Orange.OrangeWidgets.Visualize": ["icons/*.png"], 
    652         "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png"], 
     642        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
     643                                "orngCanvas.pyw", "WidgetTabs.txt"], 
     644        "Orange.OrangeCanvas.styles": ["*.qss", "orange/*.svg"], 
     645        "Orange.OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", 
     646                                 "report/index.html"], 
     647        "Orange.OrangeWidgets.Associate": ["icons/*.png", "icons/*.svg"], 
     648        "Orange.OrangeWidgets.Classify": ["icons/*.png", "icons/*.svg"], 
     649        "Orange.OrangeWidgets.Data": ["icons/*.png", "icons/*.svg"], 
     650        "Orange.OrangeWidgets.Evaluate": ["icons/*.png", "icons/*.svg"], 
     651        "Orange.OrangeWidgets.Prototypes": ["icons/*.png", "icons/*.svg"], 
     652        "Orange.OrangeWidgets.Regression": ["icons/*.png", "icons/*.svg"], 
     653        "Orange.OrangeWidgets.Unsupervised": ["icons/*.png", "icons/*.svg"], 
     654        "Orange.OrangeWidgets.Visualize": ["icons/*.png", "icons/*.svg"], 
     655        "Orange.OrangeWidgets.Visualize Qt": ["icons/*.png", "icons/*.svg"], 
    653656        "Orange.OrangeWidgets.plot": ["*.gs", "*.vs"], 
    654657        "Orange.OrangeWidgets.plot.primitives": ["*.obj"], 
     
    747750# http://packages.python.org/distribute/setuptools.html#automatic-script-creation 
    748751ENTRY_POINTS = { 
     752    'gui_scripts': ( 
     753            'orange-canvas = Orange.OrangeCanvas.main:main', 
     754    ) 
    749755} 
    750756 
     
    776782        cmdclass = cmdclass, 
    777783        ext_modules = ext_modules, 
    778         scripts = ( 
    779             "bin/orange-canvas", 
    780         ), 
     784#        scripts = ( 
     785#            "bin/orange-canvas", 
     786#        ), 
    781787    ) 
    782788 
  • setup.py

    r11173 r11216  
    1 #!usr/bin/env python 
     1#!/usr/bin/env python2 
    22 
    33try: 
     
    639639            ["orangerc.cfg", "doc/style.css", "doc/widgets/*/*.*"] +\ 
    640640             all_with_extension(path="doc/datasets", extensions=("tab", "csv", "basket")) +\ 
    641              all_with_extension(path="doc/networks", extensions=("net", "tab")) +\ 
    642641             all_with_extension(path="testing/regression/tests_20", extensions=("net", "tab", "basket", "csv")), 
    643642        "Orange.OrangeCanvas": ["icons/*.png", "icons/*.svg", 
     
    739738        'PyQt4', 
    740739        'PyQwt', 
    741     ), 
    742     'NETWORK': ( 
    743         'networkx', 
    744740    ), 
    745741    'reST': ( 
Note: See TracChangeset for help on using the changeset viewer.