Skip to content

Commit

Permalink
Updated setup.py (new directory structure)
Browse files Browse the repository at this point in the history
  • Loading branch information
@astaric
astaric committed Feb 6, 2012
1 parent c84d671 commit 098ee22
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 40 deletions.
4 changes: 2 additions & 2 deletions bin/orange-canvas
View file
@@ -1,8 +1,8 @@
#!/usr/bin/env python

import os
import orange
__file = orange.__file__
import Orange
__file = Orange.__file__

__canvas = os.path.join(os.path.split(__file)[0], "OrangeCanvas", "orngCanvas.pyw")
execfile(__canvas)
83 changes: 45 additions & 38 deletions setup.py
View file
Expand Up @@ -422,7 +422,7 @@ def get_source_files(path, ext="cpp", exclude=[]):
orange_sources += get_source_files("source/orange/libsvm/", "cpp")


orange_ext = PyXtractSharedExtension("orange", orange_sources,
orange_ext = PyXtractSharedExtension("Orange.orange", orange_sources,
include_dirs=orange_include_dirs,
extra_compile_args = extra_compile_args + ["-DORANGE_EXPORTS"],
extra_link_args = extra_link_args,
Expand Down Expand Up @@ -452,28 +452,29 @@ def get_source_files(path, ext="cpp", exclude=[]):
orangeom_include_dirs += ["source/orangeom"]


orangeom_ext = PyXtractExtension("orangeom", orangeom_sources,
orangeom_ext = PyXtractExtension("Orange.orangeom", orangeom_sources,
include_dirs=orangeom_include_dirs + ["source/orange/"],
extra_compile_args = extra_compile_args + ["-DORANGEOM_EXPORTS"],
extra_link_args = extra_link_args,
libraries=orangeom_libraries,
)

orangene_ext = PyXtractExtension("orangene", get_source_files("source/orangene/", exclude=["lib_vectors.cpp"]),
orangene_ext = PyXtractExtension("Orange.orangene",
get_source_files("source/orangene/", exclude=["lib_vectors.cpp"]),
include_dirs=include_dirs + ["source/orange/"],
extra_compile_args = extra_compile_args + ["-DORANGENE_EXPORTS"],
extra_link_args = extra_link_args,
libraries=shared_libs,
)

corn_ext = Extension("corn", get_source_files("source/corn/"),
corn_ext = Extension("Orange.corn", get_source_files("source/corn/"),
include_dirs=include_dirs + ["source/orange/"],
extra_compile_args = extra_compile_args + ["-DCORN_EXPORTS"],
extra_link_args = extra_link_args,
libraries=libraries
)

statc_ext = Extension("statc", get_source_files("source/statc/"),
statc_ext = Extension("Orange.statc", get_source_files("source/statc/"),
include_dirs=include_dirs + ["source/orange/"],
extra_compile_args = extra_compile_args + ["-DSTATC_EXPORTS"],
extra_link_args = extra_link_args,
Expand All @@ -482,12 +483,11 @@ def get_source_files(path, ext="cpp", exclude=[]):

import fnmatch
matches = []
os.chdir("orange")
for root, dirnames, filenames in os.walk('Orange'): #Recursively find '__init__.py's
for root, dirnames, filenames in os.walk('Orange'): #Recursively find
# '__init__.py's
for filename in fnmatch.filter(filenames, '__init__.py'):
matches.append(os.path.join(root, filename))
packages = [os.path.dirname(pkg).replace(os.path.sep, '.') for pkg in matches]
os.chdir("..")

if have_setuptools:
setuptools_args = {"zip_safe": False,
Expand All @@ -505,37 +505,44 @@ def get_source_files(path, ext="cpp", exclude=[]):
author_email = "orange@fri.uni-lj.si",
url = "http://orange.biolab.si",
download_url = "http://orange.biolab.si/svn/orange/trunk",
packages = packages + ["",
"OrangeCanvas",
"OrangeWidgets",
"OrangeWidgets.Associate",
"OrangeWidgets.Classify",
"OrangeWidgets.Data",
"OrangeWidgets.Evaluate",
"OrangeWidgets.Prototypes",
"OrangeWidgets.Regression",
"OrangeWidgets.Unsupervised",
"OrangeWidgets.Visualize",
"OrangeWidgets.Visualize Qt",
"OrangeWidgets.plot",
"OrangeWidgets.plot.primitives",
"doc",
packages = packages + ["Orange.OrangeCanvas",
"Orange.OrangeWidgets",
"Orange.OrangeWidgets.Associate",
"Orange.OrangeWidgets.Classify",
"Orange.OrangeWidgets.Data",
"Orange.OrangeWidgets.Evaluate",
"Orange.OrangeWidgets.Prototypes",
"Orange.OrangeWidgets.Regression",
"Orange.OrangeWidgets.Unsupervised",
"Orange.OrangeWidgets.Visualize",
"Orange.OrangeWidgets.Visualize Qt",
"Orange.OrangeWidgets.plot",
"Orange.OrangeWidgets.plot.primitives",
"Orange.doc",
],
package_dir = {"": "orange"},
package_data = {"OrangeCanvas": ["icons/*.png", "orngCanvas.pyw", "WidgetTabs.txt"],
"OrangeWidgets": ["icons/*.png", "icons/backgrounds/*.png", "report/index.html"],
"OrangeWidgets.Associate": ["icons/*.png"],
"OrangeWidgets.Classify": ["icons/*.png"],
"OrangeWidgets.Data": ["icons/*.png"],
"OrangeWidgets.Evaluate": ["icons/*.png"],
"OrangeWidgets.Prototypes": ["icons/*.png"],
"OrangeWidgets.Regression": ["icons/*.png"],
"OrangeWidgets.Unsupervised": ["icons/*.png"],
"OrangeWidgets.Visualize": ["icons/*.png"],
"OrangeWidgets.plot": ["*.gs", "*.vs"],
"OrangeWidgets.plot.primitives": ["*.obj"],
"doc": ["datasets/*.tab", ],
"": ["orangerc.cfg"]
package_dir = {"Orange": "Orange"},
package_data = {"Orange": [
"Orange/Orange/OrangeCanvas/icons/*.png",
"Orange/OrangeCanvas/orngCanvas.pyw",
"Orange/OrangeCanvas/WidgetTabs.txt",
"Orange/OrangeWidgets/icons/*.png",
"Orange/OrangeWidgets/icons/backgrounds/*.png",
"Orange/OrangeWidgets/report/index.html",
"Orange/OrangeWidgets/Associate/icons/*.png",
"Orange/OrangeWidgets/Classify/icons/*.png",
"Orange/OrangeWidgets/Data/icons/*.png",
"Orange/OrangeWidgets/Evaluate/icons/*.png",
"Orange/OrangeWidgets/Prototypes/icons/*.png",
"Orange/OrangeWidgets/Regression/icons/*.png",
"Orange/OrangeWidgets/Unsupervised/icons/*.png",
"Orange/OrangeWidgets/Visualize/icons/*.png",
"Orange/OrangeWidgets/Visualize/icons/*.png",
"Orange/OrangeWidgets/Visualize/icons/*.png",
"Orange/OrangeWidgets/plot/*.gs",
"Orange/OrangeWidgets/plot/*.vs",
"Orange/OrangeWidgets/plot/primitives/*.obj",
"Orange/doc/datasets/*.tab",
"Orange/orangerc.cfg"]
},
ext_modules = [include_ext, orange_ext, orangeom_ext, orangene_ext, corn_ext, statc_ext],
extra_path=("orange", "orange"),
Expand Down

0 comments on commit 098ee22

Please sign in to comment.