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

Commit

Permalink
Merge branch 'develop' into 22345
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnCremona committed Jul 8, 2018
2 parents 645c6b7 + 4ea72a1 commit 94f7114
Show file tree
Hide file tree
Showing 2,888 changed files with 215,936 additions and 83,560 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Unfortunately we are not accepting issues on GitHub yet. To report an issue,
please head over to https://trac.sagemath.org, log in with your GitHub account,
and create a ticket there :)
8 changes: 8 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Thanks for contributing to Sage! Unfortunately we are not accepting pull
requests on GitHub yet. To propose a change to Sage, please log in with your
GitHub account at https://trac.sagemath.org, create a ticket, and push your
changes to that ticket as explained in our
[Developer's Guide](https://doc.sagemath.org/html/en/developer/manual_git.html).

Please make sure to also have a look at our
[Code Style Conventions](https://doc.sagemath.org/html/en/developer/coding_basics.html).
2 changes: 1 addition & 1 deletion COPYING.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ extcode GPLv2+
fflas_ffpack LGPLv2.1+
flint GPLv2+
flintqs GPLv2+
fplll LGPLv2.1+
freetype FreeType License (similar to BSD; see below)
gap GPLv2+
gcc GPLv3+
Expand All @@ -72,7 +73,6 @@ jinja2 Modified BSD
jmol LGPLv2.1+
jsonschema MIT License
lcalc GPLv2+
libfplll LGPLv2.1+
libgap GPLv3+
libpng Custom, very similar to zlib
linbox LGPLv2.1+
Expand Down
33 changes: 30 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,27 @@

default: all

build: all-build
all: base-toolchain
$(MAKE) all-start

build: base-toolchain
$(MAKE) all-build

start: base-toolchain
$(MAKE) build-start

sageruntime: base-toolchain
$(MAKE) all-sageruntime


# The --stop flag below is just a random flag to induce graceful
# breakage with non-GNU versions of make.
# See https://trac.sagemath.org/ticket/24617

# Defer unknown targets to build/make/Makefile
%::
@if [ -x relocate-once.py ]; then ./relocate-once.py; fi
$(MAKE) build/make/Makefile
$(MAKE) build/make/Makefile --stop
+build/bin/sage-logger \
"cd build/make && ./install '$@'" logs/install.log

Expand All @@ -37,6 +52,13 @@ build/make/Makefile: configure build/make/deps build/pkgs/*/*
echo "Since 'SAGE_PORT' is set, we will try to build anyway."; \
fi; )

# This is used to monitor progress towards Python 3 and prevent
# regressions. The target "build" should be upgraded to reflect the
# level of Python 3 support that is known to work.
buildbot-python3: configure
./configure --with-python=3
$(MAKE) build

# Preemptively download all standard upstream source tarballs.
download:
export SAGE_ROOT=$$(pwd) && \
Expand Down Expand Up @@ -139,7 +161,12 @@ install: all
@echo "from https://github.com/sagemath/binary-pkg"
@echo "******************************************************************"

list:
@$(MAKE) --silent build/make/Makefile >&2
@$(MAKE) --silent -f build/make/Makefile SAGE_SPKG_INST=local $@

.PHONY: default build install micro_release \
misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \
test check testoptional testall testlong testoptionallong testallong \
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong
ptest ptestoptional ptestall ptestlong ptestoptionallong ptestallong \
buildbot-python3 list
Loading

0 comments on commit 94f7114

Please sign in to comment.