[gs-cvs] rev 8654 - trunk/gs/src

[ghostgum at ghostscript.com]

Author: ghostgum
Date: 2008-04-21 04:58:27 -0700 (Mon, 21 Apr 2008)
New Revision: 8654

Modified:
   trunk/gs/src/msvc32.mak
   trunk/gs/src/winint.mak
Log:
Change the name of a utility used to build Windows distribution so it doesn't 
get treated as a setup program by Windows Vista.
Change reference to obsolete doc/Public.htm to doc/COPYING.
Allow makefile to recognise a later patch of the Microsoft Visual Studio 2005 
make utility.


Modified: trunk/gs/src/msvc32.mak
===================================================================
--- trunk/gs/src/msvc32.mak	2008-04-20 23:40:49 UTC (rev 8653)
+++ trunk/gs/src/msvc32.mak	2008-04-21 11:58:27 UTC (rev 8654)
@@ -355,7 +355,10 @@
 !if "$(_NMAKE_VER)" == "8.00.50727.42"
 MSVC_VERSION=8
 !endif
+!if "$(_NMAKE_VER)" == "8.00.50727.762"
+MSVC_VERSION=8
 !endif
+!endif
 
 !ifndef MSVC_VERSION
 MSVC_VERSION=6

Modified: trunk/gs/src/winint.mak
===================================================================
--- trunk/gs/src/winint.mak	2008-04-20 23:40:49 UTC (rev 8653)
+++ trunk/gs/src/winint.mak	2008-04-21 11:58:27 UTC (rev 8654)
@@ -241,6 +241,7 @@
 !endif
 zip: $(SETUP_XE) $(UNINSTALL_XE)
 	cd ..
+	copy gs$(GS_DOT_VERSION)\$(SETUP_XE) make_filelist.exe
 	copy gs$(GS_DOT_VERSION)\$(SETUP_XE) .
 	copy gs$(GS_DOT_VERSION)\$(UNINSTALL_XE) .
 	echo $(ZIPPROGFILE1) >  $(ZIPTEMPFILE)
@@ -251,8 +252,8 @@
 	echo $(ZIPPROGFILE6) >> $(ZIPTEMPFILE)
 	echo $(ZIPPROGFILE7) >> $(ZIPTEMPFILE)
 	echo $(ZIPPROGFILE8) >> $(ZIPTEMPFILE)
-	$(SETUP_XE_NAME) -title "GPL Ghostscript $(GS_DOT_VERSION)" -dir "gs$(GS_DOT_VERSION)" -list "$(FILELIST_TXT)" @$(ZIPTEMPFILE)
-	$(SETUP_XE_NAME) -title "GPL Ghostscript Fonts" -dir "fonts" -list "$(FONTLIST_TXT)" $(ZIPFONTFILES)
+	make_filelist.exe -title "GPL Ghostscript $(GS_DOT_VERSION)" -dir "gs$(GS_DOT_VERSION)" -list "$(FILELIST_TXT)" @$(ZIPTEMPFILE)
+	make_filelist -title "GPL Ghostscript Fonts" -dir "fonts" -list "$(FONTLIST_TXT)" $(ZIPFONTFILES)
 	-del $(ZIPTARGET).zip
 	$(ZIP_XE) -9 $(ZIPTARGET).zip $(SETUP_XE_NAME) $(UNINSTALL_XE_NAME) $(FILELIST_TXT) $(FONTLIST_TXT)
 	$(ZIP_XE) -9 -r $(ZIPTARGET).zip $(ZIPFONTDIR)
@@ -265,6 +266,7 @@
 	$(ZIP_XE) -9 -r $(ZIPTARGET).zip $(ZIPPROGFILE7)
 	$(ZIP_XE) -9 -r $(ZIPTARGET).zip $(ZIPPROGFILE8)
 	-del $(ZIPTEMPFILE)
+	-del make_filelist.exe
 	-del $(SETUP_XE_NAME)
 	-del $(UNINSTALL_XE_NAME)
 	-del $(FILELIST_TXT)
@@ -286,7 +288,7 @@
 	$(ECHOGS_XE) -a $(ZIP_RSP) -q -t -s $(PSOBJ)dialog.txt
 	$(ECHOGS_XE) -a $(ZIP_RSP) -q -c -s $(SETUP_XE_NAME)
 	$(ECHOGS_XE) -w $(PSOBJ)about.txt "GPL Ghostscript is Copyright " -x A9 " 2008 Artifex Software, Inc."
-	$(ECHOGS_XE) -a $(PSOBJ)about.txt See license in gs$(GS_DOT_VERSION)\doc\Public.htm.
+	$(ECHOGS_XE) -a $(PSOBJ)about.txt See license in gs$(GS_DOT_VERSION)\doc\COPYING.
 	$(ECHOGS_XE) -a $(PSOBJ)about.txt See gs$(GS_DOT_VERSION)\doc\Commprod.htm regarding commercial distribution.
 	$(ECHOGS_XE) -w $(PSOBJ)dialog.txt This installs GPL Ghostscript $(GS_DOT_VERSION).
 	$(ECHOGS_XE) -a $(PSOBJ)dialog.txt GPL Ghostscript displays, prints and converts PostScript and PDF files.