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

Commit d597b9a

Browse files
author
Jean-Pierre Flori
committed
Merge remote-tracking branch 'trac/develop' into flint_fq_nmod
2 parents 83e7194 + 6bc31bd commit d597b9a

File tree

267 files changed

+6122
-2419
lines changed

Some content is hidden

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

267 files changed

+6122
-2419
lines changed

‎Makefile

+16-60
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,20 @@
77
# See below for targets to build the documentation in other formats,
88
# to run various types of test suites, and to remove parts of the build etc.
99

10-
PIPE = build/pipestatus
10+
default: all
1111

12+
build: all-build
1213

13-
all: start doc # indirectly depends on build
14+
# Defer unknown targets to build/Makefile
15+
%::
16+
$(MAKE) configure logs
17+
+cd build && ./pipestatus \
18+
"./install '$@' 2>&1" \
19+
"tee -a ../logs/install.log"
1420

1521
logs:
1622
mkdir -p $@
1723

18-
build: logs configure
19-
+cd build && \
20-
"../$(PIPE)" \
21-
"./install all 2>&1" \
22-
"tee -a ../logs/install.log"
23-
+./sage -b
24-
2524
# Preemptively download all standard upstream source tarballs.
2625
download:
2726
export SAGE_ROOT=$$(pwd) && \
@@ -36,53 +35,7 @@ download:
3635
ssl: all
3736
./sage -i pyopenssl
3837

39-
# Start Sage if the file local/etc/sage-started.txt does not exist
40-
# (i.e. when we just installed Sage for the first time).
41-
start: build
42-
[ -f local/etc/sage-started.txt ] || local/bin/sage-starts
43-
44-
# You can choose to have the built HTML version of the documentation link to
45-
# the PDF version. To do so, you need to build both the HTML and PDF versions.
46-
# To have the HTML version link to the PDF version, do
47-
#
48-
# $ ./sage --docbuild all html
49-
# $ ./sage --docbuild all pdf
50-
#
51-
# For more information on the docbuild utility, do
52-
#
53-
# $ ./sage --docbuild -H
54-
doc: doc-html
55-
56-
doc-html: build
57-
$(PIPE) "./sage --docbuild --no-pdf-links all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
58-
59-
# 'doc-html-no-plot': build docs without building the graphics coming
60-
# from the '.. plot' directive, in case you want to save a few
61-
# megabytes of disk space. 'doc-clean' is a prerequisite because the
62-
# presence of graphics is cached in src/doc/output.
63-
doc-html-no-plot: build doc-clean
64-
$(PIPE) "./sage --docbuild --no-pdf-links --no-plot all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
65-
66-
doc-html-mathjax: build
67-
$(PIPE) "./sage --docbuild --no-pdf-links all html -j $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
68-
69-
# Keep target 'doc-html-jsmath' for backwards compatibility.
70-
doc-html-jsmath: doc-html-mathjax
71-
72-
doc-pdf: build
73-
$(PIPE) "./sage --docbuild all pdf $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/docpdf.log"
74-
75-
doc-clean:
76-
cd src/doc && $(MAKE) clean
77-
78-
clean:
79-
@echo "Deleting package build directories..."
80-
rm -rf local/var/tmp/sage/build
81-
82-
lib-clean:
83-
cd src && $(MAKE) clean
84-
85-
bdist-clean: clean
38+
misc-clean:
8639
@echo "Deleting miscellaneous artifacts generated by build system ..."
8740
rm -rf logs
8841
rm -rf dist
@@ -92,7 +45,11 @@ bdist-clean: clean
9245
rm -f build/Makefile build/Makefile-auto
9346
rm -f .BUILDSTART
9447

95-
distclean: clean doc-clean lib-clean bdist-clean
48+
bdist-clean: clean
49+
$(MAKE) misc-clean
50+
51+
distclean: build-clean
52+
$(MAKE) misc-clean
9653
@echo "Deleting all remaining output from build system ..."
9754
rm -rf local
9855

@@ -170,8 +127,7 @@ install:
170127
"$(DESTDIR)"/bin/sage -c # Run sage-location
171128

172129

173-
.PHONY: all build start install micro_release \
174-
doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
175-
doc-clean clean lib-clean bdist-clean distclean bootstrap-clean maintainer-clean \
130+
.PHONY: default build install micro_release \
131+
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
176132
test check testoptional testall testlong testoptionallong testallong \
177133
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong

‎VERSION.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Sage version 6.8.beta6, released 2015-06-25
1+
Sage version 6.8.beta7, released 2015-07-02

‎build/deps

