[reportlab-users] reportlab-setup patch

Dirk Datzert reportlab-users@reportlab.com
Wed, 18 Dec 2002 23:28:49 +0100


Dies ist eine mehrteilige Nachricht im MIME-Format.
--------------1F8E71C9EFB9E40A7342DF11
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi all,

here is my last patch for setup.py. I could build RPMs without any
problems.
Hope that it'll work on all plattforms, but I could only test on SLES.

Regards,
Dirk
--------------1F8E71C9EFB9E40A7342DF11
Content-Type: text/plain; charset=us-ascii;
 name="reportlab-setup.patch4"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="reportlab-setup.patch4"

diff -uNr reportlab/MANIFEST.in reportlab-1.17/MANIFEST.in
--- reportlab/MANIFEST.in	Thu Jan  1 01:00:00 1970
+++ reportlab-1.17/MANIFEST.in	Sat Dec 14 21:38:10 2002
@@ -0,0 +1,5 @@
+recursive-include fonts *
+recursive-include docs *
+recursive-include lib *.c *.h *.in hyphen.mashed
+recursive-include test *.gif
+include changes license.txt README
diff -uNr reportlab/setup.py reportlab-1.17/setup.py
--- reportlab/setup.py	Sun Dec 15 10:21:39 2002
+++ reportlab-1.17/setup.py	Sun Dec 15 10:20:06 2002
@@ -4,28 +4,55 @@
 
 from distutils.core import setup, Extension
 
+import os, sys, distutils
+
+# from Zope - App.Common.package_home
+
+def package_home(globals_dict):
+    __name__=globals_dict['__name__']
+    m=sys.modules[__name__]
+    r=os.path.split(m.__path__[0])[0]
+    return r
+
+pjoin = os.path.join
+
+package_path = pjoin(package_home(distutils.__dict__), 'site-packages', 'reportlab')
+
+
 # why oh why don't most setup scripts have a script handler?
 # if you don't have one, you can't edit in Pythonwin
 def run():
     LIBS = []
     setup(
             name="Reportlab",
-            version="1.15.3",
+            version="1.17",
+            licence="BSD license, Copyright (c) 2000-2003, ReportLab Inc.",
             description="Reportlab PDF generation tools",
+            long_description="""The ReportLab PDF Generation tools.
+An Open Source Python library for generating PDFs.
+
+This installer created using distutils by John Precedo.
+""",
+
             author="The boys from SW19",
             author_email="info@reportlab.com",
             url="http://www.reportlab.com/",
 
-            package_dir = {'': '..'},
+            package_dir = {'reportlab': '.'},
 
             packages=[ # include anything with an __init__
                     'reportlab',
+                    'reportlab.demos',
+                    'reportlab.demos.colors',
+                    'reportlab.demos.gadflypaper',
+                    'reportlab.demos.odyssey',
+                    'reportlab.demos.rlzope',
+                    'reportlab.demos.stdfonts',
+                    'reportlab.demos.tests',
                     'reportlab.docs',
                     'reportlab.docs.graphguide',
-                    'reportlab.docs.images',
                     'reportlab.docs.reference',
                     'reportlab.docs.userguide',
-                    'reportlab.fonts',
                     'reportlab.graphics',
                     'reportlab.graphics.charts',
                     'reportlab.graphics.widgets',
@@ -33,37 +60,54 @@
                     'reportlab.pdfbase',
                     'reportlab.pdfgen',
                     'reportlab.platypus',
-                      ],
-              data_files = [('docs/images', ['docs/images/Edit_Prefs.gif',
-                                                 'docs/images/Python_21.gif',
-                                                 'docs/images/Python_21_HINT.gif',
-                                                 'docs/images/fileExchange.gif',
-                                                 'docs/images/jpn.gif',
-                                                 'docs/images/jpnchars.jpg',
-                                                 'docs/images/lj8100.jpg',
-                                                 'docs/images/replogo.a85',
-                                                 'docs/images/replogo.gif']),
-                    ('fonts', ['fonts/LeERC___.AFM',
-                                     'fonts/LeERC___.PFB',
-                                     'fonts/luxiserif.ttf',
-                                     'fonts/rina.ttf']
-                     )],
+                    'reportlab.test',
+                    'reportlab.tools',
+                    'reportlab.tools.docco',
+                    'reportlab.tools.py2pdf',
+                    'reportlab.tools.pythonpoint',
+                    'reportlab.tools.pythonpoint.demos',
+                    'reportlab.tools.pythonpoint.styles',
+                     ],
+              data_files = [(pjoin(package_path, 'docs', 'images'),
+				['docs/images/Edit_Prefs.gif',
+                                 'docs/images/Python_21.gif',
+                                 'docs/images/Python_21_HINT.gif',
+                                 'docs/images/fileExchange.gif',
+                                 'docs/images/jpn.gif',
+                                 'docs/images/jpnchars.jpg',
+                                 'docs/images/lj8100.jpg',
+                                 'docs/images/replogo.a85',
+                                 'docs/images/replogo.gif']),
+			    (pjoin(package_path, 'fonts'), 
+				['fonts/LeERC___.AFM',
+                                 'fonts/LeERC___.PFB',
+                                 'fonts/luxiserif.ttf',
+                                 'fonts/rina.ttf']),
+			    (package_path,
+				['README',
+				 'changes',
+				 'license.txt']),
+			    (pjoin(package_path, 'test'),
+				['test/pythonpowered.gif',]),
+			    (pjoin(package_path, 'lib'),
+				['lib/hyphen.mashed',]),
+			],
 
-            ext_modules =   [Extension( '_rl_accel',
+            ext_modules =   [Extension( 'reportlab/lib/_rl_accel',
                                         ['lib/_rl_accel.c'],
                                         include_dirs=[],
                                         define_macros=[],
                                         library_dirs=[],
                                         libraries=LIBS, # libraries to link against
                                         ),
-                            Extension(  'sgmlop',
+                             Extension( 'reportlab/lib/sgmlop',
                                         ['lib/sgmlop.c'],
                                         include_dirs=[],
                                         define_macros=[],
                                         library_dirs=[],
                                         libraries=LIBS, # libraries to link against
                                         ),
-                            Extension(  'pyHnj',
+                             Extension( 'reportlab/lib/pyHnj',
                                         ['lib/pyHnjmodule.c',
                                          'lib/hyphen.c',
                                          'lib/hnjalloc.c'],

--------------1F8E71C9EFB9E40A7342DF11--