# HG changeset patch
# User Francois Bissey <francois.bissey@canterbury.ac.nz>
# Date 1305856872 43200
# Node ID 4a494081f153b93bb973b3ce97d5f8463055a152
# Parent ee672d4d5c0c98a4869635c88636f806cd52420e
#11377 scrubbing and putting some order in module_list.py. Not strictly necessary but nice.
diff git a/module_list.py b/module_list.py
a

b


14  14  sys.exit(1) 
15  15  else: 
16  16  SAGE_ROOT = os.environ['SAGE_ROOT'] 
17   SAGE_LOCAL = SAGE_ROOT + '/local/' 
18   SAGE_DEVEL = SAGE_ROOT + '/devel/' 
19   SAGE_INC = SAGE_LOCAL + 'include/' 
 17  SAGE_LOCAL = SAGE_ROOT + '/local' 
 18  SAGE_DEVEL = SAGE_ROOT + '/devel' 
 19  SAGE_INC = SAGE_LOCAL + '/include/' 
20  20  
21  21  
22  22  ######################################################### 
… 
… 

45  45  
46  46  
47  47  ######################################################### 
48   ### Debianrelated stuff 
49   ######################################################### 
50   
51   if os.environ.has_key('SAGE_DEBIAN'): 
52   debian_include_dirs=["/usr/include", 
53   "/usr/include/cudd", 
54   "/usr/include/eclib", 
55   "/usr/include/FLINT", 
56   "/usr/include/fplll", 
57   "/usr/include/givaro", 
58   "/usr/include/gmp++", 
59   "/usr/include/gsl", 
60   "/usr/include/linbox", 
61   "/usr/include/NTL", 
62   "/usr/include/numpy", 
63   "/usr/include/pari", 
64   "/usr/include/polybori", 
65   "/usr/include/polybori/groebner", 
66   "/usr/include/singular", 
67   "/usr/include/singular/singular", 
68   "/usr/include/symmetrica", 
69   "/usr/include/zn_poly"] 
70   include_dirs = include_dirs + debian_include_dirs 
71   else: 
72   debian_include_dirs=[] 
73   
74   ######################################################### 
75  48  ### Commonly used definitions 
76  49  ######################################################### 
77  50  
… 
… 

80  53  # timestamp of the numpy build. 
81  54  numpy_depends = [SAGE_LOCAL + '/lib/python/sitepackages/numpy/core/include/numpy/_numpyconfig.h'] 
82  55  
83   flint_depends = [SAGE_LOCAL + '/include/FLINT/flint.h'] 
84   singular_depends = [SAGE_LOCAL + '/include/libsingular.h'] 
85   ginac_depends = [SAGE_LOCAL + '/include/pynac/ginac.h'] 
 56  flint_depends = [SAGE_INC + 'FLINT/flint.h'] 
 57  singular_depends = [SAGE_INC + 'libsingular.h'] 
 58  ginac_depends = [SAGE_INC + 'pynac/ginac.h'] 
86  59  
87  60  ######################################################### 
88  61  ### PolyBoRi defines 
… 
… 

124  97  sources = ['sage/algebras/quatalg/quaternion_algebra_element.pyx'], 
125  98  language='c++', 
126  99  libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++", "ntl"], 
127   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 100  include_dirs = [SAGE_INC + 'FLINT/'], 
128  101  depends = flint_depends), 
129  102  
130  103  Extension('sage.algebras.quatalg.quaternion_algebra_cython', 
… 
… 

340  313  Extension('sage.graphs.matchpoly', 
341  314  sources = ['sage/graphs/matchpoly.pyx'], 
342  315  libraries = ['gmp', 'flint'], 
343   include_dirs = [SAGE_ROOT + '/local/include/FLINT/'], 
 316  include_dirs = [SAGE_INC + 'FLINT/'], 
344  317  extra_compile_args = ['std=c99'], 
345   depends = [SAGE_ROOT + "/local/include/FLINT/flint.h"]), 
 318  depends = flint_depends), 
