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

Commit b796e06

Browse files
pjbruinpjbruin
committed
Merge branch 'develop' into ticket/15601
Conflicts: src/sage/rings/power_series_ring.py
2 parents 7fc9291 + c022e36 commit b796e06

File tree

99 files changed

+6366
-1480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+6366
-1480
lines changed

‎.gitignore

+12
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,18 @@
55
/logs
66
/upstream
77

8+
#############################
9+
# Autotools generated files #
10+
#############################
11+
/aclocal.m4
12+
/autom4te.cache/
13+
/config/
14+
/config.log
15+
/config.status
16+
/configure
17+
/build/Makefile-auto
18+
/build/Makefile-auto.in
19+
820
###################
921
# Temporary Files #
1022
###################

‎Makefile

+25-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
PIPE = build/pipestatus
1111

12+
1213
all: start doc # indirectly depends on build
1314

1415
logs:
@@ -82,13 +83,24 @@ bdist-clean: clean
8283
rm -rf logs
8384
rm -rf dist
8485
rm -rf tmp
85-
rm -f build/Makefile
86+
rm -f aclocal.m4 config.log config.status confcache
87+
rm -rf autom4te.cache
88+
rm -f build/Makefile build/Makefile-auto
8689
rm -f .BUILDSTART
8790

8891
distclean: clean doc-clean lib-clean bdist-clean
8992
@echo "Deleting all remaining output from build system ..."
9093
rm -rf local
9194

95+
# Delete all auto-generated files which are distributed as part of the
96+
# source tarball
97+
bootstrap-clean:
98+
rm -rf config configure build/Makefile-auto.in
99+
100+
# Remove absolutely everything which isn't part of the git repo
101+
maintainer-clean: distclean bootstrap-clean
102+
rm -rf upstream
103+
92104
micro_release: bdist-clean lib-clean
93105
@echo "Stripping binaries ..."
94106
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
@@ -140,6 +152,16 @@ ptestoptional: ptestall # just an alias
140152

141153
ptestoptionallong: ptestalllong # just an alias
142154

155+
bootstrap:
156+
$(MAKE) configure || \
157+
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 -'
158+
159+
configure: configure.ac src/bin/sage-version.sh \
160+
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
161+
test -d config || mkdir config
162+
aclocal -I m4
163+
automake --add-missing --copy build/Makefile-auto
164+
autoconf
143165

144166
install:
145167
echo "Experimental use only!"
@@ -160,8 +182,8 @@ install:
160182
"$(DESTDIR)"/bin/sage -c # Run sage-location
161183

162184

163-
.PHONY: all build build-serial start install \
185+
.PHONY: all build build-serial start install micro_release bootstrap \
164186
doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
165-
doc-clean clean lib-clean bdist-clean distclean micro_release \
187+
doc-clean clean lib-clean bdist-clean distclean bootstrap-clean maintainer-clean \
166188
test check testoptional testall testlong testoptionallong testallong \
167189
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.1.beta4, released 2014-01-05
1+
Sage version 6.1.beta5, released 2014-01-15