+153-65
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,45 @@
66
# Do not put an explicit path for sage-spkg here, it will be found in $PATH.
77
SAGE_SPKG = sage-spkg -f
88
PIPE = $(SAGE_ROOT)/build/pipestatus
9+
STARTED = $(SAGE_LOCAL)/etc/sage-started.txt
910

1011
# Tell make not to look for files with these names:
11-
.PHONY: all all-sage base toolchain toolchain-deps
12+
.PHONY: all all-sage all-toolchain all-build start \
13+
base toolchain toolchain-deps sagelib \
14+
doc doc-html doc-html-jsmath doc-html-mathjax doc-pdf \
15+
doc-clean clean lib-clean build-clean
1216

13-
# Make the 5 build phases:
14-
# prereq, base, toolchain, toolchain-deps, all-sage
17+
# Build everything and start Sage.
18+
# Note that we put the "doc" target first in the rule below because
19+
# the doc build takes the most time and should be started as soon as
20+
# possible.
21+
all: all-toolchain
22+
$(MAKE) doc all-sage
23+
$(MAKE) '$(STARTED)'
24+
25+
# Build everything except the documentation
26+
all-build: all-toolchain
27+
$(MAKE) all-sage
28+
29+
30+
# Make the 4 preliminary build phases:
31+
# prereq, base, toolchain, toolchain-deps.
1532
# During the toolchain build, we export SAGE_BUILD_TOOLCHAIN=yes
1633
# such that packages can do different things when they are built
1734
# as prerequisite of GCC.
18-
all:
35+
all-toolchain:
1936
$(MAKE) $(INST)/prereq
2037
$(MAKE) base
2138
env SAGE_BUILD_TOOLCHAIN=yes $(MAKE) toolchain
2239
$(MAKE) toolchain-deps
23-
$(MAKE) all-sage
2440

2541
# All targets except for the base packages
2642
all-sage: \
27-
$(STANDARD_PACKAGES) \
28-
$(OPTIONAL_INSTALLED_PACKAGES) \
29-
$(INST)/$(SAGE_MP_LIBRARY) \
30-
$(INST)/sage \
31-
$(EXTCODE) \
32-
$(SCRIPTS)
43+
sagelib \
44+
$(STANDARD_PACKAGES) \
45+
$(OPTIONAL_INSTALLED_PACKAGES) \
46+
$(EXTCODE) \
47+
$(SCRIPTS)
3348

3449
# TOOLCHAIN consists of dependencies determined by build/install,
3550
# including for example the GCC package.
@@ -50,7 +65,20 @@ toolchain-deps:
5065

5166
# Everything needed to start up Sage using "./sage". Of course, not
5267
# every part of Sage will work. It does not include Maxima for example.
53-
SAGERUNTIME = $(SCRIPTS) $(INST)/sage $(INST)/$(IPYTHON) $(INST)/$(PEXPECT)
68+
SAGERUNTIME = sagelib $(SCRIPTS) $(INST)/$(IPYTHON) $(INST)/$(PEXPECT)
69+
70+
71+
# Start Sage at least once to check that it works
72+
# (i.e. when we just installed Sage for the first time).
73+
start: all-build
74+
$(MAKE) '$(STARTED)'
75+
76+
# We make this depend on all standard packages because running
77+
# sage-starts runs sage-location, which should be run after installing
78+
# any package.
79+
$(STARTED): $(STANDARD_PACKES)
80+
"$(SAGE_LOCAL)/bin/sage-starts"
81+
5482

5583
###############################################################################
5684
# Building the base system
@@ -62,13 +90,13 @@ base: $(INST)/$(BZIP2) $(INST)/$(PATCH) $(INST)/$(PKGCONF)
6290
$(INST)/prereq: ../configure
6391
@cd ..; rm -f config.log; ln -s logs/pkgs/config.log config.log; \
6492
./configure $$PREREQ_OPTIONS || ( \
65-
if [ "x$$SAGE_PORT" = x ]; then \
66-
echo "If you would like to try to build Sage anyway (to help porting),"; \
67-
echo "export the variable 'SAGE_PORT' to something non-empty."; \
68-
exit 1; \
69-
else \
70-
echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
71-
fi; )
93+
if [ "x$$SAGE_PORT" = x ]; then \
94+
echo "If you would like to try to build Sage anyway (to help porting),"; \
95+
echo "export the variable 'SAGE_PORT' to something non-empty."; \
96+
exit 1; \
97+
else \
98+
echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
99+
fi; )
72100
touch $@
73101

74102
###############################################################################
@@ -77,54 +105,53 @@ $(INST)/prereq: ../configure
77105

