Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Trac #19510: Merge #19306 (due to #19879)
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheuberg
cheuberg committed Jan 22, 2016
2 parents ea3dd35 + 4d80eb3 commit 1529a4d
Show file tree
Hide file tree
Showing 1,351 changed files with 60,101 additions and 26,619 deletions.
8 changes: 7 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,10 @@ $RECYCLE.BIN/
#################
*.sage-chat
*.sage-history
*.syncdoc*
*.syncdoc*

###########
# Jupyter #
###########
.ipynb_checkpoints
Untitled*.ipynb
1 change: 1 addition & 0 deletions COPYING.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ build: all-build

# If configure was run before, rerun it with the old arguments.
# Otherwise, run configure with argument $PREREQ_OPTIONS.
build/make/Makefile: configure
build/make/Makefile: configure build/pkgs/*/*
rm -f config.log
mkdir -p logs/pkgs
ln -s logs/pkgs/config.log config.log
Expand Down Expand Up @@ -119,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:
Expand Down
1 change: 0 additions & 1 deletion README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Sage version 6.10.beta2, released 2015-10-28
Sage version 7.0, released 2016-01-19
8 changes: 8 additions & 0 deletions bootstrap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 30 additions & 3 deletions build/bin/sage-spkg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,11 +453,23 @@ fi
# Handle --info
##################################################################

# Usage: zip_to_tar $PKG_FILE_NAME
# Outputs (to stdout) a .tar version of a .zip archive
zip_to_tar()
{
tmpdir="$(mktemp -d)" &&
tmpfile="$(mktemp).tar" &&
cd "$tmpdir" &&
sage-unzip "$1" &&
tar -cf "$tmpfile" * &&
cat "$tmpfile"
}

# Usage: uncompress_spkg $PKG_FILE_NAME
# Uncompresses a spkg to stdout.
uncompress_spkg()
{
lbzip2 -d -c "$1" 2>/dev/null || bzip2 -d -c "$1" 2>/dev/null || gzip -d -c "$1" 2>/dev/null || cat "$1"
lbzip2 -d -c "$1" 2>/dev/null || bzip2 -d -c "$1" 2>/dev/null || gzip -d -c "$1" 2>/dev/null || zip_to_tar "$1" || cat "$1"
}

if [ $INFO -ne 0 -a -z "$USE_LOCAL_SCRIPTS" ]; then
Expand Down Expand Up @@ -543,7 +555,16 @@ fi

if [ "$USE_LOCAL_SCRIPTS" = yes ]; then
shopt -s nocaseglob # see trac:16415
mv "${PKG_NAME_UPSTREAM%.tar*}"* src
# Strip file extension from the archive file and hope (as per
# automake standards) that this is the same as the directory name
# inside; move the directory to "src". (This goes wrong for
# upstream package archives that have been renamed to appease some
# other Sage script, such as "latte-int", whose archive is renamed
# to "latte_int".)
mv "$(echo "$PKG_NAME_UPSTREAM" | sed 's/\.zip$//g;s/\.tgz$//g;s/\.tar\.gz$//g;s/\.tar\.xz$//g;s/\.tar\.lz$//g;s/\.tar\.bz2$//g;s/\.tar$//g')"* src
# Do not check for errors here; the "mv" fails in the situation
# mentioned above, and the package-specific script needs to do
# this work itself.
shopt -u nocaseglob
echo "Finished set up"
else
Expand Down Expand Up @@ -637,8 +658,8 @@ if [ ! -x spkg-install ]; then
echo >&2 "WARNING: spkg-install is not executable, making it executable"
chmod +x spkg-install
fi
time ./spkg-install

time ./spkg-install
if [ $? -ne 0 ]; then
error_msg "Error installing package $PKG_NAME" "make"
exit 1
Expand All @@ -665,6 +686,12 @@ if [ "$SAGE_CHECK" = "yes" ]; then
fi
fi

rm -f "$SAGE_LOCAL"/lib/*.la
if [ $? -ne 0 ]; then
error_msg "Error deleting unnecessary libtool archive files"
exit 1
fi

# Mark that the new package has been installed (and tested, if
# applicable).
PKG_NAME_INSTALLED="$SAGE_SPKG_INST/$PKG_NAME"
Expand Down
5 changes: 3 additions & 2 deletions build/make/deps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ toolchain-deps:
$(MAKE) $(INST)/$(SAGE_MP_LIBRARY)
$(MAKE) $(INST)/$(MPFR)
$(MAKE) $(INST)/$(MPC)
$(MAKE) $(INST)/$(PPL)

# Everything needed to start up Sage using "./sage". Of course, not
# every part of Sage will work. It does not include Maxima for example.
Expand Down Expand Up @@ -100,6 +99,7 @@ base: $(INST)/$(BZIP2) $(INST)/$(PATCH) $(INST)/$(PKGCONF)
# Sage library (e.g. CYTHON, JINJA2), and on the other hand all
# dependencies for Cython files (e.g. PARI, NTL, SAGE_MP_LIBRARY).
sagelib: \
$(INST)/$(ARB) \
$(INST)/$(ATLAS) \
$(INST)/$(BRIAL) \
$(INST)/$(CEPHES) \
Expand Down Expand Up @@ -187,7 +187,8 @@ $(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
DOC_DEPENDENCIES = sagelib $(INST)/$(SPHINX) $(INST)/$(SAGENB) \
| $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(NETWORKX) \
$(INST)/$(SCIPY) $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW) \
$(INST)/$(MATHJAX) $(INST)/$(IPYKERNEL) $(INST)/$(JUPYTER_CLIENT)
$(INST)/$(MATHJAX) $(INST)/$(IPYKERNEL) $(INST)/$(JUPYTER_CLIENT) \
$(INST)/$(CONWAY_POLYNOMIALS)

doc: doc-html

Expand Down
6 changes: 3 additions & 3 deletions build/pkgs/4ti2/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=4ti2-VERSION.tar.gz
sha1=afd61b1479f61bfbb1996ab833c43996c401385a
md5=289d50cf7932488adc24c9c308bbafcf
cksum=1124458672
sha1=9a9a6913bcd52b667355a7df7fa954ca101054cb
md5=90def0d6b01a0247e439356777467497
cksum=439147307
2 changes: 1 addition & 1 deletion build/pkgs/4ti2/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.5
1.6.7
2 changes: 1 addition & 1 deletion build/pkgs/4ti2/type
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
experimental
optional
8 changes: 4 additions & 4 deletions build/pkgs/arb/checksums.ini
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tarball=arb-VERSION.tar.gz
sha1=e8c367b9f617262b4a7e9956cf49b6acf5c0db24
md5=683f4b9f975f8e546ca4481f803cd099
cksum=444089473
tarball=arb-VERSION.tar.bz2
sha1=fe1d6381d80498c40178c2a55fe93e0bface7c76
md5=d97b2cbad8afc8ff05785840ed473ef3
cksum=2593037017
3 changes: 1 addition & 2 deletions build/pkgs/arb/package-version.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
2.6.0

2.7.0.p1
Loading

0 comments on commit 1529a4d

Please sign in to comment.