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 62c19b3..ac03c9c 100644 (file)
--- 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 fb07379..8458144 100644 (file)
--- 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