* setup.py, manifest.in : bug fix under linux

      -- BeNours

diff --git a/ChangeLog b/ChangeLog
index eae0cf63fa97389485285716628b8dc4f1023d18..33eb0877d371097309d41b2d63bf73af1249cc67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-05-22  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
+      * setup.py, manifest.in : bug fix under linux
+
 2003-05-22  Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
       * Modification of setup.py to compile vtk part too. Then, we have 2
         wrappers which must work with same distutils. For that, we have a

diff --git a/MANIFEST.in b/MANIFEST.in
index 9865aca3404801630a5b92b469a48a320327ce52..17845e136261a47cc44bd16cf74d4b0d8eb83395 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,5 @@ include *.py
 recursive-include src *.h
 recursive-include vtk *.h
 recursive-include Dicts *.dic
-recursive-include Data *.*
+recursive-include Test *.*
+include MANIFEST.in

diff --git a/setup.py b/setup.py
index b1f59235ab8dcdbdcb6ef49f385743db015f988b..b5fdadae53675d4ac9affb83b1dbcaec8a9124ea 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@ if(os.name=='posix'):
        libraries=["stdc++"]
        macros   =[('__STDC_LIMIT_MACROS', '1')]
 
-       VTK_PATH="/usr"
+       VTK_PATH="/usr/local"
        vtkWrapper="vtkWrapPython"
 else:
        targetDir=os.path.join('lib','site-packages')
@@ -39,7 +39,7 @@ targetDir=os.path.join(targetDir, ThisModule)
 # For the Swig compilation
 Sources = []
 Sources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
-Sources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.h")))
+#Sources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.h")))
 Sources.append(os.path.join(gdcmPythonSrcDir,"gdcm.i"))
 
 # For the VTK compilation
@@ -49,7 +49,7 @@ VTK_LIB_DIR=os.path.join(VTK_PATH,"lib","vtk")
 vtkSources = []
 vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.cxx")))
 vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
-# vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.h")))
+#vtkSources.extend(glob.glob(os.path.join(gdcmvtkSrcDir,"vtk*.h")))
 
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
@@ -61,7 +61,8 @@ setup(name=ThisModule,
       author="frog",
       author_email="frog@creatis.insa-lyon.fr",
       url="http://www.creatis.insa-lyon.fr/",
-      packages=[ gdcmPythonSrcDir,
+      packages=[ '.',
+                 gdcmPythonSrcDir,
                  gdcmPythonSrcDir + '.demo' ],
       cmdclass={'build_ext':build_extWrap}, # redirects default build_ext
       ext_modules=[SwigExtension(name='_gdcm',
@@ -74,7 +75,8 @@ setup(name=ThisModule,
                                 ),
                    VTKExtension(name='gdcmPython.vtkgdcmPython',
                                 sources=vtkSources,
-                                include_dirs=[gdcmSrcDir,gdcmvtkSrcDir,VTK_INCLUDE_DIR],
+                                include_dirs=[gdcmSrcDir,gdcmvtkSrcDir,
+                                              VTK_INCLUDE_DIR],
                                 libraries=libraries+vtkLibraries,
                                 define_macros=macros,
                                 library_dirs=[VTK_LIB_DIR],