hg/stx-libbasic: comparison StandaloneStartup.st

equal deleted inserted replaced

-:da075fbea903
+:569eec7576f1
 Under win32, a mutex is used; under unix, an exclusive file in the tempDir could be used."
 self subclassResponsibility
 !
-checkForAndExitIfAnotherApplicationInstanceIsRunning
+shouldReuseRunningApplication
-"if another instance of this application is running,
+"answer true, if an already running application instance should be re-used"
-send it an openFile command for my file-argument, and exit.
-(i.e. to let the already running application open up another window)."
+^ false
-|shouldExit|
-self isAnotherApplicationInstanceRunning ifTrue:[
-shouldExit := self processStartupOfASecondInstance.
-shouldExit ifTrue:[
-self releaseApplicationMutex.
-Smalltalk isStandAloneApp ifTrue:[
-Smalltalk exit.
-]
-].
-].
 ! !
 !StandaloneStartup class methodsFor:'multiple applications support-helpers'!
 applicationRegistryEntry
 softwareEntry := subEntry.
 ].
 applicationEntry := softwareEntry.
 ].
 ^ applicationEntry
+!
+checkForAndExitIfAnotherApplicationInstanceIsRunning
+"if another instance of this application is running,
+send it an openFile command for my file-argument, and exit.
+(i.e. to let the already running application open up another window)."
+|shouldExit|
+self isAnotherApplicationInstanceRunning ifTrue:[
+shouldExit := self processStartupOfASecondInstance.
+shouldExit ifTrue:[
+self releaseApplicationMutex.
+Smalltalk isStandAloneApp ifTrue:[
+Smalltalk exit.
+]
+].
+].
+"Modified: / 03-08-2010 / 17:27:25 / cg"
 !
 confirmOpenNewApplicationInstance
 ^ Dialog confirm: ('Continue opening a new instance of %1 or exit?' bindWith:self applicationName)
 If the currentID is unknown, ask if the user wants to open a new instance of the application anyway.
 Return true if the first instance has been notified, and this second instance should exit."
 |currentIDStringFromRegistry currentIDFromRegistry fileArg commands aWindowId setForegroundWindowSucceeded|
-commands := Smalltalk commandLineArguments.
+commands := CommandLineArguments.
 currentIDStringFromRegistry := self getCurrentIDFromRegistry.
 "If the currentID is not found and there are arguments from the command line,
 we should wait in case of starting the first instance of the application
 ].
 "Modified: / 19-09-2006 / 16:30:58 / cg"
 !
+loadRemainingClassLibraries
+"To speedup startup, we did not load all dll's (only a subset of non-GUI dll's is present).
+Now, load all skipped libs (the ones marked with '*') from modules.stx."
+|modulesFile dllDirectory dlls|
+OperatingSystem isMSWINDOWSlike ifFalse:[^ self ].
+self verboseInfo:'loadRemainingClassLibraries'.
+modulesFile  := self stxModulesFilename.
+dllDirectory := modulesFile directory.
+dlls := OrderedCollection new.
+modulesFile readingLinesDo:[:eachModulesLine|
+|basename dllFile|
+basename := eachModulesLine withoutSeparators.
+(basename notEmpty and:[basename first == $*]) ifTrue:[
+basename := (basename copyFrom:2) withoutSeparators, '.dll'.
+dllFile := dllDirectory construct:basename.
+dllFile exists ifTrue:[
+"/                self verboseInfo:('loading: ', basename).
+Smalltalk showSplashMessage:('loading ', basename).
+dlls add:dllFile.
+] ifFalse:[
+self verboseInfo:( '**** cannot resolve: ', basename).
+].
+].
+].
+dlls notEmpty ifTrue:[
+ObjectFileLoader loadObjectFiles:dlls.
+Display notNil ifTrue:[
+"New view classes may have been loaded - have to update their styles"
+self verboseInfo:'update style caches of loaded dlls'.
+SimpleView readStyleSheetAndUpdateAllStyleCaches.
+].
+].
+!
 setupSmalltalkFromArguments:argv
 "handle common command line arguments:
 --help ............... print usage and exit
 --verbose (-V) ....... be verbose during startup
 --debug .............. enable debugger & inspector
 "Created: / 19-09-2006 / 16:40:47 / cg"
 "Modified: / 31-10-2007 / 16:18:40 / cg"
 !
 start
