Merge branch 'develop' into ticket/6018-DirichletGroup_zeta

Conflicts:
	src/sage/modular/dirichlet.py

.gitignore

@@ -75,4 +75,10 @@ $RECYCLE.BIN/
 #################
 *.sage-chat
 *.sage-history
-*.syncdoc*
+*.syncdoc*
+
+###########
+# Jupyter #
+###########
+.ipynb_checkpoints
+Untitled*.ipynb

COPYING.txt

@@ -28,6 +28,7 @@ the licenses of the components of Sage are included below as well.
 
 SOFTWARE                    LICENSE
 -----------------------------------------------------------------------
+arb                         GPLv2+
 atlas                       Modified BSD
 boehm_gc                    MIT-like license (see below)
 backports_ssl_match_hostname  Python License

Makefile

@@ -13,13 +13,28 @@ build: all-build
 
 # Defer unknown targets to build/make/Makefile
 %::
-	$(MAKE) configure logs
-	+cd build/make && ./pipestatus \
-		"./install '$@' 2>&1" \
-		"tee -a ../../logs/install.log"
-
-logs:
-	mkdir -p $@
+	$(MAKE) build/make/Makefile
+	+build/bin/sage-logger \
+		"cd build/make && ./install '$@'" logs/install.log
+
+# If configure was run before, rerun it with the old arguments.
+# Otherwise, run configure with argument $PREREQ_OPTIONS.
+build/make/Makefile: configure build/pkgs/*/*
+	rm -f config.log
+	mkdir -p logs/pkgs
+	ln -s logs/pkgs/config.log config.log
+	@if [ -x config.status ]; then \
+		./config.status --recheck && ./config.status; \
+	else \
+		./configure $$PREREQ_OPTIONS; \
+	fi || ( \
+		if [ "x$$SAGE_PORT" = x ]; then \
+			echo "If you would like to try to build Sage anyway (to help porting),"; \
+			echo "export the variable 'SAGE_PORT' to something non-empty."; \
+			exit 1; \
+		else \
+			echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
+		fi; )
 
 # Preemptively download all standard upstream source tarballs.
 download:
@@ -62,7 +77,7 @@ bootstrap-clean:
 maintainer-clean: distclean bootstrap-clean
 	rm -rf upstream
 
-micro_release: bdist-clean lib-clean
+micro_release: bdist-clean sagelib-clean
 	@echo "Stripping binaries ..."
 	LC_ALL=C find local/lib local/bin -type f -exec strip '{}' ';' 2>&1 | grep -v "File format not recognized" |  grep -v "File truncated" || true
 
@@ -104,8 +119,7 @@ ptestoptional: ptestall # just an alias
 
 ptestoptionallong: ptestalllong # just an alias
 
-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
+configure: configure.ac src/bin/sage-version.sh m4/*.m4
 	./bootstrap -d
 
 install:

README.txt

@@ -72,7 +72,6 @@ Installation Guide:
 1. Make sure you have the dependencies and 5 GB of free disk space.
 
    All Linux versions: gcc, make, m4, perl, ranlib, and tar.
-   Debian or Ubuntu systems: the dpkg-dev package.
    Fedora or RedHat systems: the perl-ExtUtils-MakeMaker package.
    (install these using your package manager)
 

VERSION.txt

@@ -1 +1 @@
-Sage version 6.8.rc0, released 2015-07-15
+Sage version 7.0, released 2016-01-19

bootstrap

@@ -72,6 +72,14 @@ bootstrap-download () {
 save () {
     set -e
 
+    # Check that config.guess is sufficiently recent
+    if ! grep '^timestamp=.*201[5-9]' config/config.guess >/dev/null; then
+        echo >&2 "Error: config.guess is outdated:"
+        grep >&2 '^timestamp=' config/config.guess
+        echo >&2 "You should update the 'gnuconfig' or 'automake' package and try again"
+        exit 63
+    fi
+
     # Create configure tarball
     echo "Creating $CONFBALL..."
     mkdir -p upstream

build/bin/sage-logger

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+#
+# sage-logger COMMAND LOGFILE
+#
+# Evaluate shell command COMMAND while logging stdout and stderr to
+# LOGFILE. If either the command or the logging failed, return a
+# non-zero exit status.
+#
+# AUTHOR:
+#
+# - Jeroen Demeyer (2015-07-26): initial version based on old pipestatus
+#   script (#18953)
+#
+#*****************************************************************************
+#       Copyright (C) 2015 Jeroen Demeyer <[email protected]>
+#
+#  Distributed under the terms of the GNU General Public License (GPL)
+#  as published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#                  http://www.gnu.org/licenses/
+#*****************************************************************************
+
+cmd="$1"
+logfile="$2"
+logdir=`dirname "$logfile"`
+
+mkdir -p "$logdir"
+
+# Redirect stdout and stderr to a subprocess running tee.
+# We trap SIGINT such that SIGINT interrupts the main process being
+# run, not the logging.
+( exec 2>&1; eval "$cmd" ) | ( trap '' SIGINT; tee -a "$logfile" )
+
+pipestatus=(${PIPESTATUS[*]})
+
+if [ ${pipestatus[1]} -ne 0 ]; then
+    exit ${pipestatus[1]}
+else
+    exit ${pipestatus[0]}
+fi