346  319  
347  320  Extension('sage.graphs.planarity', 
348  321  sources = ['sage/graphs/planarity/graphColorVertices.c', 
… 
… 

527  500  Extension('sage.libs.ecl', 
528  501  sources = ["sage/libs/ecl.pyx"], 
529  502  libraries = ["ecl"], 
530   include_dirs = [SAGE_ROOT+'/local/include/ecl/'], 
531   depends = [SAGE_ROOT + '/local/include/ecl/ecl.h']), 
 503  include_dirs = [SAGE_INC + 'ecl/'], 
 504  depends = [SAGE_INC + 'ecl/ecl.h']), 
532  505  
533  506  Extension('sage.libs.flint.flint', 
534  507  sources = ["sage/libs/flint/flint.pyx"], 
535  508  libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"], 
536   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 509  include_dirs = [SAGE_INC + 'FLINT/'], 
537  510  extra_compile_args=["std=c99", "D_XPG6"], 
538  511  depends = flint_depends), 
539  512  
540  513  Extension('sage.libs.flint.fmpz_poly', 
541  514  sources = ["sage/libs/flint/fmpz_poly.pyx"], 
542  515  libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"], 
543   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 516  include_dirs = [SAGE_INC + 'FLINT/'], 
544  517  extra_compile_args=["std=c99", "D_XPG6"], 
545  518  depends = flint_depends), 
546  519  
… 
… 

548  521  sources = ['sage/libs/fplll/fplll.pyx'], 
549  522  libraries = ['gmp', 'mpfr', 'stdc++', 'fplll'], 
550  523  language="c++", 
551   include_dirs = [SAGE_ROOT +'/local/include/fplll'], 
552   depends = [SAGE_ROOT + "/local/include/fplll/fplll.h"]), 
 524  include_dirs = [SAGE_INC + 'fplll'], 
 525  depends = [SAGE_INC + "fplll/fplll.h"]), 
553  526  
554  527  Extension('sage.libs.linbox.linbox', 
555  528  sources = ['sage/libs/linbox/linbox.pyx'], 
… 
… 

564  537  sources = ['sage/libs/lcalc/lcalc_Lfunction.pyx'], 
565  538  libraries = ['m', 'ntl', 'mpfr', 'gmp', 'gmpxx', 
566  539  'Lfunction', 'stdc++'], 
567   include_dirs = [SAGE_ROOT + "/local/include/lcalc/"], 
 540  include_dirs = [SAGE_INC + "lcalc/"], 
568  541  extra_compile_args=["O3", "ffastmath"], 
569  542  language = 'c++'), 
570  543  
… 
… 

573  546  Extension('sage.libs.libecm', 
574  547  sources = ['sage/libs/libecm.pyx'], 
575  548  libraries = ['ecm', 'gmp'], 
576   depends = [SAGE_ROOT + "/local/include/ecm.h"]), 
 549  depends = [SAGE_INC + "ecm.h"]), 
577  550  
578  551  Extension('sage.libs.mwrank.mwrank', 
579  552  sources = ["sage/libs/mwrank/mwrank.pyx", 
… 
… 

598  571  sources = ['sage/libs/ppl.pyx', 'sage/libs/ppl_shim.cc'], 
599  572  libraries = ['ppl', 'gmpxx', 'gmp', 'm'], 
600  573  language="c++", 
601   depends = [SAGE_LOCAL + "/include/ppl.hh"]), 
 574  depends = [SAGE_INC + "ppl.hh"]), 