-CommandLineArguments := Smalltalk commandLineArguments.
+GenericException handle:[:ex |
+self verboseInfo:('Error during startup:').
-self verboseInfo:('starting...').
+self verboseInfo:(ex description).
-self verboseInfo:('args: ', CommandLineArguments asStringCollection asString).
+Verbose == true ifTrue:[ex suspendedContext fullPrintAllLevels:10].
+ex reject.
-Smalltalk isStandAloneApp ifTrue:[
+] do:[
-self loadPatches.
+|idx|
-self verboseInfo:('setup Smalltalk').
+self verboseInfo:('starting...').
-].
+CommandLineArguments := (self additionalArgumentsFromRegistry)
-self setupSmalltalkFromArguments:CommandLineArguments.
+, Smalltalk commandLineArguments.
-self main
+self verboseInfo:('args: ', CommandLineArguments asStringCollection asString).
-"Modified: / 31-10-2007 / 16:03:44 / cg"
+"--noRemote - do not reuse an existing application instance,
+but run in a separate process"
+idx := CommandLineArguments indexOfAny:#('--noRemote').
+idx == 0 ifTrue:[
+self shouldReuseRunningApplication ifTrue:[
+"Multiple Application support:
+if another expecco is running, ask it to open another window for me.
+If that is the case, the following function will not return, but instead exit."
+self checkForAndExitIfAnotherApplicationInstanceIsRunning.
+].
+] ifFalse:[
+CommandLineArguments removeAtIndex:idx.
+Verbose := true.
+].
+"/ Arrive here, if no other application is running.
+"/ to speedup startup, we did not load all dll's (only a subset of non-GUI dll's is present).
+"/ now, load all skipped libs from modules.stx.
+self loadRemainingClassLibraries.
+Smalltalk isStandAloneApp ifTrue:[
+self loadPatches.
+self verboseInfo:('setup Smalltalk').
+].
+self setupSmalltalkFromArguments:CommandLineArguments.
+self main
+].
+"Modified: / 04-08-2010 / 12:30:05 / cg"
 !
 startStartBlockProcess
 Smalltalk startStartBlockProcess
+!
+stxModulesFilename
+"answer the Filename of modules.stx"
+|file|
+file := 'modules.stx' asFilename.
+file exists ifTrue:[^ file].
+file := OperatingSystem pathOfSTXExecutable asFilename directory construct:'modules.stx'.
+file exists ifTrue:[^ file].
+self error:'cannot find: modules.stx'.
 !
 usage
 Stderr nextPutLine:'usage:'.
 Stderr nextPutLine:'  ',self applicationName,' [options...]'.
 Stderr nextPutLine:'    options:'.
 Stderr nextPutLine:'          --help .................. output this message'.
 Stderr nextPutLine:'          --verbose ............... verbose startup'.
 Stderr nextPutLine:'          --noBanner .............. no splash screen'.
+self shouldReuseRunningApplication ifTrue:[
+Stderr nextPutLine:'          --noRemote .............. start as an own application process and do not reuse a running instance'.
+].
 self allowScriptingOption ifTrue:[
 Stderr nextPutLine:'          --scripting portNr ...... enable scripting via port (or stdin/stdOut, if 0)'.
 ].
 self allowDebugOption ifTrue:[
 Stderr nextPutLine:'          --debug ................. enable Debugger'.
 "Created: / 19-09-2006 / 16:37:55 / cg"
 ! !
 !StandaloneStartup class methodsFor:'startup-to be redefined'!
+additionalArgumentsFromRegistry
+"can be redefined to fetch and return additional arguments from the registry
+(or other .ini file). These are added to the beginning of the command line arguments."
+^ #()
+"Created: / 04-08-2010 / 12:20:27 / cg"
+!
 isHeadless
 "this is invoked early by Smalltalk>>mainStartup, to ask if I like to
 have a Display or if I am a non-GUI headless application.
 ! !
 !StandaloneStartup class methodsFor:'documentation'!
 version
-^ '$Id: StandaloneStartup.st 10544 2010-07-12 16:20:36Z vranyj1 $'
+^ '$Id: StandaloneStartup.st 10564 2010-08-10 08:55:15Z vranyj1 $'
 !
 version_CVS
-^ 'Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.43 2010/07/07 23:05:21 cg Exp '
+^ 'Header: /cvs/stx/stx/libbasic/StandaloneStartup.st,v 1.50 2010/08/06 10:51:41 stefan Exp '
 !
 version_SVN
-^ '$Id: StandaloneStartup.st 10544 2010-07-12 16:20:36Z vranyj1 $'
+^ '$Id: StandaloneStartup.st 10564 2010-08-10 08:55:15Z vranyj1 $'
 ! !
 StandaloneStartup initialize!

branch	jv
changeset 17795	569eec7576f1
parent 17780	b6e42c92eba0
child 17807	06cc6c49e291