--- a/Smalltalk.st Thu Jan 23 17:41:10 1997 +0100
+++ b/Smalltalk.st Thu Jan 23 19:13:56 1997 +0100
@@ -1444,9 +1444,10 @@
"common start/restart action, if there is a Display, initialize it
and start dispatching; otherwise go into a read-eval-print loop."
- |mainProcess standAloneProcess imageName|
+ |mainProcess standAloneProcess imageName thisIsARestart|
imageName := ObjectMemory imageName.
+ thisIsARestart := imageName notNil.
"
if there is a display, start its event dispatcher
@@ -1476,17 +1477,17 @@
].
StandAlone ifFalse:[
(SilentLoading == true) ifFalse:[ "i.e. undefined counts as false"
- imageName isNil ifTrue:[
- Transcript showCR:(self hello).
- Transcript showCR:(self copyrightString).
- Transcript cr.
- ] ifFalse:[
+ thisIsARestart ifTrue:[
Transcript cr.
Transcript showCR:('Smalltalk restarted from:'
, imageName
, ' (saved '
, ObjectMemory imageSaveTime printString
, ')' ).
+ ] ifFalse:[
+ Transcript showCR:(self hello).
+ Transcript showCR:(self copyrightString).
+ Transcript cr.
].
Transcript cr.
].
@@ -1499,6 +1500,15 @@
Transcript cr.
].
].
+
+ thisIsARestart ifTrue:[
+ "/
+ "/ the final late notification - users can now assume that
+ "/ views, forms etc. have been recreated.
+
+ ObjectMemory changed:#returnFromSnapshot.
+ ]
+
] newProcess.
mainProcess priority:8.
mainProcess name:'start block handler'.
@@ -1513,7 +1523,7 @@
"
allow more customization by reading an image specific rc-file
"
- imageName notNil ifTrue:[
+ thisIsARestart ifTrue:[
(imageName endsWith:'.img') ifTrue:[
imageName := imageName copyWithoutLast:4
].
@@ -1564,7 +1574,7 @@
"Created: 18.7.1996 / 21:07:39 / cg"
"Modified: 9.9.1996 / 17:42:50 / stefan"
- "Modified: 8.1.1997 / 13:02:28 / cg"
+ "Modified: 23.1.1997 / 19:12:46 / cg"
!
readEvalPrint
@@ -1593,15 +1603,15 @@
which allow a stepwise re-init: #earlyRestart, #restarted and #returnFromSnapshot.
#earlyRestart is send first, nothing has been setup yet.
- (should be used to flush all device dependent entries)
+ (should be used to flush all device dependent entries)
#restarted is send right after.
- (should be used to recreate external resources (fds, bitmaps etc)
+ (should be used to recreate external resources (fds, bitmaps etc)
#returnFromSnapshot is sent last
- (should be used to restart processes, reOpen Streams which cannot
- be automatically be reopened (i.e. Sockets, Pipes) and so on.
- (Notice that positionable fileStreams are already reopened and repositioned)
+ (should be used to restart processes, reOpen Streams which cannot
+ be automatically be reopened (i.e. Sockets, Pipes) and so on.
+ (Notice that positionable fileStreams are already reopened and repositioned)
"
|deb insp idx|
@@ -1621,9 +1631,9 @@
idx := CommandLineArguments indexOf:'-q'.
idx ~~ 0 ifTrue:[
- Object infoPrinting:false.
- ObjectMemory infoPrinting:false.
- CommandLineArguments removeAtIndex:idx.
+ Object infoPrinting:false.
+ ObjectMemory infoPrinting:false.
+ CommandLineArguments removeAtIndex:idx.
].
"/
@@ -1632,7 +1642,7 @@
"/ the Display during early startup.
Display notNil ifTrue:[
- Display invalidateConnection
+ Display invalidateConnection
].
"/
@@ -1658,7 +1668,7 @@
insp := Inspector.
deb := Debugger.
deb notNil ifTrue:[
- deb reinitialize
+ deb reinitialize
].
Inspector := MiniInspector.
Debugger := MiniDebugger.
@@ -1670,7 +1680,7 @@
"/ this code.
ObjectFileLoader notNil ifTrue:[
- ObjectFileLoader reloadAllRememberedObjectFiles.
+ ObjectFileLoader reloadAllRememberedObjectFiles.
].
"/
@@ -1691,7 +1701,7 @@
"/ - sorry, but order is important
"/
Workstation notNil ifTrue:[
- Workstation reinitialize.
+ Workstation reinitialize.
].
"/
@@ -1700,10 +1710,13 @@
OperatingSystem enableUserInterrupts.
"/
- "/ the final late notification - users can now assume that
- "/ views, forms etc. have been recreated.
-
- ObjectMemory changed:#returnFromSnapshot.
+ "/ done later now - when display connection is working
+ "/
+"/ "/
+"/ "/ the final late notification - users can now assume that
+"/ "/ views, forms etc. have been recreated.
+"/
+"/ ObjectMemory changed:#returnFromSnapshot.
"/ now, display and view-stuff works;
"/ back to the previous debugging interface
@@ -1717,7 +1730,7 @@
"/ if there is no Transcript, go to stderr
Transcript isNil ifTrue:[
- Transcript := Stderr
+ Transcript := Stderr
].
"/ give user a chance to re-customize things
@@ -1726,19 +1739,19 @@
idx := CommandLineArguments indexOf:'-faststart'.
idx ~~ 0 ifTrue:[
- CommandLineArguments removeAtIndex:idx.
+ CommandLineArguments removeAtIndex:idx.
] ifFalse:[
- Class withoutUpdatingChangesDo:[
- (self fileIn:(self commandName , '_r.rc')) ifFalse:[
- "no _r.rc file where executable is; try default smalltalk_r.rc"
- self fileIn:'smalltalk_r.rc'
- ].
- ]
+ Class withoutUpdatingChangesDo:[
+ (self fileIn:(self commandName , '_r.rc')) ifFalse:[
+ "no _r.rc file where executable is; try default smalltalk_r.rc"
+ self fileIn:'smalltalk_r.rc'
+ ].
+ ]
].
self mainStartup:true
- "Modified: 19.7.1996 / 11:26:15 / cg"
+ "Modified: 23.1.1997 / 19:08:37 / cg"
!
start
@@ -3525,5 +3538,5 @@
!Smalltalk class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.216 1997-01-20 19:28:00 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.217 1997-01-23 18:13:56 cg Exp $'
! !