This repository has been archived by the owner on Jan 30, 2023. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'trac/develop' into ticket/15148
Conflicts: src/sage/schemes/hyperelliptic_curves/hyperelliptic_finite_field.py
- Loading branch information
Showing
1,606 changed files
with
154,604 additions
and
79,267 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| Sage version 5.12.beta5, released 2013-09-06 | ||
| Sage version 6.2.beta3, released 2014-03-03 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| ######################################################################## | ||
| # Regenerate auto-generated files (e.g. configure) | ||
| # | ||
| # If the -s option is given, save the autogenerated scripts in | ||
| # $SAGE_ROOT/upstream/configure-$CONFVERSION.tar.gz where CONFVERSION | ||
| # is the version number stored in | ||
| # build/pkgs/configure/package-version.txt | ||
| # | ||
| # If optional argument -i is given, then automatically increment the | ||
| # 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. | ||
| ######################################################################## | ||
|
|
||
| # Either run this script from SAGE_ROOT or make sure that SAGE_ROOT | ||
| # is set | ||
| test -z "$SAGE_ROOT" || cd "$SAGE_ROOT" | ||
|
|
||
| PKG=build/pkgs/configure | ||
| MAKE="${MAKE:-make}" | ||
| CONFVERSION=`cat $PKG/package-version.txt` | ||
|
|
||
| bootstrap () { | ||
| 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;; | ||
|
|
||
| *) 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 | ||
| echo "Creating $CONFBALL..." | ||
| mkdir -p upstream | ||
| tar zcf "$CONFBALL" configure config/* build/Makefile-auto.in | ||
|
|
||
| # Update version number | ||
| echo "$CONFVERSION" >$PKG/package-version.txt | ||
|
|
||
| # Compute checksum | ||
| SAGE_ROOT=. src/bin/sage-fix-pkg-checksums "$CONFBALL" | ||
| } | ||
|
|
||
|
|
||
| usage () { | ||
| echo >&2 "Usage: $0 [-d|-D|-s] [-i] [-h]" | ||
| } | ||
|
|
||
|
|
||
| # Parse options | ||
| SAVE=no | ||
| DOWNLOAD=no | ||
| ALWAYSDOWNLOAD=no | ||
| while getopts "Ddsih" OPTION | ||
| do | ||
| case "$OPTION" in | ||
| 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 | ||
|
|
||
| if [ $SAVE = yes ]; then | ||
| save | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| # Currently, this file is unused. However, it needs to exist to coerce | ||
| # automake into thinking that this is an Automake project. |
Oops, something went wrong.