602  575  
603  576  Extension('sage.libs.ratpoints', 
604  577  sources = ["sage/libs/ratpoints.pyx"], 
605   depends = [SAGE_ROOT + '/local/include/ratpoints.h'], 
 578  depends = [SAGE_INC + 'ratpoints.h'], 
606  579  libraries = ["ratpoints", "gmp"]), 
607  580  
608  581  Extension('sage.libs.singular.singular', 
609  582  sources = ['sage/libs/singular/singular.pyx'], 
610  583  libraries = ['m', 'readline', 'singular', 'givaro', 'ntl', 'gmpxx', 'gmp'], 
611  584  language="c++", 
612   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 585  include_dirs = [SAGE_INC + 'singular'], 
613  586  depends = singular_depends), 
614  587  
615  588  Extension('sage.libs.singular.polynomial', 
616  589  sources = ['sage/libs/singular/polynomial.pyx'], 
617  590  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
618  591  language="c++", 
619   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 592  include_dirs = [SAGE_INC + 'singular'], 
620  593  depends = singular_depends), 
621  594  
622  595  Extension('sage.libs.singular.ring', 
623  596  sources = ['sage/libs/singular/ring.pyx'], 
624  597  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
625  598  language="c++", 
626   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 599  include_dirs = [SAGE_INC + 'singular'], 
627  600  depends = singular_depends), 
628  601  
629  602  Extension('sage.libs.singular.groebner_strategy', 
630  603  sources = ['sage/libs/singular/groebner_strategy.pyx'], 
631  604  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
632  605  language="c++", 
633   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 606  include_dirs = [SAGE_INC + 'singular'], 
634  607  depends = singular_depends), 
635  608  
636  609  Extension('sage.libs.singular.function', 
637  610  sources = ['sage/libs/singular/function.pyx'], 
638  611  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
639  612  language="c++", 
640   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 613  include_dirs = [SAGE_INC +'singular'], 
641  614  depends = singular_depends), 
642  615  
643  616  Extension('sage.libs.singular.option', 
644  617  sources = ['sage/libs/singular/option.pyx'], 
645  618  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
646  619  language="c++", 
647   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 620  include_dirs = [SAGE_INC + 'singular'], 
648  621  depends = singular_depends), 
649  622  
650  623  Extension('sage.libs.symmetrica.symmetrica', 
651  624  sources = ["sage/libs/symmetrica/%s"%s for s in ["symmetrica.pyx"]], 
652  625  include_dirs = ['/usr/include/malloc/'], 
653  626  libraries = ["symmetrica"], 
654   depends = [SAGE_ROOT + "/local/include/symmetrica/def.h"]), 
 627  depends = [SAGE_INC + "symmetrica/def.h"]), 
655  628  
656  629  Extension('sage.libs.mpmath.utils', 
657  630  sources = ["sage/libs/mpmath/utils.pyx"], 
… 
… 

898  871  Extension('sage.matrix.matrix_mod2_dense', 
899  872  sources = ['sage/matrix/matrix_mod2_dense.pyx'], 
900  873  libraries = ['gmp','m4ri', 'gd', 'png12', 'z'], 
901   depends = [SAGE_ROOT + "/local/include/png.h", SAGE_ROOT + "/local/include/m4ri/m4ri.h"]), 
 874  depends = [SAGE_INC + "png.h", SAGE_INC + "m4ri/m4ri.h"]), 
902  875  
903  876  Extension('sage.matrix.matrix_modn_dense', 
904  877  sources = ['sage/matrix/matrix_modn_dense.pyx'], 
… 
… 

912  885  sources = ['sage/matrix/matrix_mpolynomial_dense.pyx'], 
913  886  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
914  887  language="c++", 
915   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 888  include_dirs = [SAGE_INC + 'singular'], 
916  889  depends = singular_depends), 
917  890  
918  891  #Extension('sage.matrix.matrix_pid_dense', 
… 
… 

1039  1012  Extension('sage.modular.modform.eis_series_cython', 
1040  1013  sources = ['sage/modular/modform/eis_series_cython.pyx'], 
1041  1014  libraries = ["gmp", "flint"], 
1042   include_dirs = [SAGE_ROOT + '/local/include/FLINT/'], 
 1015  include_dirs = [SAGE_INC + 'FLINT/'], 
1043  1016  extra_compile_args = ['std=c99'], 
1044  1017  depends = flint_depends), 
1045  1018  
1046  1019  Extension('sage.modular.modsym.apply', 
1047  1020  sources = ['sage/modular/modsym/apply.pyx'], 
1048  1021  libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"], 
1049   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1022  include_dirs = [SAGE_INC + 'FLINT/'], 
1050  1023  extra_compile_args=["std=c99", "D_XPG6"], 
1051  1024  depends = flint_depends), 
1052  1025  
… 
… 

1056  1029  Extension('sage.modular.modsym.heilbronn', 
1057  1030  sources = ['sage/modular/modsym/heilbronn.pyx'], 
1058  1031  libraries = ["csage", "flint", "gmp", "gmpxx", "m", "stdc++"], 
1059   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1032  include_dirs = [SAGE_INC + 'FLINT/'], 
1060  1033  extra_compile_args=["std=c99", "D_XPG6"], 
1061  1034  depends = flint_depends), 
1062  1035  
… 
… 

