--- a/ApplicationBuilder.st Sat Apr 18 16:17:45 1998 +0200
+++ b/ApplicationBuilder.st Sun Apr 19 00:58:38 1998 +0200
@@ -992,19 +992,33 @@
self inform: 'Starting compilation of the startup C-file...'.
startUpClass := ((aspects at: #startupMessage) value upTo: $ ) asSymbol.
- (cls := Smalltalk at: startUpClass) isNil ifTrue: [^self warn: 'Defined class not found in system!!'].
- startUpSelector := ((aspects at: #startupMessage) value copy reverse upTo: $ ) reverse asSymbol.
- (cls respondsTo: startUpSelector) ifFalse: [^self warn: 'Defined class does not respond to the defined selector!!'].
- startupFile := (aspects at: #startupCFile) value asFilename.
- startupFile copyTo: (startupFile := dir asFilename construct: (aspects at: #startupCFile) value asFilename baseName).
- command := compilerPathAndFlags , ' -o main.o -c -O -O6 -fomit-frame-pointer -m486 -DDEBUG -Di386 ',
- '-DSTARTUP_CLASS="\"', startUpClass, '\"" ',
- '-DSTARTUP_SELECTOR="\"', startUpSelector, '\"" ',
- '-DCONFIGURATION_STRING="\"', (aspects at: #configuration) value, '\"" ',
- '-DBUILD_DATE="\"', (aspects at: #buildDate) value, '\"" ',
- startupFile name.
+ (cls := Smalltalk at: startUpClass) isNil
+ ifTrue:
+ [
+ self warn: 'Defined class not found in system!!'
+ ]
+ ifFalse:
+ [
+ startUpSelector := ((aspects at: #startupMessage) value copy reverse upTo: $ ) reverse asSymbol.
+ (cls respondsTo: startUpSelector)
+ ifFalse:
+ [
+ self warn: 'Defined class does not respond to the defined selector!!'
+ ]
+ ifTrue:
+ [
+ startupFile := (aspects at: #startupCFile) value asFilename.
+ startupFile copyTo: (startupFile := dir asFilename construct: (aspects at: #startupCFile) value asFilename baseName).
+ command := compilerPathAndFlags , ' -o main.o -c -O -O6 -fomit-frame-pointer -m486 -DDEBUG -Di386 ',
+ '-DSTARTUP_CLASS="\"', startUpClass, '\"" ',
+ '-DSTARTUP_SELECTOR="\"', startUpSelector, '\"" ',
+ '-DCONFIGURATION_STRING="\"', (aspects at: #configuration) value, '\"" ',
+ '-DBUILD_DATE="\"', (aspects at: #buildDate) value, '\"" ',
+ startupFile name.
- self executeCommand: command inDirectory: dir.
+ self executeCommand: command inDirectory: dir
+ ]
+ ]
].
(dir asFilename construct: 'main.o') exists
ifTrue: [task := nil]
@@ -1343,5 +1357,5 @@
!ApplicationBuilder class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/ApplicationBuilder.st,v 1.4 1998-04-18 14:17:07 tz Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/ApplicationBuilder.st,v 1.5 1998-04-18 22:58:38 tz Exp $'
! !