Changeset 7790:59e100c37713

Timestamp:

12/15/07 20:42:18 (6 years ago)

Author:

William Stein <wstein@…>

Branch:

default

Message:

update spkg-install

File:

• spkg-install (modified) (4 diffs)

spkg-install

@@ -78 +78 @@
 
 if [ -d "$DEVEL/sage-main" ]; then
-    cd "$DEVEL/sage-main"
+    cd "$DEVEL"
+    rm -f sage
+    ln -sf sage-main sage
+    cd sage
     # Pull in changes from the archive just downloaded. 
     hg pull "$CUR"
@@ -91 +94 @@
     # upgrade.  So we touch all pyrex code.
 
-    touch */*.pyx */*/*.pyx */*/*/*.pyx */*/*/*/*.pyx */*/*/*/*/*.pyx */*/*/*/*/*.pyx  */*/*/*/*/*/*.pyx  2> /dev/null
-
     echo "Deleting the scons target."
     cd c_lib
@@ -103 +104 @@
     rm -rf build
 
-    "$SAGE_ROOT/sage" -b main
+    "$SAGE_ROOT/sage" -ba-force 
     if [ $? -ne 0 ]; then
         echo "Error building new version of SAGE."
-    else
-        # repeat -- this makes certain to copy over all the pyx files for inspect.
-        "$SAGE_ROOT/sage" -b main
     fi
     exit $?
@@ -117 +115 @@
 cp -pr * .hg* "$DEVEL/sage-main/"
 
-cd "$DEVEL/sage-main"
+cd "$DEVEL"
+rm -rf sage
+ln -sf sage-main sage
 
-cd "$CUR"
 
-# touch and build everything
-sage -b main
-
-# repeat -- this makes certain to copy over all the pyx files, so they appear when 
-# you use inspect.   (TODO: Maybe this is a hack that can be eliminated? -- William Stein, 2007-10-04)
-sage -b main
+sage -ba-force
 
 if [ $? -ne 0 ]; then