Merge branch 'develop' into t/23190/23190

Author: saraedum

VERSION.txt

@@ -1 +1 @@
-SageMath version 8.1.beta0, Release Date: 2017-07-29
+SageMath version 8.1.beta1, Release Date: 2017-08-04

build/bin/sage-python23

@@ -17,5 +17,15 @@ else
    PYTHON="$SAGE_LOCAL/bin/python2"
 fi
 
+# Check that Python is actually installed and issue an error message if not--in
+# particular if this was run from an spkg-install before Python is installed
+# this indicates that Python should be a dependency of that package.
+if [ ! -x "$PYTHON" ]; then
+     echo >&2 "Error: Tried to use Sage's Python which was not yet installed."
+     echo >&2 'If this was called from an spkg-install script for another '
+     echo >&2 'package you should add $(PYTHON) as a dependency in '
+     echo >&2 'build/pkgs/<pkg>/dependencies'
+     exit 1
+fi
 
 exec $PYTHON "$@"

build/bin/sage-spkg

@@ -650,6 +650,79 @@ cd ..
 # The package has been extracted, prepare for installation
 ##################################################################
 
+# Rewrites the given bash pseudo-script with a boilerplate header that includes
+# the shebang line and sourcing sage-env.  Make sure the name of the script is
+# passed in as an absolute path.
+write_script_wrapper() {
+    local script="$1"
+    local pkgdir="$(dirname "$script")"
+
+    trap "echo >&2 Error: Unexpected error writing wrapper script for $script; exit \$_" ERR
+
+    if head -1 "$script" | grep '^#!.*$' >/dev/null; then
+        echo >&2 "Error: ${script##*/} should not contain a shebang line; it will be prepended automatically."
+        exit 1
+    fi
+
+    local tmpscript="$(dirname "$script")/.tmp-${script##*/}"
+
+    cat > "$tmpscript" <<__EOF__
+#!/usr/bin/env bash
+
+export SAGE_ROOT="$SAGE_ROOT"
+export SAGE_SRC="$SAGE_SRC"
+export SAGE_PKG_DIR="$pkgdir"
+
+source "\$SAGE_SRC/bin/sage-env"
+if [ \$? -ne 0 ]; then
+    echo >&2 "Error: failed to source sage-env; is \$SAGE_ROOT the correct SAGE_ROOT?"
+    exit 1
+fi
+
+cd "\$SAGE_PKG_DIR"
+if [ \$? -ne 0 ]; then
+    echo >&2 "Error: could not cd to the package build directory \$SAGE_PKG_DIR"
+    exit 1
+fi
+
+__EOF__
+
+    cat "$script" >> "$tmpscript"
+    mv "$tmpscript" "$script"
+    chmod +x "$script"
+
+    trap - ERR
+}
+
+
+for script in build install check; do
+    script="spkg-$script"
+    if [ -f "$script" ]; then
+        if [ "$USE_LOCAL_SCRIPTS" = "yes" ]; then
+            if [ -x "$script" ]; then
+                msg="$script should not be marked executable in the build/pkgs directory"
+                if [ "$UNAME" = "CYGWIN" ]; then
+                    # On Cygwin we can't necessarily rely on file permissions
+                    # being sane, so just issue a warning; on other platforms
+                    # this should be enforced as an error
+                    echo >&2 "WARNING: $msg"
+                else
+                    error_msg "$msg"
+                    exit 1
+                fi
+            fi
+
+            write_script_wrapper $(pwd)/"$script"
+        else
+            if [ ! -x "$script" ]; then
+                echo >&2 "WARNING: $script is not executable, making it executable"
+                chmod +x "$script"
+            fi
+        fi
+    fi
+done
+
+
 # When there is no spkg-install, assume the "spkg" is a tarball not
 # specifically made for Sage.  Since we want it to be as easy as
 # possible to install such a package, we "guess" spkg-install.
@@ -667,17 +740,6 @@ if [ ! -f spkg-install ]; then
     chmod +x spkg-install
 fi
 
-# If spkg-install is a Python script (i.e. the first line of the file
-# contains "python"), verify that Python has already been installed.
-if head -1 spkg-install | grep python >/dev/null; then
-    # If there is no Python installed in local/bin, exit with an error.
-    if [ ! -x "$SAGE_LOCAL"/bin/python ]; then
-         echo >&2 "Error: The spkg-install script is written in Python, but the Python"
-         echo >&2 'package is not yet installed in Sage.  You should add $(PYTHON)'
-         echo >&2 "as dependency in build/pkgs/$PKG_BASE/dependencies"
-         exit 1
-    fi
-fi
 
 # SAGE_CHECK_PACKAGES: if this contains "!pkg", skip tests for "pkg",
 # so set SAGE_CHECK=no.  If this contains "pkg", run tests, so set
@@ -723,12 +785,8 @@ export rsync_proxy=$http_proxy
 ##################################################################
 # Actually install
 ##################################################################
-if [ ! -x spkg-install ]; then
-    echo >&2 "WARNING: spkg-install is not executable, making it executable"
-    chmod +x spkg-install
-fi
 
-if [ -x spkg-build ]; then
+if [ -f spkg-build ]; then
     # Package has both spkg-build and spkg-install; execute the latter with SAGE_SUDO
     time ./spkg-build
     if [ $? -ne 0 ]; then
@@ -761,10 +819,6 @@ echo "Successfully installed $PKG_NAME"
 if [ "$SAGE_CHECK" = "yes" ]; then
     if [ -f spkg-check ]; then
         echo "Running the test suite for $PKG_NAME..."
-        if [ ! -x spkg-check ]; then
-            echo >&2 "WARNING: spkg-check is not executable, making it executable"
-            chmod +x spkg-check
-        fi
         time ./spkg-check
         if [ $? -ne 0 ]; then
             error_msg "Error testing package $PKG_NAME" "make check"

build/pkgs/4ti2/spkg-check

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 if [ -z "$SAGE_LOCAL" ]; then
     echo >&2 "Error: SAGE_LOCAL undefined - exiting..."
     echo >&2 "Maybe run 'sage -sh'?"

build/pkgs/4ti2/spkg-install

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 cd src/
 
 if [ "$SAGE_LOCAL" = "" ]; then

build/pkgs/alabaster/spkg-install

@@ -1,3 +1 @@
-#!/usr/bin/env bash
-
 cd src && $PIP_INSTALL .

build/pkgs/appnope/spkg-install

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 cd src
 
 # Only install this package on OS X

build/pkgs/arb/spkg-check

@@ -1,4 +1,2 @@
-#!/usr/bin/env bash
-
 cd src
 $MAKE check

build/pkgs/arb/spkg-install

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 cd src
 
 # The git head of arb now honors LDFLAGS; The following workaround can

build/pkgs/atlas/spkg-check

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 ######################################################################
 ### Sanity check
 ######################################################################