[Vm-dev] [commit] r2588 - Fix the Newspeak installer to include the manifest file.

Author: eliot Date: 2012-08-24 13:33:58 -0700 (Fri, 24 Aug 2012) New Revision: 2588

Added: branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in branches/Cog/nscogbuild/cygwinbuild/installer/index.html branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk Log: Fix the Newspeak installer to include the manifest file.

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ -Sources {@@FRESH_GUID4@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Sources {@@FRESH_GUID3@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s72 S38 s72 i2 S255 S72 Component Component AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ -Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@ -Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ -Documentation {@@FRESH_GUID4@@} DOCDIR 0 index.html +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Documentation {@@FRESH_GUID3@@} DOCDIR 0 index.html

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,5 @@ s38 s72 FeatureComponents Feature_ Component_ Typical AdvertisedShortcut +Typical Support Typical Sources -Typical Support1 -Typical Support2

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,5 +2,5 @@ s38 s72 FeatureComponents Feature_ Component_ Typical AdvertisedShortcut -Typical Support1 -Typical Support2 +Typical Support +Typical Documentation

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 -@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 @@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,6 @@ s72 s72 l255 i4 S72 S20 I2 i2 File File @@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 -@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1 -@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 index.html Documentation index.htm|index.html 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:33:58 UTC (rev 2588) @@ -15,9 +15,15 @@ VM_EXECUTABLE := $(VM_BASE_NAME).exe VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest +VM_MANIFEST_8DOT3 := $(VM_BASE_NAME).man VM_ICON := $(VM_BASE_NAME).ico SOURCEFILENAME1 := SqueakV41.sources

+CAB_FILES := $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) +ifeq ($(strip $(SOURCES)),yes) +CAB_FILES := $(CAB_FILES) $(SOURCEFILENAME1) +endif + CC := /usr/bin/gcc CP := /usr/bin/cp SED := /usr/bin/sed

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-24 20:33:58 UTC (rev 2588) @@ -2,6 +2,7 @@ SED_RULES += -e 's%@@VM_EXECUTABLE@@%$(VM_EXECUTABLE)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE_MAP@@%$(VM_EXECUTABLE_MAP)%g;' SED_RULES += -e 's%@@VM_EXECUTABLE_MANIFEST@@%$(VM_EXECUTABLE_MANIFEST)%g;' +SED_RULES += -e 's%@@VM_MANIFEST_8DOT3@@%$(VM_MANIFEST_8DOT3)%g;' SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;'

Added: branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in (rev 0) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files-with-sources.ddf.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -0,0 +1,15 @@ +.Set Cabinet=ON +.Set CabinetNameTemplate=files.cab +.Set Compress=ON +.Set CompressionType=LZX +.Set DiskDirectoryTemplate= +.Set MaxDiskSize=0 +.Set RptFileName=nul +.Set InfFileName=nul +.Set UniqueFiles=ON +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).as... +@@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +%SourcesDir%@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ +@@VM_EXECUTABLE_MAP@@

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-24 20:33:58 UTC (rev 2588) @@ -7,8 +7,9 @@ .Set RptFileName=nul .Set InfFileName=nul .Set UniqueFiles=ON -; For unknown reasons, it is important that the files come in this exact order +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).as... @@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +index.html index.html @@VM_EXECUTABLE_MAP@@ -@@VM_EXECUTABLE_MANIFEST@@ -%SourcesDir%@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/index.html =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/index.html 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/index.html 2012-08-24 20:33:58 UTC (rev 2588) @@ -5,8 +5,11 @@ <title>Newspeak Documentation</title> </head> <body> + <H3>Newspeak Documentation</H3> <div class="documentationIndex"> - <div class="documentationItem"><a class="localFile" href="newspeak-101.pdf">Tutorial</a></div> + <div class="documentationItem"><a href="http://www.newspeaklanguage.org">Website</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-101.pdf">Tutorial</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-spec.pdf">Specification</a></div> </div> </body> </html>

Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-21 01:25:17 UTC (rev 2587) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 20:33:58 UTC (rev 2588) @@ -37,8 +37,7 @@ FRESH_GUID_RULE1 = -e 's/@@FRESH_GUID1@@/$(FRESH_GUID)/g;' FRESH_GUID_RULE2 = -e 's/@@FRESH_GUID2@@/$(FRESH_GUID)/g;' FRESH_GUID_RULE3 = -e 's/@@FRESH_GUID3@@/$(FRESH_GUID)/g;' -FRESH_GUID_RULE4 = -e 's/@@FRESH_GUID4@@/$(FRESH_GUID)/g;' -FRESH_GUID_RULE = $(FRESH_GUID_RULE1) $(FRESH_GUID_RULE2) $(FRESH_GUID_RULE3) $(FRESH_GUID_RULE4) +FRESH_GUID_RULE = $(FRESH_GUID_RULE1) $(FRESH_GUID_RULE2) $(FRESH_GUID_RULE3)

REGULAR_IDTS := Feature.idt REGULAR_IDTS += Icon.idt @@ -53,11 +52,13 @@ SOURCES_IDTS += Component.idt SOURCES_IDTS += FeatureComponents.idt File.idt : File-with-sources.idt.in +files.ddf : files-with-sources.ddf.in else REGULAR_IDTS += Directory.idt REGULAR_IDTS += Component.idt REGULAR_IDTS += FeatureComponents.idt File.idt : File.idt.in +files.ddf : files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) endif

IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) @@ -111,7 +112,7 @@ gcc -mwindows $^ -o $@ strip $@

-files.ddf: files.ddf.in $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) +files.ddf: $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp mv $@.tmp $@