aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPhillip Lord2019-12-26 21:13:38 +0100
committerPhillip Lord2019-12-26 21:13:38 +0100
commit47a73e3e142bc816872cf66c5e95b867d3ad49b7 (patch)
treed1f8c2bfe8fc87ef7ea88b71bb4206eb5fd3e970 /admin
parentcd559841537726315d72a303447140f71e34f635 (diff)
downloademacs-47a73e3e142bc816872cf66c5e95b867d3ad49b7.tar.gz
emacs-47a73e3e142bc816872cf66c5e95b867d3ad49b7.zip
Update Windows build documentation
* admin/nt/dist-build/README-scripts: Update with branch and snapshot information.
Diffstat (limited to 'admin')
-rw-r--r--admin/nt/dist-build/README-scripts53
1 files changed, 49 insertions, 4 deletions
diff --git a/admin/nt/dist-build/README-scripts b/admin/nt/dist-build/README-scripts
index 1c62a866724..4c3554e8df5 100644
--- a/admin/nt/dist-build/README-scripts
+++ b/admin/nt/dist-build/README-scripts
@@ -68,7 +68,8 @@ uploaded.
68Build Process 68Build Process
69------------- 69-------------
70 70
71For each major version: 71For each major version
72----------------------
72 73
73The dependencies files need to be created. This can be around the time 74The dependencies files need to be created. This can be around the time
74of the pre-tests, then used for all releases of that version, to 75of the pre-tests, then used for all releases of that version, to
@@ -78,9 +79,9 @@ To do this:
78 79
79Update msys to the latest version with `pacman -Syu`. 80Update msys to the latest version with `pacman -Syu`.
80 81
81Then run build-dep-zips.py, in this directory. Three zips will be 82Then run build-dep-zips.py, in the ~/emacs-build/deps directory. Three
82created, containing the 64bit and 32bit dependencies, as well as the 83zips will be created, containing the 64bit and 32bit dependencies, as
83source for these. 84well as the source for these.
84 85
85For emacs release or pre-test version: 86For emacs release or pre-test version:
86 87
@@ -90,3 +91,47 @@ with the tag of the last version.
90Then run `build-zips.sh` in this worktree. Eventually, four new zip 91Then run `build-zips.sh` in this worktree. Eventually, four new zip
91files will be created in ~/emacs-upload from where they can be signed 92files will be created in ~/emacs-upload from where they can be signed
92and uploaded with `gnupload`. 93and uploaded with `gnupload`.
94
95
96For snapshots from Master
97-------------------------
98
99Snapshots are generally created from master when there is a release
100branch on which a release has already been created. At this point,
101only pre-tests or full releases need to happen from the release
102branch.
103
104To do this:
105
106Update msys to the latest version with `pacman -Syu`.
107
108Then run build-dep-zips.py, in ~/emacs-build/deps directory. Three
109zips will be created, containing the 64bit and 32bit dependencies, as
110well as the source for these. These deps files contain the date of
111creation in their name. The deps file can be reused as desired, or a
112new version created. Where multiple deps files exist, the most
113recent will be used.
114
115Now, run `build-zips.sh -s` to build a snapshot release.
116
117
118For snapshots from a Release Branch
119-----------------------------------
120
121Snapshots can be built from a release branch; this is really only
122useful before a pre-test has happened.
123
124The process is the same as for building from the master branch, except
125that the release branch should already exist as a worktree, and the
126version number must be added to the command line with `build-zips.sh
127-V 27 -s`. The final zips will be named after the branch rather than
128the version (e.g emacs-27-2019-12-26.zip) rather than than the Emacs
129version (e.g emacs-27.0.50.zip).
130
131For snapshots from another branch
132---------------------------------
133
134Snapshots can be build from any other branch. There is rarely a need
135to do this, except where some significant, wide-ranging feature is
136being added on a feature branch. In this case, the branch can be
137given using `build-zips.sh -b pdumper -s` for example.