*** empty log message ***
authorpenk
Wed, 16 Mar 2005 15:28:00 +0100
changeset 656 33c547d1a706
parent 655 8ff7df3ede33
child 657 024f0e48fa89
*** empty log message ***
host.rc
patches
private.rc
smalltalk.rc
--- a/host.rc	Mon Mar 14 20:11:31 2005 +0100
+++ b/host.rc	Wed Mar 16 15:28:00 2005 +0100
@@ -201,7 +201,7 @@
     ] ifFalse:[
 	'reading' infoPrint.
     ].
-    (' host setup h_' , sysType , '.rc ...') infoPrintCR.
+    (' host setup h_' , sysType , '.rc...') infoPrintCR.
 
     s := Smalltalk systemFileStreamFor:('h_' , sysType , '.rc').
     s notNil ifTrue:[
@@ -221,7 +221,7 @@
     "if there is a corresponding file ..."
 
     (Smalltalk at:#'_ImageHostName') ~= host ifTrue:[
-	('host.rc [info]: trying host setup h_' , host , '.rc ...') infoPrintCR.
+	('host.rc [info]: trying host setup h_' , host , '.rc...') infoPrintCR.
 
 	s := Smalltalk systemFileStreamFor:('h_' , host , '.rc').
 	s notNil ifTrue:[
--- a/patches	Mon Mar 14 20:11:31 2005 +0100
+++ b/patches	Wed Mar 16 15:28:00 2005 +0100
@@ -1,23 +1,23 @@
 "/
 "/ $Header$
 "/
-"/ This file is processed very early at initial startup (before any rc script) 
+"/ This file is processed very early at initial startup (before any rc script)
 "/ - not when resuming an image.
 "/
 
-"/ 
+"/
 "/ set the package for changes done below
-"/ 
+"/
 Project notNil ifTrue:[
     |p|
 
     p := Project new.
-    p package:#'patches'. 
+    p package:#'patches'.
     p comment:'only for patches'.
     Project current:p.
 ].
 
-'patches [info]: installing patches ...' infoPrintCR.
+'patches [info]: installing patches...' infoPrintCR.
 !
 
 "/ future systems will read patches from a patch-directory,
@@ -35,7 +35,7 @@
 	|fn|
 
 	fn := (patchDir construct:f) name.
-	('patches [info]: reading patchFile ''' , fn , ''' ...') infoPrintCR.
+	('patches [info]: reading patchFile ''' , fn , '''...') infoPrintCR.
 	Smalltalk fileIn:fn.
     ]
 ].
--- a/private.rc	Mon Mar 14 20:11:31 2005 +0100
+++ b/private.rc	Wed Mar 16 15:28:00 2005 +0100
@@ -163,7 +163,7 @@
 "/
 thisIsExeptsDomain ifTrue:[
     HistoryManager notNil ifTrue:[
-	'private.rc [info]: activating HistoryManager ...' infoPrintCR.
+	'private.rc [info]: activating HistoryManager...' infoPrintCR.
 	HistoryManager activate.
     ]
 ].
@@ -176,7 +176,7 @@
 "/
 "
 thisIsMySystem ifTrue:[
-    'private.rc [info]: starting RDoItServer ...' infoPrintCR.
+    'private.rc [info]: starting RDoItServer...' infoPrintCR.
     Autoload autoloadFailedSignal handle:[:ex |
 	'private.rc [warning]: cannot load RDoItServer' errorPrintCR
 	ex return
@@ -252,7 +252,6 @@
     Text new. "/ to avoid visible messages in minitalk
 
     NewLauncher open.
-
     (Smalltalk commandLineArguments includes:'--quick') ifFalse:[
 	"/
 	"/ disable this if you don't like the other window to come up
--- a/smalltalk.rc	Mon Mar 14 20:11:31 2005 +0100
+++ b/smalltalk.rc	Wed Mar 16 15:28:00 2005 +0100
@@ -34,7 +34,7 @@
 "/***************************************************************
 |cpu enableJIT|
 
-'smalltalk.rc [info]: initial startup (snapshot image restart is faster) ...' infoPrintCR.
+'smalltalk.rc [info]: initial startup (snapshot image restart is faster)...' infoPrintCR.
 
 "/
 "/ the JIT translator is known to work with the following
@@ -74,7 +74,7 @@
 ].
 
 enableJIT ifTrue:[
-    "/ 'smalltalk.rc [info]: turn on JIT ...' infoPrintCR.
+    "/ 'smalltalk.rc [info]: turn on JIT...' infoPrintCR.
     ObjectMemory justInTimeCompilation:true.
 ].
 
@@ -115,7 +115,7 @@
     Smalltalk systemPath addFirst:'../..'.
 ].
 
-"/ but, the current directory should always be first ...
+"/ but, the current directory should always be first...
 (Smalltalk systemPath includes:'.') ifTrue:[
     Smalltalk systemPath remove:'.'.
 ].
@@ -171,7 +171,7 @@
 	  Minimum smalltalk does only contain libbasic, libcomp and librun.
 	  FileIn view stuff"
 
-	 'smalltalk.rc [info]: installing required class libraries ...' infoPrintCR.
+	 'smalltalk.rc [info]: installing required class libraries...' infoPrintCR.
 	 (Smalltalk isClassLibraryLoaded:'libbasic2') ifFalse:[
 	      Smalltalk loadPackage:'stx:libbasic2'.
 	 ].
@@ -266,7 +266,7 @@
     ].
 
     (Smalltalk commandLineArguments includes:'--quick') ifFalse:[
-	'smalltalk.rc [info]: installing autoloaded classes ...' infoPrintCR.
+	'smalltalk.rc [info]: installing autoloaded classes...' infoPrintCR.
 	Smalltalk installAutoloadedClasses.
     ].
     needToReactivate ifTrue:[HistoryManager activate].
@@ -281,7 +281,7 @@
 	    'smalltalk.rc [warning]: autoload failed' errorPrintCR.
 	    ex return.
 	] do:[
-	    'smalltalk.rc [info]: loading ' infoPrint. aClass name infoPrint. ' ...' infoPrintCR.
+	    'smalltalk.rc [info]: loading ' infoPrint. aClass name infoPrint. '...' infoPrintCR.
 	    aClass autoload.
 	]
     ].
@@ -290,7 +290,7 @@
     "/ binary save all classes
     "/
     Autoload loadedClasses do:[:cls |
-	'smalltalk.rc [info]: saving binary of ' infoPrint. cls name infoPrint. ' ...' infoPrintCR.
+	'smalltalk.rc [info]: saving binary of ' infoPrint. cls name infoPrint. '...' infoPrintCR.
 	cls binaryFileOut.
 	OperatingSystem executeCommand:'mv *.cls binary'.
     ]
@@ -396,7 +396,7 @@
 "/
 "/ this defines stuff relating to the host we are running on
 "/
-"/ 'smalltalk.rc [info]: reading ''host.rc'' ...' infoPrintCR.
+"/ 'smalltalk.rc [info]: reading ''host.rc''...' infoPrintCR.
 Smalltalk fileIn:'host.rc'.
 
 "/
@@ -406,7 +406,7 @@
 "/ Host specific things are configured in host.rc.
 "/
 Display notNil ifTrue:[
-    "/ 'smalltalk.rc [info]: reading ''display.rc'' ...' infoPrintCR.
+    "/ 'smalltalk.rc [info]: reading ''display.rc''...' infoPrintCR.
     Smalltalk fileIn:'display.rc'.
 ].
 
@@ -431,13 +431,15 @@
     ((Smalltalk commandLineArguments includes:'--noLicenceBox')
      or:[Smalltalk commandLineArguments includes:'--quick']) ifFalse:[
 	Smalltalk addStartBlock:[
-	    'smalltalk.rc [info]: show licence conditions ...' infoPrintCR.
-
+	    'smalltalk.rc [info]: show licence conditions...' infoPrintCR.
 	    LicenceBox autoload.
 	    LicenceBox licenceRejectSignal handle:[:ex|
 		Smalltalk exit
 	    ] do:[
-		(LicenceBox open) ifFalse:[Smalltalk exit].
+		(LicenceBox open) ifFalse:[
+		    'smalltalk.rc [info]: licence conditions not accepted.' infoPrintCR.
+		    Smalltalk exit
+		].
 		Smalltalk at:#LicenceBox put:nil.
 	    ].
 	]
@@ -502,10 +504,10 @@
 
     idx := Smalltalk commandLine indexOf:'-F'.
     file := Smalltalk commandLine at:idx + 1.
-    ('smalltalk.rc [info]: reading ''' , file , ''' ...') infoPrintCR.
+    ('smalltalk.rc [info]: reading ''' , file , '''...') infoPrintCR.
     Smalltalk fileIn:file.
 ] ifFalse:[
-    'smalltalk.rc [info]: reading ''private.rc'' ...' infoPrintCR.
+    'smalltalk.rc [info]: reading ''private.rc''...' infoPrintCR.
     Smalltalk fileIn:'private.rc'.
 ].
 
@@ -513,7 +515,7 @@
     "/
     "/ read saved configuration settings (if any)
     "/
-    "/ 'smalltalk.rc [info]: reading ''settings.stx'' ...' infoPrintCR.
+    "/ 'smalltalk.rc [info]: reading ''settings.stx''...' infoPrintCR.
     Object abortSignal handle:[:ex |
 	ex return
     ] do:[
@@ -638,7 +640,7 @@
      Smalltalk addStartBlock:[
       [
 	  doneWithStartupStuff wait.
-	     'smalltalk.rc [info]: saving initial image for faster future startup ...' infoPrintCR.
+	     'smalltalk.rc [info]: saving initial image for faster future startup...' infoPrintCR.
 	     ObjectMemory primSnapShotOn:'st.img'
       ] forkAt:1
      ].