Author: eliot Date: 2012-08-24 14:48:53 -0700 (Fri, 24 Aug 2012) New Revision: 2590
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk Log: tweak some dependencies for the Newspeak installer.
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 20:42:26 UTC (rev 2589) +++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-24 21:48:53 UTC (rev 2590) @@ -29,7 +29,7 @@ SED := /usr/bin/sed WINDRES := /usr/bin/windres
-icon.o: ../nsvm.rc +icon.o: ../$(VM_BASE_NAME).rc $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@
$(VM_EXECUTABLE): ../build/vm/$(VM_EXECUTABLE)
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk =================================================================== --- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 20:42:26 UTC (rev 2589) +++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-24 21:48:53 UTC (rev 2590) @@ -53,12 +53,14 @@ SOURCES_IDTS += FeatureComponents.idt File.idt : File-with-sources.idt.in files.ddf : files-with-sources.ddf.in +files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(SOURCEFILENAME1) 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) +files.ddf : files.ddf.in $(DOCUMENTATION_FILES) $(DOCUMENTATION_INDEX) +files.cab : files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) endif
IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) @@ -117,13 +119,13 @@ @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp mv $@.tmp $@
-File.idt: $(DOCUMENTATION_FILES) +File.idt: Makefile File.idt: $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp echo $(foreach docfile,$(strip $(DOCUMENTATION_FILES)), '$(notdir $(docfile))' '$(call dosname,$(notdir $(docfile)))' '$(notdir $(docfile))') | xargs -r -n 3 printf '%s\tDocumentation\t%s|%s\t0\t\t\t16896\t1\n' >> $@.tmp mv $@.tmp $@
-files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1) +files.cab: makecab /D SourcesDir='$(shell cygpath -wa .)' /f $< @echo