From 667b8f403c14d47f060ca36ef604e20c708d06fd Mon Sep 17 00:00:00 2001 From: regrain Date: Fri, 6 Feb 2004 08:44:41 +0000 Subject: [PATCH] * Final changes for tagging and packaging -- BeNours --- DEVELOPPER | 1 + PACKAGER | 4 ++-- gdcmVersion.py | 2 +- setup.py | 9 ++++++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/DEVELOPPER b/DEVELOPPER index dfcfe033..8df07c5f 100644 --- 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 1644da26..7a8d88da 100644 --- 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 f82cbc80..e58269d5 100644 --- 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 65a53960..ebeef96a 100644 --- 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"))), ] ) -- 2.45.1