[Vm-dev] [commit][2982] Get the Newspeak windows installers to put the MSI in products, and differentiate

[commits at squeakvm.org]

Revision: 2982
Author:   eliot
Date:     2014-06-11 10:14:11 -0700 (Wed, 11 Jun 2014)
Log Message:
-----------
Get the Newspeak windows installers to put the MSI in products, and differentiate
the Spur and V3 products.

Modified Paths:
--------------
    branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk
    branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk
    branches/Cog/build.win32x86/newspeak.cog.v3/installer/installer-Windows.gmk

Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk	2014-06-11 15:25:46 UTC (rev 2981)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk	2014-06-11 17:14:11 UTC (rev 2982)
@@ -16,12 +16,12 @@
 
 # Product name as compiled into the executable and installers
 ifndef PRODUCT_NAME
-PRODUCT_NAME := Newspeak Virtual Machine
+PRODUCT_NAME := Newspeak Spur Virtual Machine
 endif
 
 # Base name of the installer (.msi is appended on Windows)
 ifndef INSTALLER_BASE_NAME
-INSTALLER_BASE_NAME := $(VM_BASE_NAME)
+INSTALLER_BASE_NAME := $(VM_BASE_NAME)-spur
 endif
 
 # Where to install the product (relative to C:/Program Files on

Modified: branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk	2014-06-11 15:25:46 UTC (rev 2981)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk	2014-06-11 17:14:11 UTC (rev 2982)
@@ -108,6 +108,7 @@
 	$(MSIVAL2) "$(shell cygpath -wa $(TMP_MSI))" "$(shell cygpath -wa $(CUB))" -f
 	chmod a+rx $(TMP_MSI)
 	mv $(TMP_MSI) $@
+	test -d ../../../products && cp $@ ../../../products
 
 Icon/$(notdir $(VM_ICON)).exe: icon.o nopMain.o
 	mkdir -p $(dir $@)

Modified: branches/Cog/build.win32x86/newspeak.cog.v3/installer/installer-Windows.gmk
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/installer/installer-Windows.gmk	2014-06-11 15:25:46 UTC (rev 2981)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/installer/installer-Windows.gmk	2014-06-11 17:14:11 UTC (rev 2982)
@@ -108,6 +108,7 @@
 	$(MSIVAL2) "$(shell cygpath -wa $(TMP_MSI))" "$(shell cygpath -wa $(CUB))" -f
 	chmod a+rx $(TMP_MSI)
 	mv $(TMP_MSI) $@
+	test -d ../../../products && cp $@ ../../../products
 
 Icon/$(notdir $(VM_ICON)).exe: icon.o nopMain.o
 	mkdir -p $(dir $@)