Skip to content

Commit abe6641

Browse files
committed
Revert "Use pre-built Emacs binaries on Windows."
This reverts commit 95450e4. Partial revert: only remove the _unpack code path from build_emacs.py since it moved to copy_tree.cc.
1 parent 279a318 commit abe6641

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

elisp/private/tools/build_emacs.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,25 +33,21 @@
3333
def main() -> None:
3434
"""Configures and builds Emacs."""
3535
parser = argparse.ArgumentParser(allow_abbrev=False)
36-
parser.add_argument('--release', action='store_true')
3736
parser.add_argument('--readme', type=pathlib.Path, required=True)
3837
parser.add_argument('--install', type=pathlib.Path, required=True)
3938
parser.add_argument(
4039
'--srcs', type=argparse.FileType('rt', encoding='utf-8'), required=True)
41-
parser.add_argument('--bash', type=pathlib.Path)
42-
parser.add_argument('--cc', type=pathlib.Path)
43-
parser.add_argument('--cflags')
44-
parser.add_argument('--ldflags')
40+
parser.add_argument('--bash', type=pathlib.Path, required=True)
41+
parser.add_argument('--cc', type=pathlib.Path, required=True)
42+
parser.add_argument('--cflags', required=True)
43+
parser.add_argument('--ldflags', required=True)
4544
parser.add_argument('--module-header', type=pathlib.Path)
4645
args = parser.parse_args()
4746
source = args.readme.parent
4847
install = args.install.resolve()
4948

50-
if args.release:
51-
_unpack(source=source, install=install, lines=args.srcs)
52-
else:
53-
_build(source=source, install=install, lines=args.srcs, bash=args.bash,
54-
cc=args.cc, cflags=args.cflags, ldflags=args.ldflags)
49+
_build(source=source, install=install, lines=args.srcs, bash=args.bash,
50+
cc=args.cc, cflags=args.cflags, ldflags=args.ldflags)
5551

5652
if args.module_header:
5753
# Copy emacs-module.h to the desired location.

0 commit comments

Comments
 (0)