1099  1072  Extension('sage.modules.vector_mod2_dense', 
1100  1073  sources = ['sage/modules/vector_mod2_dense.pyx'], 
1101  1074  libraries = ['gmp','m4ri', 'png12', 'gd'], 
1102   depends = [SAGE_ROOT + "/local/include/png.h", SAGE_ROOT + "/local/include/m4ri/m4ri.h"]), 
 1075  depends = [SAGE_INC + "png.h", SAGE_INC + "m4ri/m4ri.h"]), 
1103  1076  
1104  1077  Extension('sage.modules.vector_rational_dense', 
1105  1078  sources = ['sage/modules/vector_rational_dense.pyx'], 
… 
… 

1124  1097  
1125  1098  Extension("sage.numerical.mip", 
1126  1099  ["sage/numerical/mip.pyx"], 
1127   include_dirs=["local/include/"], 
1128   libraries=["csage","stdc++"]), 
 1100  include_dirs=[SAGE_INC], 
 1101  libraries=["csage","stdc++"]), 
1129  1102  
1130  1103  Extension("sage.numerical.backends.generic_backend", 
1131  1104  ["sage/numerical/backends/generic_backend.pyx"], 
1132   include_dirs = [SAGE_ROOT+"/local/include/", "sage/c_lib/include/"], 
 1105  include_dirs = [SAGE_INC, "sage/c_lib/include/"], 
1133  1106  libraries=["csage", "stdc++"]), 
1134  1107  
1135  1108  Extension("sage.numerical.backends.glpk_backend", 
1136  1109  ["sage/numerical/backends/glpk_backend.pyx"], 
1137   include_dirs = [SAGE_ROOT+"/local/include/", "sage/c_lib/include/"], 
 1110  include_dirs = [SAGE_INC, "sage/c_lib/include/"], 
1138  1111  language = 'c++', 
1139  1112  libraries=["csage", "stdc++", "glpk", "gmp", "z"]), 
1140  1113  
… 
… 

