Changeset 3008:32ee9700184c

Timestamp:

02/17/07 21:15:50 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Parents:

2973:e654ceb7cff1 (diff), 3007:39fbf163cc50 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge

Files:

• setup.py (modified) (1 diff)
• setup.py (modified) (8 diffs)

setup.py

@@ -500 +500 @@
     Extension('sage.combinat.expnums',
               ['sage/combinat/expnums.pyx'],
+              libraries = ['gmp']
+              ), \
+                            
+    Extension('sage.graphs.graph_fast',
+              ['sage/graphs/graph_fast.pyx'],
               libraries = ['gmp']
               ), \

setup.py

@@ -13 +13 @@
      os.path.exists('/usr/lib/libcblas.so'):
     CBLAS='cblas'
-elif os.path.exists('/usr/lib/libblas.dll.a'):   # untested.
+elif os.path.exists('/usr/lib/libblas.dll.a'):   
     CBLAS='blas'
 else:
@@ -172 +172 @@
                                  libraries = ['gmp'])
 
-linbox = Extension('sage.matrix.linbox',
-                   ['sage/matrix/linbox.pyx',
-                    'sage/matrix/matrix_modn_dense_linbox.cpp'],
-                   libraries = ['linbox', 'ntl', 'gmp', 'gmpxx', 'stdc++', 'givaro', CBLAS])
+linbox = Extension('sage.libs.linbox.linbox',
+                   ['sage/libs/linbox/linbox.pyx',
+                    'sage/libs/linbox/linbox_wrap.cpp'],
+                   libraries = ['linbox', 'ntl', 'gmp', 'gmpxx', 'stdc++', 'givaro', CBLAS],
+                   language = 'c++')
 
 matrix_modn_dense = Extension('sage.matrix.matrix_modn_dense',
@@ -191 +192 @@
 
 matrix_rational_dense = Extension('sage.matrix.matrix_rational_dense',
-                                  ['sage/matrix/matrix_rational_dense.pyx',
-                                   'sage/matrix/matrix_rational_dense_linbox.cpp'],
-                                 libraries = ['linbox', 'ntl', 'gmp', 'gmpxx', 'stdc++', 'givaro', CBLAS])
+                                  ['sage/matrix/matrix_rational_dense.pyx'],
+                                 libraries = ['gmp'])
 
 matrix_integer_dense = Extension('sage.matrix.matrix_integer_dense',
-                                 ['sage/matrix/matrix_integer_dense.pyx',
-                                  'sage/matrix/matrix_integer_dense_linbox.cpp'],
-                                  libraries = ['linbox', 'ntl', 'gmp', 'gmpxx', 'stdc++', 'givaro', CBLAS])
+                                 ['sage/matrix/matrix_integer_dense.pyx'],
+                                  libraries = ['gmp'])
 
 matrix_real_double_dense=Extension('sage.matrix.matrix_real_double_dense',
@@ -266 +265 @@
 gsl_array = Extension('sage.gsl.gsl_array',['sage/gsl/gsl_array.pyx'],
                 libraries=['gsl',CBLAS],define_macros=[('GSL_DISABLE_DEPRECATED','1')])
+
 gsl_ode = Extension('sage.gsl.ode',['sage/gsl/ode.pyx'],libraries=['gsl',CBLAS],
                 define_macros=[('GSL_DISABLE_DEPRECATED','1')])
@@ -273 +273 @@
                  libraries=['gsl',CBLAS],
                  define_macros=[('GSL_DISABLE_DEPRECATED','1')])
+
+
+sagex_ds = Extension('sage.misc.sagex_ds', ['sage/misc/sagex_ds.pyx'])
 
 
@@ -342 +345 @@
 
     complex_number,
+
+    sagex_ds,
 
     Extension('sage.ext.sig',
@@ -777 +782 @@
                      'sage.libs',
                      'sage.libs.hanke',
+                     'sage.libs.linbox',
                      'sage.libs.mwrank',
                      'sage.libs.ntl',
@@ -828 +834 @@
                      
                      'sage.structure',
-                     'sage.dsage'
+                     
+                     'sage.dsage',
+                     'sage.dsage.database',
+                     'sage.dsage.database.tests',
+                     'sage.dsage.server',
+                     'sage.dsage.errors',
+                     'sage.dsage.tests',
+                     'sage.dsage.twisted',
+                     'sage.dsage.twisted.tests',
+                     'sage.dsage.dist_functions',
+                     'sage.dsage.misc',
+                     'sage.dsage.interface',
+                     'sage.dsage.scripts'
                      ],
+      
+      scripts = ['sage/dsage/scripts/dsage_server.py',
+                 'sage/dsage/scripts/dsage_worker.py',
+                 'sage/dsage/scripts/dsage_setup.py',
+                ],
       
       ext_modules = ext_modules,