From: Jeffrey Altman <jaltman@mit.edu>
Date: Mon, 21 Jun 2004 06:24:04 +0000 (+0000)
Subject: msi-wix-installer-20040620
X-Git-Tag: openafs-devel-1_3_65~42
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=b7aab5ea00d95f398d24472be998cd5cd9b08134;p=packages%2Fo%2Fopenafs.git

msi-wix-installer-20040620


Update README-NT to include details on Wix MSI installer builder.
Modify build system to create work directories and provide "wix"
and "install-wix" build targets
---

diff --git a/src/NTMakefile b/src/NTMakefile
index 62c19b334..ac03c9cd5 100644
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -608,12 +608,12 @@ NSIS:
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-#msi:
-#   echo ***** Making MSI Installer
-#   $(DOCD) $(SRC)\WINNT\install\$@
-#   $(CD) $(SRC)\WINNT\install\$@
-#   $(NTMAKE)
-#   $(CD) ..\..\..\..
+wix:
+   echo ***** Making Wix MSI Installer
+   $(DOCD) $(SRC)\WINNT\install\$@
+   $(CD) $(SRC)\WINNT\install\$@
+   $(NTMAKE)
+   $(CD) ..\..\..\..
 
 InstallShield5:
 	echo ***** afs_setup_utils
@@ -631,7 +631,7 @@ media: install InstallShield5 NSIS
 
 install-nsis: install NSIS
 
-install-msi: install msi
+install-wix: install wix
 
 install-is5: install InstallShield5
 
diff --git a/src/config/NTMakefile b/src/config/NTMakefile
index fb073793a..845814499 100644
--- a/src/config/NTMakefile
+++ b/src/config/NTMakefile
@@ -350,6 +350,12 @@ idirs: doclink
 !	IF (!EXIST($(OJT)\WINNT\install\NSIS))
 		$(MKDIR) $(OJT)\WINNT\install\NSIS
 !	ENDIF
+!	IF (!EXIST($(OJT)\WINNT\install\wix))
+		$(MKDIR) $(OJT)\WINNT\install\wix
+!	ENDIF
+!	IF (!EXIST($(OJT)\WINNT\install\wix\custom))
+		$(MKDIR) $(OJT)\WINNT\install\wix\custom
+!	ENDIF
 !	IF (!EXIST($(OJT)\WINNT\install\Win9x))
 		$(MKDIR) $(OJT)\WINNT\install\Win9x
 !	ENDIF