78106
# List all *build-time* dependencies of the Sage library. These are,
79107
# on the one hand, programs needed for the build/install process of the
80-
# Sage library (e.g. JINJA2), and on the
81-
# other hand all dependencies for Cython files (e.g. PARI, NTL, SAGE_MP_LIBRARY).
82-
$(INST)/sage: \
83-
$(INST)/$(ATLAS) \
84-
$(INST)/$(CEPHES) \
85-
$(INST)/$(CLIQUER) \
86-
$(INST)/$(CYTHON) \
87-
$(INST)/$(ECL) \
88-
$(INST)/$(ECLIB) \
89-
$(INST)/$(ECM) \
90-
$(INST)/$(FLINT) \
91-
$(INST)/$(LIBFPLLL) \
92-
$(INST)/$(LIBGD) \
93-
$(INST)/$(GIVARO) \
94-
$(INST)/$(GLPK) \
95-
$(INST)/$(GSL) \
96-
$(INST)/$(IML) \
97-
$(INST)/$(JINJA2) \
98-
$(INST)/$(LCALC) \
99-
$(INST)/$(LRCALC) \
100-
$(INST)/$(LIBGAP) \
101-
$(INST)/$(LIBPNG) \
102-
$(INST)/$(LINBOX) \
103-
$(INST)/$(M4RI) \
104-
$(INST)/$(M4RIE) \
105-
$(INST)/$(MPC) \
106-
$(INST)/$(MPFI) \
107-
$(INST)/$(MPFR) \
108-
$(INST)/$(SAGE_MP_LIBRARY) \
109-
$(INST)/$(NTL) \
110-
$(INST)/$(NUMPY) \
111-
$(INST)/$(PARI) \
112-
$(INST)/$(PLANARITY) \
113-
$(INST)/$(POLYBORI) \
114-
$(INST)/$(PPL) \
115-
$(INST)/$(PYNAC) \
116-
$(INST)/$(PYTHON) \
117-
$(INST)/$(RATPOINTS) \
118-
$(INST)/$(READLINE) \
119-
$(INST)/$(RW) \
120-
$(INST)/$(SINGULAR) \
121-
$(INST)/$(SIX) \
122-
$(INST)/$(SYMMETRICA) \
123-
$(INST)/$(ZN_POLY)
108+
# Sage library (e.g. CYTHON, JINJA2), and on the other hand all
109+
# dependencies for Cython files (e.g. PARI, NTL, SAGE_MP_LIBRARY).
110+
sagelib: \
111+
$(INST)/$(ATLAS) \
112+
$(INST)/$(CEPHES) \
113+
$(INST)/$(CLIQUER) \
114+
$(INST)/$(CYTHON) \
115+
$(INST)/$(ECL) \
116+
$(INST)/$(ECLIB) \
117+
$(INST)/$(ECM) \
118+
$(INST)/$(FLINT) \
119+
$(INST)/$(LIBFPLLL) \
120+
$(INST)/$(LIBGD) \
121+
$(INST)/$(GIVARO) \
122+
$(INST)/$(GLPK) \
123+
$(INST)/$(GSL) \
124+
$(INST)/$(IML) \
125+
$(INST)/$(JINJA2) \
126+
$(INST)/$(LCALC) \
127+
$(INST)/$(LRCALC) \
128+
$(INST)/$(LIBGAP) \
129+
$(INST)/$(LIBPNG) \
130+
$(INST)/$(LINBOX) \
131+
$(INST)/$(M4RI) \
132+
$(INST)/$(M4RIE) \
133+
$(INST)/$(MPC) \
134+
$(INST)/$(MPFI) \
135+
$(INST)/$(MPFR) \
136+
$(INST)/$(SAGE_MP_LIBRARY) \
137+
$(INST)/$(NTL) \
138+
$(INST)/$(NUMPY) \
139+
$(INST)/$(PARI) \
140+
$(INST)/$(PLANARITY) \
141+
$(INST)/$(POLYBORI) \
142+
$(INST)/$(PPL) \
143+
$(INST)/$(PYNAC) \
144+
$(INST)/$(PYTHON) \
145+
$(INST)/$(RATPOINTS) \
146+
$(INST)/$(READLINE) \
147+
$(INST)/$(RW) \
148+
$(INST)/$(SINGULAR) \
149+
$(INST)/$(SIX) \
150+
$(INST)/$(SYMMETRICA) \
151+
$(INST)/$(ZN_POLY)
124152
if [ -z "$$SAGE_INSTALL_FETCH_ONLY" ]; then \
125153
cd $(SAGE_SRC) && source bin/sage-env && \
126-
$(PIPE) 'time $(MAKE) sage 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log' && \
127-
touch $@; \
154+
$(PIPE) 'time $(MAKE) sage 2>&1' 'tee -a $(SAGE_LOGS)/sage-$(SAGE_VERSION).log'; \
128155
fi
129156

