Changeset 9568:94154d56046f in orange for orange/setup.py


Ignore:
Timestamp:
01/25/12 21:04:49 (2 years ago)
Author:
markotoplak
Branch:
default
Children:
9569:3bd245c51572, 9578:16b20c2df871
Message:

Reverting setup.py. I have accidentally overwritten it with the version from the root folder.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orange/setup.py

    r9567 r9568  
    2424from subprocess import check_call 
    2525 
    26 import types 
     26from types import * 
    2727 
    2828from distutils.dep_util import newer_group 
     
    3232from distutils.sysconfig import get_python_inc, get_config_var 
    3333import numpy 
    34 numpy_include_dir = numpy.get_include() 
     34numpy_include_dir = numpy.get_include(); 
    3535python_include_dir = get_python_inc(plat_specific=1) 
    3636 
     
    9191            self.library_dirs.append(self.build_lib)  
    9292        else: 
    93             self.library_dirs.append("./orange") 
     93            self.library_dirs.append("./")  
    9494         
    9595    def build_extension(self, ext): 
     
    128128        ## mostly copied from build_extension 
    129129        sources = ext.sources 
    130         if sources is None or type(sources) not in (types.ListType, types.TupleType): 
     130        if sources is None or type(sources) not in (ListType, TupleType): 
    131131            raise DistutilsSetupError, \ 
    132132                  ("in 'ext_modules' option (extension '%s'), " + 
     
    219219        ## mostly copied from build_extension, changed 
    220220        sources = ext.sources 
    221         if sources is None or type(sources) not in (types.ListType, types.TupleType): 
     221        if sources is None or type(sources) not in (ListType, TupleType): 
    222222            raise DistutilsSetupError, \ 
    223223                  ("in 'ext_modules' option (extension '%s'), " + 
     
    469469import fnmatch 
    470470matches = [] 
    471 os.chdir("orange") 
    472471for root, dirnames, filenames in os.walk('Orange'): #Recursively find '__init__.py's 
    473472  for filename in fnmatch.filter(filenames, '__init__.py'): 
    474473      matches.append(os.path.join(root, filename)) 
    475474packages = [os.path.dirname(pkg).replace(os.path.sep, '.') for pkg in matches] 
    476 os.chdir("..") 
    477475 
    478476if have_setuptools: 
     
    495493      download_url = "http://orange.biolab.si/svn/orange/trunk", 
    496494      packages = packages + ["", 
    497                              "OrangeCanvas", 
     495                             "OrangeCanvas",  
    498496                             "OrangeWidgets",  
    499497                             "OrangeWidgets.Associate", 
     
    510508                             "doc", 
    511509                             ], 
    512       package_dir = {"": "orange"}, 
     510      package_dir = {"": "."}, 
    513511      package_data = {"OrangeCanvas": ["icons/*.png", "orngCanvas.pyw", "WidgetTabs.txt"], 
    514512                      "OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", "report/index.html"], 
     
    524522                      "OrangeWidgets.plot.primitives": ["*.obj"], 
    525523                      "doc": ["datasets/*.tab", ], 
    526                       "": ["orangerc.cfg"] 
     524                      "": ["orangerc.cfg"]  
    527525                      }, 
    528526      ext_modules = [include_ext, orange_ext, orangeom_ext, orangene_ext, corn_ext, statc_ext], 
    529527      extra_path=("orange", "orange"), 
    530       scripts = ["orange/orange-canvas"], 
     528      scripts = ["orange-canvas"], 
    531529      license = "GNU General Public License (GPL)", 
    532530      keywords = ["data mining", "machine learning", "artificial intelligence"], 
Note: See TracChangeset for help on using the changeset viewer.