Changeset 6030:7010979ab985

Timestamp:

08/29/07 19:16:42 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Parents:

6015:344d714d7a89 (diff), 6029:e2c9515e3bd7 (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:

• c_lib/src/ZZ_pylong.cc (deleted)
• c_lib/src/ZZ_pylong.h (deleted)
• c_lib/src/ccobject.h (deleted)
• c_lib/src/interrupt.c (deleted)
• c_lib/src/interrupt.h (deleted)
• c_lib/src/mpn_pylong.c (deleted)
• c_lib/src/mpn_pylong.h (deleted)
• c_lib/src/mpz_pylong.c (deleted)
• c_lib/src/mpz_pylong.h (deleted)
• c_lib/src/ntl_wrap.cc (deleted)
• c_lib/src/ntl_wrap.h (deleted)
• c_lib/src/stdsage.c (deleted)
• c_lib/src/stdsage.h (deleted)
• setup.py (modified) (3 diffs)
• setup.py (modified) (2 diffs)

setup.py

@@ -91 +91 @@
 
 #### Build the c_lib first
-if needs_c_lib_build() and os.system( "cd c_lib && scons install" ) != 0:
-    print "    ERROR: The c_lib did not build successfully."
-    sys.exit(1) 
+if needs_c_lib_build():
+    if os.system( "cd c_lib && scons install" ) != 0:
+        print "    ERROR: The c_lib did not build successfully."
+        sys.exit(1)     
 
 include_dirs = ['%s/include'%SAGE_LOCAL, '%s/include/python'%SAGE_LOCAL, \
@@ -732 +733 @@
 if DEVEL:
     extra_compile_args.append('-ggdb')
-    ext_modules.append(hanke)
+    #ext_modules.append(hanke)
     #ext_modules.append(mpc)
 
@@ -756 +757 @@
         bool -- whether or not outfile must be regenerated.
     """
-
     if is_older(filename, outfile):
         print "\nBuilding %s because it depends on %s."%(outfile, filename)

setup.py

@@ -79 +79 @@
 def needs_c_lib_build():
     lib = '../../local/lib/libcsage.so'
-    files = os.listdir( 'c_lib' )
+    try:
+        files = os.listdir( 'c_lib' )
+    except OSError:  # during setup.py sdist
+        return False
     src_files = ['c_lib/' + f for f in files if is_src_file( f )]
     src_files += ['c_lib/SConstruct']
@@ -100 +103 @@
     return ext == ".h" or ext == ".c" or ext == ".cc"
 
+def needs_c_lib_build():
+    lib = '../../local/lib/libcsage.so'
+    try:
+       files = os.listdir( 'c_lib/src' )
+    except OSError:
+        return False
+    src_files = ['c_lib/src/' + f for f in files if is_src_file( f )]
+    src_files += ['c_lib/configure', 'c_lib/Makefile']
+    for f in src_files:
+        if is_older( f, lib ):
+            return True
+    return False
+
+#### Build the c_lib first
+if needs_c_lib_build() and os.system( "cd c_lib && make install" ) != 0:
+    print "    ERROR: The c_lib did not build successfully."
+    sys.exit(1) 
 
 #####################################################