* Final changes for tagging and packaging

     -- BeNours

diff --git a/DEVELOPPER b/DEVELOPPER
index dfcfe0334d8d0b337cdb584374884981fcacb170..8df07c5f0948215e219453a8b3301e32634c626c 100644 (file)
--- a/DEVELOPPER
+++ b/DEVELOPPER
@@ -25,6 +25,7 @@ The following comments are intended for core gdcm developpers.
        gdcmHeader = gdcm.gdcmHeader
        gdcmDictSet = gdcm.gdcmDictSet
        gdcmFile = gdcm.gdcmFile
+       [etc.]
     Hence this whole Swig wrapping process is quite odd since we shall
     wrap more classes (%include in swig.i) that eventually get exported to
     the final user by gdcmPython/__init__.py.

diff --git a/PACKAGER b/PACKAGER
index 1644da26194f0b7b0a135b7f56404bb0249e1efb..7a8d88da775953c1d80980273d47ec2f3cb846c9 100644 (file)
--- a/PACKAGER
+++ b/PACKAGER
@@ -90,7 +90,7 @@ Here is the checklist when freezing a version of gdcm:
        - Binary distribution:
          cd $(GDCMHOME)
          python setup.py bdist --formats=wininst
-         install $(GDCMHOME)\dist\gdcmPython-0.3.win32-py2.2.exe
+         install $(GDCMHOME)\dist\gdcmPython-xxx.win32-py2.2.exe
          cd $(PYTHONHOME)\Lib\site-packages\
          Check out gdcmData
          cd gdcmPython
@@ -101,7 +101,7 @@ Here is the checklist when freezing a version of gdcm:
          source distro):
          cd $(GDCMHOME)
          python setup.py sdist --formats=zip
-         unzip $(GDCMHOME)\dist\gdcmPython-0.3.zip in TMPHOME directory
+         unzip $(GDCMHOME)\dist\gdcmPython-xxx.zip in TMPHOME directory
          cd $(TMPHOME)
          cd gdcmPython-*/
          python setup.py bdist --formats=wininst

diff --git a/gdcmVersion.py b/gdcmVersion.py
index f82cbc8043628c47af165c8e613a76b669ccea1d..e58269d5159c5094682736dde65f5635efced68b 100644 (file)
--- a/gdcmVersion.py
+++ b/gdcmVersion.py
@@ -1,2 +1,2 @@
-gdcmVERSION="0.3.1"
+gdcmVERSION="0.4"
 

diff --git a/setup.py b/setup.py
index 65a5396024c0bd1d66d9fe864fd52759007ce90d..ebeef96af03a658d9e44d752942b848b3cb66acd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -88,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",
@@ -126,9 +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"))),
                 ]
      )