Changeset 1018 for trunk/lang/python

Timestamp:

Jun 8, 2008, 6:24:34 PM (16 years ago)

Author:

gah

Message:

Massive changes: New directory/file layout

Location:

trunk/lang

Files:

• . (added)
• python (moved) (moved from trunk/python)
• python/Makefile.in (added)
• python/setup.py.in (modified) (3 diffs)

trunk/lang/python/setup.py.in

@@ -2 +2 @@
 
 rp_install_dir = '@prefix@'
+tmpdir = 'build/tmp/'
+srcdir = '@srcdir@/Rappture/'
+incdir = '@prefix@/include'
+libdir = '@prefix@/lib'
 
 library_module = Extension('Rappture.library',
-                   include_dirs = [rp_install_dir+'/include', '../include'],
-                   sources = [ 'Rappture/PyRpLibrary.cc' ],
-                   library_dirs = [ rp_install_dir+'/lib', '../src' ],
-                   libraries = [ 'rappture' ] )
+                           include_dirs = [incdir, '../include'],
+                           sources = [ tmpdir+'PyRpLibrary.cc' ],
+                           library_dirs = [ libdir, '../src' ],
+                           libraries = [ 'rappture' ] )
 
 units_module = Extension('Rappture.Units',
-                   include_dirs = [rp_install_dir+'/include', '../include'],
-                   sources = [ 'Rappture/PyRpUnits.cc' ],
-                   library_dirs = [ rp_install_dir+'/lib', '../src' ],
-                   libraries = [ 'rappture' ] )
+                         include_dirs = [incdir, '../include'],
+                         sources = [ tmpdir+'PyRpUnits.cc' ],
+                         library_dirs = [ libdir, '../src' ],
+                         libraries = [ 'rappture' ] )
 
 utils_module = Extension('Rappture.Utils',
-                   include_dirs = [rp_install_dir+'/include', '../include'],
-                   sources = [ 'Rappture/PyRpUtils.cc' ],
-                   library_dirs = [ rp_install_dir+'/lib', '../src' ],
-                   libraries = [ 'rappture' ] )
+                         include_dirs = [ incdir, '../include'],
+                         sources = [ tmpdir+'PyRpUtils.cc' ],
+                         library_dirs = [ libdir, '../src' ],
+                         libraries = [ 'rappture' ] )
 
 encode_module = Extension('Rappture.encoding',
-                   include_dirs = [rp_install_dir+'/include', '../include'],
-                   sources = [ 'Rappture/PyRpEncode.cc' ],
-                   library_dirs = [ rp_install_dir+'/lib', '../src' ],
-                   libraries = [ 'rappture' ] )
+                          include_dirs = [ incdir, '../include'],
+                          sources = [ tmpdir+'PyRpEncode.cc' ],
+                          library_dirs = [ libdir, '../src' ],
+                          libraries = [ 'rappture' ] )
 
 setup(  name='Rappture',
@@ -31 +35 @@
         description='Rapid Application Infrastructure library for nanoHUB.org',
         url='http://www.nanohub.org/',
+        package_dir={ 'Rappture' : srcdir },
         py_modules=[ 'Rappture.interface',
                      'Rappture.number',
@@ -37 +42 @@
                      'Rappture.tools',
                      'Rappture.result'],
-        ext_modules=[   encode_module,
-                        library_module,
-                        units_module,
-                        utils_module    ]
+        ext_modules=[ encode_module,
+                      library_module,
+                      units_module,
+                      utils_module ]
   )