Changeset 7587:1a28b98c4fe3

Timestamp:

11/10/07 06:06:09 (6 years ago)

Author:

Burcin Erocal <burcin@…>

Branch:

default

Parents:

7329:31a18043fb4d (diff), 7586:a58a162809aa (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 with 2.8.12.

Files:

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

setup.py

@@ -862 +862 @@
               ), \
 
+    Extension('sage.rings.polynomial.polybori',
+              sources = ['sage/rings/polynomial/polybori.pyx'],
+              libraries=['polybori','pboriCudd','groebner'],
+              include_dirs=[SAGE_ROOT+'/local/include/cudd',
+                            SAGE_ROOT+'/local/include/polybori',
+                            SAGE_ROOT+'/local/include/polybori/groebner'],
+              language = 'c++'), \
                             
     ]

setup.py

@@ -3 +3 @@
 
 import distutils.sysconfig, os, sys
-from distutils.core import setup, Extension
+# from distutils.core import setup, Extension
+
+# TODO: Is this what we want here?
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+
 
 
@@ -161 +167 @@
                  language='c++')
 
+ntl_GF2 = Extension('sage.libs.ntl.ntl_GF2',
+                 sources = ["sage/libs/ntl/ntl_GF2.pyx"],
+                 libraries = ["csage", "ntl", "stdc++"],
+                 language='c++')
+
 ntl_GF2X = Extension('sage.libs.ntl.ntl_GF2X',
                  sources = ["sage/libs/ntl/ntl_GF2X.pyx"],
+                 libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"],
+                 language='c++')
+
+ntl_GF2EContext = Extension('sage.libs.ntl.ntl_GF2EContext',
+                 sources = ["sage/libs/ntl/ntl_GF2EContext.pyx"],
                  libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"],
                  language='c++')
@@ -197 +213 @@
 
 
-givaro_gfq = Extension('sage.rings.finite_field_givaro',
+finite_field_givaro = Extension('sage.rings.finite_field_givaro',
                        sources = ["sage/rings/finite_field_givaro.pyx"],
                        libraries = ['givaro', 'gmpxx', 'gmp', 'm', 'stdc++', ],   # this order is needed to compile under windows.
                        language='c++'
                        )
-
+finite_field_ntl_gf2e = Extension('sage.rings.finite_field_ntl_gf2e',
+                         sources = ['sage/rings/finite_field_ntl_gf2e.pyx'],
+                         libraries = ['ntl', 'gmp'],
+                         language = 'c++')
 
 qd = Extension('sage.rings.real_rqdf',
@@ -257 +276 @@
                         language="c++",
                         include_dirs=[SAGE_ROOT +'/local/include/singular']
+                        )
+
+fplll = Extension('sage.libs.fplll.fplll',
+                        sources = ['sage/libs/fplll/fplll.pyx'],
+                        libraries = ['gmp', 'mpfr', 'stdc++', 'fplll'],
+                        language="c++",
+                        include_dirs=[SAGE_ROOT +'/local/include/fplll']
                         )
 
@@ -439 +465 @@
     ntl_lzz_p,
     ntl_lzz_pX,
+    ntl_GF2,
     ntl_GF2X,
+    ntl_GF2EContext,
     ntl_GF2E,
     ntl_GF2EX,
@@ -480 +508 @@
      matrix_mpolynomial_dense, \
 
-     givaro_gfq, \
+     finite_field_givaro, \
+     finite_field_ntl_gf2e, \
 
      libsingular, \
+
+     fplll, \
 
 ##     matrix_rational_sparse,
@@ -554 +585 @@
               sources = ['sage/rings/ring.pyx']), \
 
+    Extension('sage.rings.polynomial.cyclotomic',
+              sources = ['sage/rings/polynomial/cyclotomic.pyx']
+              ), \
+
     Extension('sage.rings.polynomial.multi_polynomial',
               sources = ['sage/rings/polynomial/multi_polynomial.pyx']
@@ -622 +657 @@
     Extension('sage.rings.padics.pow_computer',
               sources = ['sage/rings/padics/pow_computer.pyx'],
-              libraries=['gmp']),
+              libraries = ["csage", "ntl", "gmp", "gmpxx", "m", "stdc++"],
+              language='c++'),
     Extension('sage.rings.padics.local_generic_element',
               sources = ['sage/rings/padics/local_generic_element.pyx']),
@@ -1068 +1104 @@
 
                      'sage.libs',
+                     'sage.libs.fplll',
                      'sage.libs.hanke',
                      'sage.libs.linbox',
@@ -1147 +1184 @@
                      'sage.dsage.misc',
                      'sage.dsage.misc.tests',
-                     'sage.dsage.scripts'
+                     'sage.dsage.web',
+                     'sage.dsage.scripts',
                      ],
       
@@ -1154 +1192 @@
                  'sage/dsage/scripts/dsage_setup.py'
                 ],
+
+      data_files = [('dsage/web/static',                       
+                     ['sage/dsage/web/static/dsage_web.css',
+                      'sage/dsage/web/static/dsage_web.js',
+                      'sage/dsage/web/static/jquery-latest.js',
+                      'sage/dsage/web/static/jquery.tablesorter.pack.js',
+                      'sage/dsage/web/static/index.html'])],
       
       ext_modules = ext_modules,