[Vm-dev] [commit][2903] Remember to load ImageFormat and the refactoring engine.

[commits at squeakvm.org]

Revision: 2903
Author:   eliot
Date:     2014-04-22 14:58:09 -0700 (Tue, 22 Apr 2014)
Log Message:
-----------
Remember to load ImageFormat and the refactoring engine.
Simplify squashing the update completed informer (thanks Tobias!).

Modified Paths:
--------------
    branches/Cog/image/BuildSqueak45Image.st
    branches/Cog/image/BuildSqueakTrunkImage.st

Modified: branches/Cog/image/BuildSqueak45Image.st
===================================================================
--- branches/Cog/image/BuildSqueak45Image.st	2014-04-22 20:32:33 UTC (rev 2902)
+++ branches/Cog/image/BuildSqueak45Image.st	2014-04-22 21:58:09 UTC (rev 2903)
@@ -1,13 +1,14 @@
 | manifest load |
 manifest := #(	('http://source.squeak.org/FFI'					1	('FFI-Pools' 'FFI-Kernel'))
-				('http://source.squeak.org/VMMaker'				5	('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools'))
+				('http://source.squeak.org/VMMaker'				6	('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools' 'ImageFormat'))
 				('http://ss3.gemstone.com/ss/MethodMassage'		3	('MethodMassage' 'MethodMassageCompatibility'))
-				('http://www.squeaksource.com/AioPlugin'		6	('VMConstruction-Plugins-AioPlugin'))
+				('http://www.squeaksource.com/AioPlugin'		7	('VMConstruction-Plugins-AioPlugin'))
 				('http://www.squeaksource.com/Alien'			0	('Alien'))
-				"('http://www.squeaksource.com/FreeTypePlus'	7	('FreeType')) can't load this.  it is toxic to Squeak 4.5"
+				"('http://www.squeaksource.com/FreeTypePlus'	5	('FreeType')) can't load this.  it is toxic to Squeak 4.5"
 				('http://www.squeaksource.com/FreetypePlugin'	8	('Freetype-Plugin'))
 				('http://www.squeaksource.com/OSProcess'		4	('OSProcess'))
 				('http://www.squeaksource.com/OSProcessPlugin'	9	('VMConstruction-Plugins-OSProcessPlugin.oscog'))
+				('http://www.squeaksource.com/rb'				5	('AST-Core' 'AST-Semantic' 'AST-Tests-Core' 'AST-Tests-Semantic' 'Refactoring-Changes' 'Refactoring-Core' 'Refactoring-Environment' 'Refactoring-Tests-Changes' 'Refactoring-Tests-Core' 'Refactoring-Tests-Environment'))
 				('http://www.squeaksource.com/Speech'			2	('SharedPool-Speech' ))).
 
 load := (manifest collect:
Modified: branches/Cog/image/BuildSqueakTrunkImage.st
===================================================================
--- branches/Cog/image/BuildSqueakTrunkImage.st	2014-04-22 20:32:33 UTC (rev 2902)
+++ branches/Cog/image/BuildSqueakTrunkImage.st	2014-04-22 21:58:09 UTC (rev 2903)
@@ -1,12 +1,7 @@
-"Change the defaut update URL to that for trunk, then install a DummyUIManager
- to avoid the post-update OK box, then update, the restore the UIManager."
-| uim |
-uim := Project current uiManager.
-[Project current instVarNamed: 'uiManager' put: DummyUIManager new.
- MCMcmUpdater
+"Change the update stream to trunk, update, then build as per 4.5"
+[MCMcmUpdater
 	defaultUpdateURL: 'http://source.squeak.org/trunk';
-	updateFromServer]
-	ensure: [Project current instVarNamed: 'uiManager' put: uim].
+	updateFromServer] valueSupplyingAnswer: true.
 
 "don't use fileIn; it causes an error when the saved image is started"
 Compiler evaluate: (FileStream oldFileNamed: 'BuildSqueak45Image.st') contentsOfEntireFile