Merge branch 'develop' into ticket/15601

Author: pjbruin

COPYING.txt

@@ -38,6 +38,7 @@ cliquer                     GPLv2+
 conway_polynomials          None (database)
 cvxopt                      GPLv2+
 cython                      Apache, version 2.0
+dateutil                    Simplified BSD
 docutils                    Modified BSD
 ecl                         LGPLv2+
 eclib                       GPLv2+
@@ -72,7 +73,7 @@ libm4rie                    GPLv2+
 libpng                      Custom, very similar to zlib
 linbox                      LGPLv2.1+
 lrcalc                      GPLv2+
-matplotlib                  Python License
+matplotlib                  Matplotlib License (BSD compatible, see below)
 maxima                      See below
 mercurial                   GPLv2+
 mpc                         LGPLv3+
@@ -88,12 +89,15 @@ pari                        GPLv2+
 patch                       GPLv2+
 pexpect                     Python License
 pil                         Similar to MIT and modified BSD (see below)
+pkgconf                     ISC License (equivalent to Simplified BSD)
+pkgconfig                   MIT License
 polybori                    GPLv2+
 polytopes_db                None (database)
 ppl                         GPLv3+
 pycrypto                    Public domain & Python License
 pygments                    Modified BSD
 pynac                       GPLv2+
+pyparsing                   MIT License
 python                      Python License (see below)
 R                           GPLv2+
 ratpoints                   GPLv2+
@@ -111,6 +115,7 @@ scipy                       Modified BSD
 scons                       MIT License
 setuptools                  Python License
 singular                    GPLv2 or GPLv3 (see below)
+six                         MIT License
 sphinx                      Modified BSD
 sqlalchemy                  MIT License
 sqlite                      Public Domain (see below)
@@ -119,6 +124,7 @@ sympow                      Modified BSD
 sympy                       Modified BSD
 tachyon                     Modified BSD
 termcap                     GPLv2+
+tornado                     Apache License
 zlib                        Custom (Modified BSD)
 zn_poly                     GPLv2 or GPLv3 (no later versions, see below)
 
@@ -1008,6 +1014,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ================================================================================
 
+matplotlib:
+(from http://matplotlib.sourceforge.net/users/license.html)
+
+Matplotlib only uses BSD compatible code, and its license is based on
+the PSF license. See the Open Source Initiative licenses page for
+details on individual licenses. Non-BSD compatible licenses (eg LGPL)
+are acceptable in matplotlib toolkits. For a discussion of the
+motivations behind the licencing choice, see Licenses.
+
+================================================================================
+
 maxima:
 (from http://maxima.sourceforge.net/authorization-letter.html)
 

Makefile

@@ -15,8 +15,8 @@ all: start doc  # indirectly depends on build
 logs:
 	mkdir -p $@
 
-build: logs
-	cd build && \
+build: logs configure
+	+cd build && \
 	"../$(PIPE)" \
 		"env SAGE_PARALLEL_SPKG_BUILD='$(SAGE_PARALLEL_SPKG_BUILD)' ./install all 2>&1" \
 		"tee -a ../logs/install.log"
@@ -152,16 +152,9 @@ ptestoptional: ptestall # just an alias
 
 ptestoptionallong: ptestalllong # just an alias
 
-bootstrap:
-	$(MAKE) configure || \
-		bash -c 'source src/bin/sage-env; sage-download-file $$SAGE_UPSTREAM/configure/configure-`cat build/pkgs/configure/package-version.txt`.tar.gz | tar zxmf -'
-
 configure: configure.ac src/bin/sage-version.sh \
         m4/ax_c_check_flag.m4 m4/ax_gcc_option.m4 m4/ax_gcc_version.m4 m4/ax_gxx_option.m4 m4/ax_gxx_version.m4 m4/ax_prog_perl_version.m4
-	test -d config || mkdir config
-	aclocal -I m4
-	automake --add-missing --copy build/Makefile-auto
-	autoconf
+	./bootstrap -d
 
 install:
 	echo "Experimental use only!"
@@ -182,7 +175,7 @@ install:
 	"$(DESTDIR)"/bin/sage -c # Run sage-location
 
 
-.PHONY: all build build-serial start install micro_release bootstrap \
+.PHONY: all build build-serial start install micro_release \
 	doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
 	doc-clean clean lib-clean bdist-clean distclean bootstrap-clean maintainer-clean \
 	test check testoptional testall testlong testoptionallong testallong \

README.txt

@@ -75,12 +75,23 @@ Installation Guide:
    "Precise"), you need the dpkg-dev package.
 
    OS X: Xcode. Make sure you have installed the most recent version
-   of Xcode. For pre-Lion versions of OS X, you can download Xcode
-   from http://developer.apple.com/downloads/. For OS X Lion, you can
-   install it using the App Store. With Xcode 4.3 or later, you need
-   to install the "Command Line Tools": from the File menu, choose
-   "Preferences", then the "Downloads" tab, and then "Install" the
-   Command Line Tools.
+   of Xcode. With recent versions of OS X (OS X Lion or later), you
+   can install Xcode for free from the App Store. For pre-Lion
+   versions of OS X, you can download Xcode from
+   http://developer.apple.com/downloads/.
+
+   With OS X, you also need to install the "command line tools". When
+   using OS X Mavericks, after installing Xcode, run this command from
+   a terminal window:
+
+      xcode-select --install
+
+   Then click "Install" in the pop-up window.
+
+   When using OS X Mountain Lion or earlier, you need to install the
+   command line tools from Xcode: run Xcode; then from the File
+   menu, choose "Preferences", then the "Downloads" tab, and then
+   "Install" the Command Line Tools.
 
    Other platforms: See detailed instructions below.
 

VERSION.txt

@@ -1 +1 @@
-Sage version 6.1.beta5, released 2014-01-15
+Sage version 6.2.beta5, released 2014-03-23

bootstrap

@@ -9,11 +9,14 @@
 # build/pkgs/configure/package-version.txt
 #
 # If optional argument -i is given, then automatically increment the
-# version number
+# version number.
+#
+# If optional argument -d is given and bootstrapping failed, instead
+# extract the files from a local configure tarball, downloading it if
+# needed. If -D is given, don't try to bootstrap and always extract or
+# donwload.
 ########################################################################
 
-set -e
-
 # Either run this script from SAGE_ROOT or make sure that SAGE_ROOT
 # is set
 test -z "$SAGE_ROOT" || cd "$SAGE_ROOT"
@@ -23,17 +26,58 @@ MAKE="${MAKE:-make}"
 CONFVERSION=`cat $PKG/package-version.txt`
 
 bootstrap () {
-    # Start cleanly
-    $MAKE bootstrap-clean
+    aclocal -I m4 && \
+    automake --add-missing --copy build/Makefile-auto && \
+    autoconf
+
+    st=$?
+    case $st in
+        0) true;; # Success
+
+        63|127)  # Autotools not installed or version too old
+            if [ $DOWNLOAD = yes ]; then
+                echo >&2 "Bootstrap failed, downloading required files instead."
+                bootstrap-download || exit $?
+            else
+                if [ $st -eq 127 ]; then
+                    verb="install"
+                else
+                    verb="upgrade"
+                fi
+                echo >&2 "Bootstrap failed. Either $verb autotools or run bootstrap with"
+                echo >&2 "the -d option to download the auto-generated files instead."
+                exit $st
+            fi;;
 
