X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=setup.py;h=ebeef96af03a658d9e44d752942b848b3cb66acd;hb=0e82725d64f17545e782c18039ced7ea898f8cad;hp=d35a7143df9a162aeb993727b38e62ff09cf21b1;hpb=79f126d06fd384c26dd0fb7f4db6268ad9fe4458;p=gdcm.git

diff --git a/setup.py b/setup.py
index d35a7143..ebeef96a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@ import glob, os, sys, shutil
 from distutilsWrapping import *
 from WrapSwig import *
 from WrapVTK import *
+from gdcmVersion import *
 
 ThisModule='gdcmPython'
 gdcmPythonSrcDir=ThisModule
@@ -62,7 +63,8 @@ for Remove in Jpeg8SourcesToRemove:
 Sources.extend(Jpeg8Sources)
 
 Jpeg12Sources = glob.glob(os.path.join(gdcmJpeg12SrcDir,"j*.c"))
-Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 'jmemmac12.c']
+Jpeg12SourcesToRemove = ['jmemansi12.c', 'jmemname12.c', 'jmemdos12.c', 
+                         'jmemmac12.c']
 for Remove in Jpeg12SourcesToRemove:
    ### Because setup.py is a multiple pass process we need to trap
    ### the case where the files were allready wed out on a previous pass.
@@ -86,6 +88,10 @@ vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
 vtkSources.extend(Jpeg8Sources)
 vtkSources.extend(Jpeg12Sources)
 vtkSources.extend(JpgSources)
+try:
+	vtkSources.remove(os.path.join(gdcmvtkSrcDir,"vtkgdcmViewer.cxx"))
+except:
+	pass
 
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
@@ -93,7 +99,7 @@ vtkLibraries=["vtkCommon","vtkCommonPython",
 
 ##### 
 setup(name=ThisModule,
-      version="0.3",
+      version=gdcmVERSION,
       description="...",
       author="frog",
       author_email="frog@creatis.insa-lyon.fr",
@@ -105,8 +111,7 @@ setup(name=ThisModule,
       ext_modules=[SwigExtension(name='_gdcm',
                                  sources=Sources,
                                  include_dirs=[gdcmSrcDir,gdcmJpeg8SrcDir,
-                                               gdcmSrcDir,gdcmJpeg12SrcDir,
-					       gdcmSrcDir,gdcmJpgSrcDir],
+                                               gdcmJpeg12SrcDir,gdcmJpgSrcDir],
                                  libraries=libraries,
                                  define_macros=macros,
                                  swig_cpp=1,
@@ -124,7 +129,13 @@ setup(name=ThisModule,
 						],
       data_files=[(os.path.join(targetDir,gdcmTestDir),
                    glob.glob(os.path.join(gdcmTestDir,"*.acr"))),
+                  (targetDir,
+                   glob.glob(os.path.join(gdcmSrcDir,"*.py"))),
                   (os.path.join(targetDir,"Dicts"),
                    glob.glob(os.path.join(gdcmDictsDir,"*.*"))),
+                  (targetDir,
+                   glob.glob(os.path.join(gdcmSrcDir,"..","gdcmVersion.py"))),
+                  (os.path.join(targetDir,".."),
+                   glob.glob(os.path.join(gdcmSrcDir,"..","gdcmVersion.py"))),
                 ]
      )