Skip to content
This repository was archived by the owner on Oct 29, 2024. It is now read-only.

Commit cfa9887

Browse files
committed
Add the ability to add additional patches when building the Windows release
1 parent 1f47a6a commit cfa9887

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

CHANGES.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
Changelog for the Windows Installer
22
===================================
33

4-
0.4.3 (unreleased)
4+
0.4.3 (2019-04-18)
55
------------------
66

7-
* Nothing changed yet.
7+
* Not a change to the installer itself but to the build toolchain, allowing
8+
version-specific patches to be applied after a Sage release. From
9+
time-to-time critical bugs are found and fixed in Sage only after an
10+
official release. And Sage's development process is not quick enough
11+
about making new releases. So we add the ability to include post-release
12+
patches as needed.
813

914

1015
0.4.2 (2019-02-11)

Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ cygwin-runtime-extras=$(STAMPS)/cygwin-runtime-extras-$(SAGE_VERSION)-$(ARCH)
3737
###############################################################################
3838

3939
# Resource paths
40+
PATCHES=patches
4041
CYGWIN_EXTRAS=cygwin_extras
4142
RESOURCES=resources
4243
DOT_SAGE=dot_sage
@@ -218,6 +219,13 @@ $(SAGE_CONFIGURE): | $(SAGE_ROOT_BUILD)
218219
$(SAGE_ROOT_BUILD): $(cygwin-build)
219220
[ -d $(dir $(SAGE_ROOT_BUILD)) ] || mkdir $(dir $(SAGE_ROOT_BUILD))
220221
$(SUBCYG) "$(ENV_BUILD_DIR)" "(cd /opt && git clone --single-branch --branch $(SAGE_BRANCH) $(SAGE_GIT) $(SAGE_ROOT))"
222+
# Apply patches
223+
if [ -d $(PATCHES)/$(SAGE_BRANCH) ]; then \
224+
for patch in $(PATCHES)/$(SAGE_BRANCH)/*.patch; do \
225+
patch="$$(pwd)/$$patch"; \
226+
(cd $(SAGE_ROOT_BUILD) && patch -p1 < $$patch); \
227+
done; \
228+
fi
221229

222230

223231
$(CYGWIN_SETUP): | $(DOWNLOAD)

0 commit comments

Comments
 (0)