-    # Generate auto-generated files
-    $MAKE configure
+        *) exit $st;; # Failure
+    esac
 }
 
+# Bootstrap by downloading the auto-generated files
+bootstrap-download () {
+    source src/bin/sage-env
+
+    mkdir upstream 2>/dev/null
+    if [ ! -f $CONFBALL ]; then
+        sage-download-file $SAGE_UPSTREAM/configure/configure-$CONFVERSION.tar.gz >$CONFBALL
+        if [ $? -ne 0 ]; then
+            rm -f "$CONFBALL"
+            echo >&2 "Error: downloading configure-$CONFVERSION.tar.gz failed"
+            exit 1
+        fi
+    fi
+
+    # The "m" option to tar ensures that timestamps are set to the
+    # current time, not taken from the tarball.
+    # We need these files to be more recent than the input files
+    # like configure.ac, otherwise "make" gets confused.
+    tar xzmf $CONFBALL || exit $?
+}
 
 save () {
+    set -e
+
     # Create configure tarball
-    CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
     echo "Creating $CONFBALL..."
     mkdir -p upstream
     tar zcf "$CONFBALL" configure config/* build/Makefile-auto.in
@@ -42,38 +86,48 @@ save () {
     echo "$CONFVERSION" >$PKG/package-version.txt
 
     # Compute checksum
-    src/bin/sage-fix-pkg-checksums "$CONFBALL"
+    SAGE_ROOT=. src/bin/sage-fix-pkg-checksums "$CONFBALL"
 }
 
 
 usage () {
-    echo >&2 "Usage: bootstrap [-i] [-s] [-h]"
+    echo >&2 "Usage: $0 [-d|-D|-s] [-i] [-h]"
 }
 
 
 # Parse options
-SAVE=
-while getopts "sih" OPTION
+SAVE=no
+DOWNLOAD=no
+ALWAYSDOWNLOAD=no
+while getopts "Ddsih" OPTION
 do
      case "$OPTION" in
-         s)
-             SAVE=yes
-             ;;
-         i)
-             CONFVERSION=$(( CONFVERSION + 1 ))
-             ;;
-         h)
-             usage
-             exit
-             ;;
-         ?)
-             usage
-             exit 2
-             ;;
+         D) ALWAYSDOWNLOAD=yes; DOWNLOAD=yes;;
+         d) DOWNLOAD=yes;;
+         s) SAVE=yes;;
+         i) CONFVERSION=$(( CONFVERSION + 1 ));;
+         h) usage; exit 0;;
+         ?) usage; exit 2;;
      esac
 done
+CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
+
+if [ $DOWNLOAD$SAVE = yesyes ]; then
+    echo >&2 "$0: refusing to download and save."
+    usage
+    exit 2
+fi
+
+# Start cleanly (it's not a problem if this fails)
+$MAKE bootstrap-clean 2>/dev/null
+mkdir config 2>/dev/null
+
+if [ $ALWAYSDOWNLOAD = yes ]; then
+    bootstrap-download || exit $?
+else
+    bootstrap
+fi
 
-bootstrap
-if [ -n "$SAVE" ]; then
+if [ $SAVE = yes ]; then
     save
 fi