1247  1220  sources = ['sage/rings/fraction_field_FpT.pyx'], 
1248  1221  libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"], 
1249  1222  extra_compile_args=["std=c99", "D_XPG6"], 
1250   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1223  include_dirs = [SAGE_INC + 'FLINT/'], 
1251  1224  depends = flint_depends), 
1252  1225  
1253  1226  Extension('sage.rings.laurent_series_ring_element', 
… 
… 

1449  1422  sources = ['sage/rings/polynomial/multi_polynomial_ideal_libsingular.pyx'], 
1450  1423  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
1451  1424  language="c++", 
1452   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 1425  include_dirs = [SAGE_INC + 'singular'], 
1453  1426  depends = singular_depends), 
1454  1427  
1455  1428  Extension('sage.rings.polynomial.multi_polynomial_libsingular', 
1456  1429  sources = ['sage/rings/polynomial/multi_polynomial_libsingular.pyx'], 
1457  1430  libraries = ['m', 'readline', 'singular', 'givaro', 'gmpxx', 'gmp'], 
1458  1431  language="c++", 
1459   include_dirs = [SAGE_ROOT +'/local/include/singular'], 
 1432  include_dirs = [SAGE_INC + 'singular'], 
1460  1433  depends = singular_depends), 
1461  1434  
1462  1435  Extension('sage.rings.polynomial.multi_polynomial_ring_generic', 
… 
… 

1488  1461  sources = ['sage/rings/polynomial/polynomial_zmod_flint.pyx'], 
1489  1462  libraries = ["csage", "flint", "gmp", "gmpxx", "ntl", "zn_poly"], 
1490  1463  extra_compile_args=["std=c99", "D_XPG6"], 
1491   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1464  include_dirs = [SAGE_INC + 'FLINT/'], 
1492  1465  depends = flint_depends), 
1493  1466  
1494  1467  Extension('sage.rings.polynomial.polynomial_integer_dense_flint', 
1495  1468  sources = ['sage/rings/polynomial/polynomial_integer_dense_flint.pyx'], 
1496  1469  language = 'c++', 
1497  1470  libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"], 
1498   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1471  include_dirs = [SAGE_INC + 'FLINT/'], 
1499  1472  depends = flint_depends), 
1500  1473  
1501  1474  Extension('sage.rings.polynomial.polynomial_integer_dense_ntl', 
… 
… 

1509  1482  language = 'c++', 
1510  1483  extra_compile_args=["std=c99"] + uname_specific('SunOS', [], ['D_XPG6']), 
1511  1484  libraries = ["csage", "flint", "ntl", "gmpxx", "gmp"], 
1512   include_dirs = [SAGE_ROOT + '/local/include/FLINT/', SAGE_ROOT + '/devel/sage/sage/libs/flint/'], 
 1485  include_dirs = [SAGE_INC + 'FLINT/', 'sage/libs/flint/'], 
1513  1486  depends = flint_depends), 
1514  1487  
1515  1488  Extension('sage.rings.polynomial.polynomial_modn_dense_ntl', 
… 
… 

1521  1494  Extension('sage.rings.polynomial.pbori', 
1522  1495  sources = ['sage/rings/polynomial/pbori.pyx'], 
1523  1496  libraries=(['polybori','pboriCudd', 'groebner', 'gd', 'png12', 'm4ri']), 
1524   include_dirs = [SAGE_ROOT+'/local/include/cudd', 
1525   SAGE_ROOT+'/local/include/polybori', 
1526   SAGE_ROOT+'/local/include/polybori/groebner', 
 1497  include_dirs = [SAGE_INC + 'cudd', 
 1498  SAGE_INC + 'polybori', 
 1499  SAGE_INC + 'polybori/groebner', 
1527  1500  "sage/libs/polybori"], 
1528   depends = [SAGE_ROOT + "/local/include/polybori/polybori.h"], 
 1501  depends = [SAGE_INC + "polybori/polybori.h"], 
1529  1502  extra_compile_args = polybori_extra_compile_args, 
1530  1503  language = 'c++'), 
1531  1504  
… 
… 

1551  1524  Extension('sage.schemes.elliptic_curves.descent_two_isogeny', 
1552  1525  sources = ['sage/schemes/elliptic_curves/descent_two_isogeny.pyx'], 
1553  1526  extra_compile_args=["std=c99"], 
1554   depends = [SAGE_ROOT + '/local/include/ratpoints.h', 
1555   SAGE_ROOT + '/local/include/gmp.h', 
1556   SAGE_ROOT + '/local/include/FLINT/flint.h'], 
1557   include_dirs = [SAGE_ROOT+'/local/include/FLINT/'], 
 1527  depends = [SAGE_INC + 'ratpoints.h', 
 1528  SAGE_INC + 'gmp.h'] + 
 1529  flint_depends, 
 1530  include_dirs = [SAGE_INC + 'FLINT/'], 
1558  1531  libraries = ['flint', 'gmp', 'ratpoints']), 
1559  1532  
1560  1533  Extension('sage.schemes.generic.toric_divisor_class', 
… 
… 

1714  1687  from sage.misc.package import is_package_installed 
1715  1688  
1716  1689  
1717   if (os.path.isfile(SAGE_ROOT+"/local/include/cplex.h") and 
1718   os.path.isfile(SAGE_ROOT+"/local/lib/libcplex.a")): 
 1690  if (os.path.isfile(SAGE_INC + "cplex.h") and 
 1691  os.path.isfile(SAGE_LOCAL + "/lib/libcplex.a")): 
1719  1692  ext_modules.append( 
1720  1693  Extension("sage.numerical.backends.cplex_backend", 
1721  1694  ["sage/numerical/backends/cplex_backend.pyx"], 
1722   include_dirs = [SAGE_ROOT+"/local/include/","/sage/c_lib/include/"], 
 1695  include_dirs = [SAGE_INC, "sage/c_lib/include/"], 
1723  1696  language = 'c', 
1724  1697  libraries = ["csage", "stdc++", "cplex"]) 
1725  1698  ) 
… 
… 

1728  1701  ext_modules.append( 
1729  1702  Extension("sage.numerical.backends.coin_backend", 
1730  1703  ["sage/numerical/backends/coin_backend.pyx"], 
1731   include_dirs = [SAGE_ROOT+"/local/include/","sage/c_lib/include/"], 
 1704  include_dirs = [SAGE_INC, "sage/c_lib/include/"], 
1732  1705  language = 'c++', 
1733  1706  libraries = ["csage", "stdc++", "Cbc", "CbcSolver", "Cgl", "Clp", "CoinUtils", "OsiCbc", "OsiClp", "Osi", "OsiVol", "Vol"]) 
1734  1707  ) 