130157

@@ -143,3 +170,64 @@ $(SAGE_LOCAL)/bin/%: $(SAGE_SRC)/bin/%
143170
$(SAGE_EXTCODE)/%: $(SAGE_SRC)/ext/%
144171
@mkdir -p "$(@D)"
145172
cp $< $@
173+
174+
175+
###############################################################################
176+
# Building the documentation
177+
###############################################################################
178+
179+
# You can choose to have the built HTML version of the documentation link to
180+
# the PDF version. To do so, you need to build both the HTML and PDF versions.
181+
# To have the HTML version link to the PDF version, do
182+
#
183+
# $ ./sage --docbuild all html
184+
# $ ./sage --docbuild all pdf
185+
#
186+
# For more information on the docbuild utility, do
187+
#
188+
# $ ./sage --docbuild -H
189+
190+
# Building the documentation has many dependencies, because all
191+
# documented modules are imported and because we use matplotlib to
192+
# produce plots.
193+
DOC_DEPENDENCIES = sagelib $(INST)/$(SPHINX) $(INST)/$(SAGENB) \
194+
| $(SAGERUNTIME) $(INST)/$(MAXIMA) $(INST)/$(NETWORKX) \
195+
$(INST)/$(SCIPY) $(INST)/$(MATPLOTLIB) $(INST)/$(PILLOW)
196+
197+
doc: doc-html
198+
199+
doc-html: $(DOC_DEPENDENCIES)
200+
cd .. && $(PIPE) "./sage --docbuild --no-pdf-links all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
201+
202+
# 'doc-html-no-plot': build docs without building the graphics coming
203+
# from the '.. plot' directive, in case you want to save a few
204+
# megabytes of disk space. 'doc-clean' is a prerequisite because the
205+
# presence of graphics is cached in src/doc/output.
206+
doc-html-no-plot: doc-clean $(DOC_DEPENDENCIES)
207+
cd .. && $(PIPE) "./sage --docbuild --no-pdf-links --no-plot all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
208+
209+
doc-html-mathjax: $(DOC_DEPENDENCIES)
210+
cd .. && $(PIPE) "./sage --docbuild --no-pdf-links all html -j $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
211+
212+
# Keep target 'doc-html-jsmath' for backwards compatibility.
213+
doc-html-jsmath: doc-html-mathjax
214+
215+
doc-pdf: $(DOC_DEPENDENCIES)
216+
cd .. && $(PIPE) "./sage --docbuild all pdf $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/docpdf.log"
217+
218+
doc-clean:
219+
cd "$(SAGE_SRC)/doc" && $(MAKE) clean
220+
221+
222+
###############################################################################
223+
# Cleaning up
224+
###############################################################################
225+
226+
clean:
227+
@echo "Deleting package build directories..."
228+
rm -rf "$(SAGE_LOCAL)/var/tmp/sage/build"
229+
230+
lib-clean:
231+
cd "$(SAGE_SRC)" && $(MAKE) clean
232+
233+
build-clean: clean doc-clean lib-clean

‎build/install

+6-5
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,12 @@ filtered_packages_list all | while read PKG_NAME PKG_VERSION PKG_VAR; do
446446
echo >&5 "\$(INST)/$PKG_VERSION:$DEPS"
447447
echo >&5 " +\$(PIPE) \"\$(SAGE_SPKG) \$($PKG_VAR) 2>&1\" \"tee -a \$(SAGE_LOGS)/\$($PKG_VAR).log\""
448448
echo >&5
449+
450+
# Add a target with just the bare package name such that
451+
# "make ccache" for example builds the ccache package with
452+
# dependency checking.
453+
echo >&5 "$PKG_NAME: \$(INST)/\$($PKG_VAR)"
454+
echo >&5
449455
done
450456

451457
# Close the Makefile
@@ -523,9 +529,4 @@ if [ "$1" = "all" ]; then
523529
echo
524530
echo "at the Sage command prompt ('sage:')."
525531
echo
526-
echo "If you issued 'make', 'make all', or a similar command, then the"
527-
echo "HTML version of the documentation will be built right now."
528-
echo "Otherwise, if you want to (re)build the HTML documentation,"
529-
echo "run 'make doc'. To build the PDF version, run 'make doc-pdf'."
530-
echo
531532
fi

0 commit comments

Comments
 (0)