X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=setup.py;h=ebeef96af03a658d9e44d752942b848b3cb66acd;hb=c8d390d6a732aa48eeb9d831ea83f4bebc8e19f8;hp=669bd6fe2849b3a031684e26c51c0f38b0ef018b;hpb=028c1cf98c1af5130c2b23198a50f5c351a00295;p=gdcm.git

diff --git a/setup.py b/setup.py
index 669bd6fe..ebeef96a 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import glob, os, sys, shutil
 from distutilsWrapping import *
 from WrapSwig import *
 from WrapVTK import *
-from gdcmPython.gdcmVersion import *
+from gdcmVersion import *
 
 ThisModule='gdcmPython'
 gdcmPythonSrcDir=ThisModule
@@ -63,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.
@@ -87,7 +88,10 @@ vtkSources.extend(glob.glob(os.path.join(gdcmSrcDir,"*.cxx")))
 vtkSources.extend(Jpeg8Sources)
 vtkSources.extend(Jpeg12Sources)
 vtkSources.extend(JpgSources)
-vtkSources.remove(os.path.join(gdcmvtkSrcDir,"vtkgdcmViewer.cxx"))
+try:
+	vtkSources.remove(os.path.join(gdcmvtkSrcDir,"vtkgdcmViewer.cxx"))
+except:
+	pass
 
 vtkLibraries=["vtkCommon","vtkCommonPython",
               "vtkIO","vtkIOPython",
@@ -125,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"))),
                 ]
      )