* FIX : src/gdcmDicomDir.cxx : make windows compilable

[gdcm.git] / setup.py

diff --git a/setup.py b/setup.py
index 66759c4ece10a13b1ebb3cc6098e70af169f270e..ebeef96af03a658d9e44d752942b848b3cb66acd 100644 (file)
--- 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,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",
@@ -94,7 +99,7 @@ vtkLibraries=["vtkCommon","vtkCommonPython",
 
 ##### 
 setup(name=ThisModule,
-      version="0.3",
+      version=gdcmVERSION,
       description="...",
       author="frog",
       author_email="frog@creatis.insa-lyon.fr",
@@ -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"))),
                 ]
      )