‎bootstrap

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
#!/usr/bin/env bash
2+
3+
########################################################################
4+
# Regenerate auto-generated files (e.g. configure)
5+
#
6+
# If the -s option is given, save the autogenerated scripts in
7+
# $SAGE_ROOT/upstream/configure-$CONFVERSION.tar.gz where CONFVERSION
8+
# is the version number stored in
9+
# build/pkgs/configure/package-version.txt
10+
#
11+
# If optional argument -i is given, then automatically increment the
12+
# version number
13+
########################################################################
14+
15+
set -e
16+
17+
# Either run this script from SAGE_ROOT or make sure that SAGE_ROOT
18+
# is set
19+
test -z "$SAGE_ROOT" || cd "$SAGE_ROOT"
20+
21+
PKG=build/pkgs/configure
22+
MAKE="${MAKE:-make}"
23+
CONFVERSION=`cat $PKG/package-version.txt`
24+
25+
bootstrap () {
26+
# Start cleanly
27+
$MAKE bootstrap-clean
28+
29+
# Generate auto-generated files
30+
$MAKE configure
31+
}
32+
33+
34+
save () {
35+
# Create configure tarball
36+
CONFBALL="upstream/configure-$CONFVERSION.tar.gz"
37+
echo "Creating $CONFBALL..."
38+
mkdir -p upstream
39+
tar zcf "$CONFBALL" configure config/* build/Makefile-auto.in
40+
41+
# Update version number
42+
echo "$CONFVERSION" >$PKG/package-version.txt
43+
44+
# Compute checksum
45+
src/bin/sage-fix-pkg-checksums "$CONFBALL"
46+
}
47+
48+
49+
usage () {
50+
echo >&2 "Usage: bootstrap [-i] [-s] [-h]"
51+
}
52+
53+
54+
# Parse options
55+
SAVE=
56+
while getopts "sih" OPTION
57+
do
58+
case "$OPTION" in
59+
s)
60+
SAVE=yes
61+
;;
62+
i)
63+
CONFVERSION=$(( CONFVERSION + 1 ))
64+
;;
65+
h)
66+
usage
67+
exit
68+
;;
69+
?)
70+
usage
71+
exit 2
72+
;;
73+
esac
74+
done
75+
76+
bootstrap
77+
if [ -n "$SAVE" ]; then
78+
save
79+
fi

‎build/Makefile-auto.am

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Currently, this file is unused. However, it needs to exist to coerce
2+
# automake into thinking that this is an Automake project.

‎build/deps

+5-4
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,13 @@ SAGERUNTIME = $(SCRIPTS) $(INST)/sage $(INST)/$(SAGENB) $(INST)/$(IPYTHON)
143143
# an update of these packages will not trigger a rebuild of every other
144144
# package during an upgrade, see #13415.
145145
###############################################################################
146-
base: $(INST)/$(PREREQ) $(INST)/$(BZIP2) $(INST)/$(PATCH)
146+
base: $(INST)/prereq $(INST)/$(BZIP2) $(INST)/$(PATCH)
147147

148-
$(INST)/$(PREREQ):
149-
$(PIPE) "base/$(PREREQ)-install 2>&1" "tee -a $(SAGE_LOGS)/$(PREREQ).log"
148+
$(INST)/prereq: prereq.sh
149+
$(PIPE) "./prereq.sh 2>&1" "tee -a $(SAGE_LOGS)/prereq.log"
150+
touch $@
150151

151-
$(INST)/$(BZIP2): $(INST)/$(PREREQ)
152+
$(INST)/$(BZIP2): $(INST)/prereq
152153
+$(PIPE) "$(SAGE_SPKG) $(BZIP2) 2>&1" "tee -a $(SAGE_LOGS)/$(BZIP2).log"
153154

154155
$(INST)/$(PATCH): $(INST)/$(BZIP2)

‎build/install

+1-34
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SAGE_EXTCODE="$SAGE_SHARE/sage/ext"
1313
SAGE_LOGS="$SAGE_ROOT/logs/pkgs"
1414
SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
1515
SAGE_VERSION=`cat $SAGE_ROOT/VERSION.txt | sed 's+.*\ \(.*\),.*+\1+'`
16-
PATH="$SAGE_ROOT/src/bin:$SAGE_LOCAL/bin:$PATH"
16+
PATH="$SAGE_SRC/bin:$PATH"
1717
PYTHONPATH="$SAGE_LOCAL"
1818
export SAGE_ROOT SAGE_SRC SAGE_LOCAL SAGE_EXTCODE SAGE_LOGS SAGE_SPKG_INST SAGE_VERSION PATH PYTHONPATH
1919

@@ -61,16 +61,6 @@ mkdir -p "$SAGE_LOCAL/lib"
6161
mkdir -p "$SAGE_SPKG_INST"
6262
mkdir -p "$SAGE_SHARE"
6363

64-
# If we are upgrading from an old version of Sage where $SAGE_SHARE
65-
# was stored at $SAGE_ROOT/data, move it to the right location.
66-
# Check that $SAGE_ROOT/data is an existing directory and not a symlink.
67-
if [ -d "$SAGE_ROOT/data" ] && [ ! -h "$SAGE_ROOT/data" ]; then
68-
mkdir -p "$SAGE_ROOT/devel"
69-
mv "$SAGE_ROOT"/data/extcode "$SAGE_ROOT/devel/ext-main"
70-
mv "$SAGE_ROOT"/data/* "$SAGE_SHARE"
71-
rm -rf "$SAGE_ROOT/data"
72-
fi
73-
7464
###############################################################################
7565
# Determine whether to install GCC (gcc, g++, gfortran).
7666
###############################################################################
@@ -345,26 +335,6 @@ if [ "${SAGE_PARALLEL_SPKG_BUILD:-yes}" = no ]; then
345335
echo "" >&3
346336
fi
347337

348-
# Usage: newest_version_base $pkg
349-
# Print version number of latest (according to modification time)
350-
# base package $pkg
351-
newest_version_base() {
352-
PKG=$1
353-
# As a fallback, we also look at the latest installed package.
354-
for FILE in `{ ls -1t base/$PKG-*-install; ls -1t installed/$PKG-*; } 2>/dev/null`
355-
do
356-
ANS=`echo "$FILE" | sed 's|.*/||; s|-install||'`
357-
if [ -n "$ANS" ]; then
358-
echo "$ANS"
359-
return 0
360-
fi
361-
done
362-
363-
echo >&2 "Cannot determine latest version of $PKG."
364-
echo "$PKG"
365-
return 1
366-
}
367-
368338
# Usage: newest_version $pkg
369339
# Print version number of latest standard package $pkg
370340
newest_version() {
@@ -380,9 +350,6 @@ newest_version() {
380350
}
381351

382352
cat >&3 <<EOF
383-
# Base packages
384-
PREREQ=`newest_version_base prereq`
385-
386353
# Standard packages
387354
ATLAS=`newest_version atlas`
388355
BOEHM_GC=`newest_version boehm_gc`

‎build/pkgs/configure/SPKG.txt

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
= Configure =
2+
3+
== Description ==
4+
5+
This package contains a tar archive of auto-generated files. They are
6+
shipped with Sage in case you do not have a sufficiently recent
7+
autotools version installed.
8+
9+
== License ==
10+
11+
GPLv3+
12+
13+
== SPKG Maintainers ==
14+
15+
* Jeroen Demeyer
16+
* Volker Braun
17+
18+
== Upstream Contact ==
19+
20+
21+
Automatically generated by Sage, use trac and/or sage-devel for questions.
22+
23+
== Dependencies ==
24+
25+
None
26+
27+
== Special Update/Build Instructions ==
28+
29+
This tarball is automatically generated by Sage whenever you run the
30+
$SAGE_ROOT/bootstrap or the $SAGE_ROOT/src/bin/sage-update-version
31+
script.

‎build/pkgs/configure/checksums.ini

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
tarball=configure-VERSION.tar.gz
2+
sha1=474bb4ed975346fb627c26bf8133e28534f16f5f
3+
md5=847562c03a4d1ea0a5e9b8a289f59874
4+
cksum=2080187173

‎build/pkgs/configure/package-version.txt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3

0 commit comments

Comments
 (0)