[Vm-dev] [commit] r2587 - Add a manifest file to the windows VMs
that causes the V6 controls to be used
commits at squeakvm.org
commits at squeakvm.org
Tue Aug 21 01:25:17 UTC 2012
Author: eliot
Date: 2012-08-20 18:25:17 -0700 (Mon, 20 Aug 2012)
New Revision: 2587
Added:
branches/Cog/cygwinbuild/Croquet.exe.manifest
branches/Cog/cygwinbuild/Pharo.exe.manifest
branches/Cog/cygwinbuild/Squeak.exe.manifest
branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest
Modified:
branches/Cog/cygwinbuild/Makefile
branches/Cog/nscogbuild/cygwinbuild/Makefile
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/installer-Windows.gmk
branches/Cog/nscogbuild/cygwinbuild/nsvm.rc
branches/Cog/scripts/mkvmarchives
Log:
Add a manifest file to the windows VMs that causes the V6 controls to be used
(nicer buttons etc). Modify the Newspeak installer and VM archive script to
include the manifest file.
Added: branches/Cog/cygwinbuild/Croquet.exe.manifest
===================================================================
--- branches/Cog/cygwinbuild/Croquet.exe.manifest (rev 0)
+++ branches/Cog/cygwinbuild/Croquet.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+ version="1.0.0.0"
+ processorArchitecture="*"
+ name="www.mirandabanda.org.Cog.Croquet"
+ type="win32"
+/>
+<description>Croquet Virtual Machine</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
Modified: branches/Cog/cygwinbuild/Makefile
===================================================================
--- branches/Cog/cygwinbuild/Makefile 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/cygwinbuild/Makefile 2012-08-21 01:25:17 UTC (rev 2587)
@@ -355,6 +355,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
+ $(CP) $(VM).exe.manifest $(OBJDIR)
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Added: branches/Cog/cygwinbuild/Pharo.exe.manifest
===================================================================
--- branches/Cog/cygwinbuild/Pharo.exe.manifest (rev 0)
+++ branches/Cog/cygwinbuild/Pharo.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+ version="1.0.0.0"
+ processorArchitecture="*"
+ name="www.mirandabanda.org.Cog.Pharo"
+ type="win32"
+/>
+<description>Pharo Smalltalk Virtual Machine</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
Added: branches/Cog/cygwinbuild/Squeak.exe.manifest
===================================================================
--- branches/Cog/cygwinbuild/Squeak.exe.manifest (rev 0)
+++ branches/Cog/cygwinbuild/Squeak.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+ version="1.0.0.0"
+ processorArchitecture="*"
+ name="www.mirandabanda.org.Cog.Squeak"
+ type="win32"
+/>
+<description>Squeak Smalltalk Virtual Machine</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
Modified: branches/Cog/nscogbuild/cygwinbuild/Makefile
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/Makefile 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/Makefile 2012-08-21 01:25:17 UTC (rev 2587)
@@ -314,6 +314,7 @@
$(VMRES): $(BASEDIR)/$(VM).rc
$(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@
+ $(CP) $(VM).exe.manifest $(OBJDIR)
resource.o: $(VMRES)
$(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/Component-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,5 +2,6 @@
s72 S38 s72 i2 S255 S72
Component Component
AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@
-Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@
-Sources {@@FRESH_GUID3@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@
+Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@
+Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@
+Sources {@@FRESH_GUID4@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/Component.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,5 +2,6 @@
s72 S38 s72 i2 S255 S72
Component Component
AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@
-Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@
-Documentation {@@FRESH_GUID3@@} DOCDIR 0 index.html
+Support1 {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MAP@@
+Support2 {@@FRESH_GUID3@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@
+Documentation {@@FRESH_GUID4@@} 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-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -3,4 +3,5 @@
FeatureComponents Feature_ Component_
Typical AdvertisedShortcut
Typical Sources
-Typical Support
+Typical Support1
+Typical Support2
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/FeatureComponents.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,5 +2,5 @@
s38 s72
FeatureComponents Feature_ Component_
Typical AdvertisedShortcut
-Typical Documentation
-Typical Support
+Typical Support1
+Typical Support2
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/File-with-sources.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,5 +2,6 @@
s72 s72 l255 i4 S72 S20 I2 i2
File File
@@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1
-@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1
+@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1
+@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1
@@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/File.idt.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,5 +2,6 @@
s72 s72 l255 i4 S72 S20 I2 i2
File File
@@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1
-@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1
+@@VM_EXECUTABLE_MAP@@ Support1 @@VM_EXECUTABLE_MAP@@ 0 16896 1
+@@VM_EXECUTABLE_MANIFEST@@ Support2 @@VM_EXECUTABLE_MANIFEST@@ 0 16896 1
index.html Documentation index.htm|index.html 0 16896 1
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/Makefile
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/Makefile 2012-08-21 01:25:17 UTC (rev 2587)
@@ -14,6 +14,7 @@
# Cab contents:
VM_EXECUTABLE := $(VM_BASE_NAME).exe
VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map
+VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest
VM_ICON := $(VM_BASE_NAME).ico
SOURCEFILENAME1 := SqueakV41.sources
@@ -33,6 +34,10 @@
rm -f $@
cp $< $@
+$(VM_EXECUTABLE_MANIFEST): ../build/vm/$(VM_EXECUTABLE_MANIFEST)
+ rm -f $@
+ cp $< $@
+
echovars:
@echo '$$(VERSION)='$(VERSION)
@echo '$$(VM_ICON)='$(VM_ICON)
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/branding-sed-rules.gmk 2012-08-21 01:25:17 UTC (rev 2587)
@@ -1,6 +1,7 @@
SED_RULES := -e 's%@@BRAND_DIR@@%$(SHORT_BRAND_DIR)|$(BRAND_DIR)%g;'
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_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;'
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/files.ddf.in 2012-08-21 01:25:17 UTC (rev 2587)
@@ -10,4 +10,5 @@
; For unknown reasons, it is important that the files come in this exact order
@@VM_EXECUTABLE@@
@@VM_EXECUTABLE_MAP@@
+@@VM_EXECUTABLE_MANIFEST@@
%SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@
Modified: branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/installer/installer-Windows.gmk 2012-08-21 01:25:17 UTC (rev 2587)
@@ -62,10 +62,10 @@
IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS)
-$(REGULAR_IDTS) : %.idt : %.idt.in
+$(REGULAR_IDTS) : %.idt : %.idt.in Makefile
$(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@
-$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in
+$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in Makefile
$(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@
SED_FILTER_CONTROL := -e 's/1\(\t\t[[]DialogBitmap]\)/1048577\1/g;'
@@ -122,7 +122,7 @@
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) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1)
+files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(DOCUMENTATION_FILES) $(SOURCEFILENAME1)
makecab /D SourcesDir='$(shell cygpath -wa .)' /f $<
@echo
@@ -141,4 +141,4 @@
installer: $(MSI_NAME)
clean::
- -rm -rf $(IDTS) Icon Binary Binary.idt *.msi "$(BRAND_DIR)" files.ddf files.cab setup.inf nopMain.o Control.idt.orig Control.idt copyright.rtf
+ -rm -rf $(IDTS) Icon Binary Binary.idt *.msi "$(BRAND_DIR)" files.ddf files.cab setup.inf nopMain.o Control.idt.orig Control.idt copyright.rtf icon.o
Added: branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest (rev 0)
+++ branches/Cog/nscogbuild/cygwinbuild/nsvm.exe.manifest 2012-08-21 01:25:17 UTC (rev 2587)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+ version="1.0.0.0"
+ processorArchitecture="*"
+ name="www.mirandabanda.org.Cog.Newspeak"
+ type="win32"
+/>
+<description>Newspeak Virtual Machine</description>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
Modified: branches/Cog/nscogbuild/cygwinbuild/nsvm.rc
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/nscogbuild/cygwinbuild/nsvm.rc 2012-08-21 01:25:17 UTC (rev 2587)
@@ -2,4 +2,13 @@
1 ICON DISCARDABLE "nsvm.ico"
2 ICON DISCARDABLE "nsvm.ico"
3 ICON DISCARDABLE "nsvm.ico"
+#ifndef RT_MANIFEST
+# define RT_MANIFEST 24
#endif
+
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+# define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nsvm.exe.manifest"
+#endif
Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2012-08-15 02:22:30 UTC (rev 2586)
+++ branches/Cog/scripts/mkvmarchives 2012-08-21 01:25:17 UTC (rev 2587)
@@ -76,7 +76,7 @@
if [ -n "$CW" ]; then
test -d cogwin || mkdir cogwin
rm -rf cogwin/* cogwin.zip
- ln cygwinbuild/build/vm/{Croquet.exe,Croquet.ini,Croquet.map} cogwin
+ ln cygwinbuild/build/vm/{Croquet.exe,Croquet.ini,Croquet.map,Croquet.exe.manifest} cogwin
ln cygwinbuild/build/vm/{CroquetConsole.exe,CroquetConsole.ini,CroquetConsole.map} cogwin
ln cygwinbuild/build/vm/*.dll cogwin
zip -vr cogwin.zip cogwin
@@ -85,7 +85,7 @@
if [ -n "$CTW" ]; then
test -d cogmtwin || mkdir cogmtwin
rm -rf cogmtwin/* cogmtwin.zip
- ln cygwinbuild/buildmt/vm/{Croquet.exe,Croquet.ini,Croquet.map} cogmtwin
+ ln cygwinbuild/buildmt/vm/{Croquet.exe,Croquet.ini,Croquet.map,Croquet.exe.manifest} cogmtwin
ln cygwinbuild/buildmt/vm/{CroquetConsole.exe,CroquetConsole.ini,CroquetConsole.map} cogmtwin
ln cygwinbuild/buildmt/vm/*.dll cogmtwin
zip -vr cogmtwin.zip cogmtwin
@@ -106,7 +106,7 @@
if [ -n "$NW" ]; then
test -d nsvmwin || mkdir nsvmwin
rm -rf nsvmwin/* nsvmwin.zip
- ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map} nsvmwin
+ ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map,nsvm.exe.manifest} nsvmwin
ln $NSB/cygwinbuild/build/vm/*.dll nsvmwin
zip -vr nsvmwin.zip nsvmwin
EXES="$EXES nsvmwin/nsvm.exe"
More information about the Vm-dev
mailing list