Skip to content

Commit 62ef077

Browse files
authored
Remove the NMAKE build system for installers (#65)
It stopped working in early 2017 after version 9.6.1.
1 parent 59728b9 commit 62ef077

File tree

4 files changed

+5
-100
lines changed

4 files changed

+5
-100
lines changed

installer/README.txt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ WiX may be downloaded from:
88
http://wix.codeplex.com/
99

1010

11-
Two parallel systems to build the installers are currently provided:
12-
13-
POWERSHELL BASED
11+
HOW TO BUILD
1412
----------
1513

1614
Ensure that suitable binaries are in the parent directory Release build outputs
@@ -30,10 +28,5 @@ and try again.
3028

3129
Note that these installer generators use the configuration file prepared by the
3230
PowerShell scripts in ..\winbuild, defaulting to ..\winbuild\configuration.xml,
33-
so you can't just mix them with SDK- or NMake based compilation.
34-
35-
NMAKE BASED
36-
-----------
31+
so you can't just mix them with SDK-based compilation.
3732

38-
Use the top-level file (win64.mak), per the documentation in
39-
docs/win32-compilation.html, to build installers using NMake.

installer/installer.mak

Lines changed: 0 additions & 42 deletions
This file was deleted.

installer/productcodes.mak

Lines changed: 0 additions & 34 deletions
This file was deleted.

win64.mak

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -316,29 +316,17 @@ unicode-driver:
316316
ansi-driver:
317317
$(MAKE) -f win64.mak ANSI_VERSION=yes
318318

319-
installer: unicode-driver ansi-driver
320-
cd installer && $(MAKE) -f installer.mak CFG=$(CFG)
321-
322-
# world target builds both 32-bit and 64-bit installers in one command.
323-
#
324-
# The "setenv" command, from Microsoft SDK, is used to switch the build
325-
# target. However, it only changes the environment for the current shell;
326-
# it is reset for the next command. So we cannot just call "setenv /x64"
327-
# here one one line and nmake one the next one. I also tried creating a .bat
328-
# file with the commands, but setenv contains a "EXIT /B" which stops the
329-
# script from executing. But we can launch a new cmd.exe and pass the
330-
# commands to it in stdin.
331319
world:
332320
cmd < <<
333321
setenv /x64
334-
$(MAKE) -f win64.mak installer CFG=$(CFG)
322+
$(MAKE) -f win64.mak unicode-driver ansi-driver CFG=$(CFG)
335323
setenv /x86
336-
$(MAKE) -f win64.mak installer CFG=$(CFG)
324+
$(MAKE) -f win64.mak unicode-driver ansi-driver CFG=$(CFG)
325+
>&2 echo The "world" target does not build installers anymore.
337326
<<
338327

339328
clean-world:
340329
-rd /Q /S x64_ANSI_Release x64_ANSI_Debug
341330
-rd /Q /S x64_Unicode_Release x64_Unicode_Debug
342331
-rd /Q /S x86_ANSI_Release x86_ANSI_Debug
343332
-rd /Q /S x86_Unicode_Release x86_Unicode_Debug
344-
cd installer && $(MAKE) /f installer.mak CFG=$(CFG) clean

0 commit comments

Comments
 (0)