Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 06e09c5

Browse files
committedFeb 13, 2020
Install several optional packages by default.
These are *most* of the packages on which OptionalExtensions in sagelib are dependent, so those OptionalExtensions are now built as well. Notable examples that are not included yet are sirocco and meataxe (don't build on Cygwin yet, but will soon), and fes (lacks a modern SPKG).
1 parent c79eb32 commit 06e09c5

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed
 

‎CHANGES.md

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ Changelog for the Windows Installer
44
0.6.0 (unreleased)
55
------------------
66

7+
* The following optional packages, and their associated Sage extensions are
8+
now come pre-installed by default:
9+
10+
* bliss
11+
* coxeter3
12+
* mcqd
13+
* primecount
14+
* tdlib
15+
716
* Downgraded Cygwin version in order to fix an issue with running external
817
Windows programs from Sage (in particular, this caused problems when
918
running external LaTeX distributions (#42).

‎Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ SAGE_ENVVARS:=\
7373
FFLAS_FFPACK_CONFIGURE=--disable-openmp \
7474
MAKE=\"make -j$(N_CPUS)\"
7575

76+
SAGE_OPTIONAL_PACKAGES=bliss coxeter3 mcqd primecount tdlib
77+
7678
# Outputs representing success in the Sage build process
7779
SAGE_CONFIGURE=$(SAGE_ROOT_BUILD)/configure
7880
SAGE_MAKEFILE=$(SAGE_ROOT_BUILD)/build/make/Makefile
@@ -219,6 +221,10 @@ $(ENVS)/%-$(SAGE_VERSION)-$(ARCH): cygwin-sage-%-$(ARCH).list $(CYGWIN_SETUP)
219221
$(SAGE_STARTED): $(SAGE_MAKEFILE)
220222
$(SUBCYG) "$(ENV_BUILD_DIR)" \
221223
"cd $(SAGE_ROOT) && $(SAGE_ENVVARS) make start"
224+
# Install pre-installed optional packages and run make build again to
225+
# intall sagelib optional extensions that use those packages
226+
$(SUBCYG) "$(ENV_BUILD_DIR)" \
227+
"cd $(SAGE_ROOT) && $(SAGE_ENVVARS) ./sage -i $(SAGE_OPTIONAL_PACKAGES) && make build"
222228

223229

224230
$(SAGE_MAKEFILE): $(SAGE_CONFIGURE)

0 commit comments

Comments
 (0)
This repository has been archived.