From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 26 May 2009 01:54:15 +0000 (+0000)
Subject: windows-top-makefile-20090525
X-Git-Tag: openafs-devel-1_5_61~290
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=2f7046eff6599d9a66a7f31bb6f33b7f88646db5

windows-top-makefile-20090525

LICENSE MIT

add rules for building documentation sources

add option for including cygwin libs in wix installer
---

diff --git a/src/NTMakefile b/src/NTMakefile
index 7adbf66..15ec108 100644
--- a/src/NTMakefile
+++ b/src/NTMakefile
@@ -29,6 +29,12 @@ AFS_OBJDIR=$(AFSROOT)\obj\$(SYS_NAME)
 DESTDIR=$(AFSROOT)\dest\$(SYS_NAME)
 !ENDIF
 
+!IFNDEF NOCYGWIN
+WIXCYGOPT=-dCygwinArchives
+!ELSE
+WIXCYGOPT=
+!ENDIF
+
 CD = cd
 MKDIR = mkdir
 
@@ -37,7 +43,7 @@ NTMAKELANG = nmake /nologo  /f ntmakefile en_US
 NTMAKE_HEADERS = nmake /nologo  /f ntmakefile install_headers
 NTMAKE_OBJS = nmake /nologo /f ntmakefile install_objs
 
-#debug statement support jumping to last know error
+#debug statement support jumping to last known error
 DOCD=$(SRC)\DOLASTCMP.BAT
 
 config:
@@ -660,10 +666,24 @@ man-pages:
    $(NTMAKE)
    $(CD) ..\..
 
-NSIS.i386: loopback man-pages
+documentation:
+   @echo ***** $@
+   $(DOCD) $(DOC)\xml\ReleaseNotesWindows
+   $(CD) $(DOC)\xml\ReleaseNotesWindows
+   $(NTMAKE)
+   $(DOCD) ..\UserGuide
+   $(CD) ..\UserGuide
+   $(NTMAKE)
+   $(DOCD) ..\AdminGuide
+   $(CD) ..\AdminGuide
+   $(NTMAKE)
+   $(DOCD) ..\..\..
+   $(CD) ..\..\..
+
+NSIS.i386: loopback man-pages documentation
    @echo ***** Making NSIS Installer
-   $(DOCD) $(SRC)\WINNT\install\NSIS
-   $(CD) $(SRC)\WINNT\install\NSIS
+   $(DOCD) $(SRC)\WINNT\install\$@
+   $(CD) $(SRC)\WINNT\install\$@
    $(NTMAKE)
    $(CD) ..\..\..\..
 
@@ -672,17 +692,17 @@ NSIS.AMD64:
 
 NSIS: NSIS.$(CPU)
 
-wix: loopback man-pages
+wix: loopback man-pages documentation
    @echo ***** Making Wix MSI Installer
    $(DOCD) $(SRC)\WINNT\install\$@
    $(CD) $(SRC)\WINNT\install\$@
    $(NTMAKE)
    $(CD) ..\..\..\..
 
-media: install man-pages NSIS wix
+media: install NSIS wix
 
-install-nsis: install man-pages NSIS
+install-nsis: install NSIS
 
-install-wix: install man-pages wix
+install-wix: install wix