--- a/ApplicationDefinition.st Wed Dec 05 13:23:54 2007 +0100
+++ b/ApplicationDefinition.st Wed Dec 05 13:25:21 2007 +0100
@@ -110,7 +110,7 @@
(perProjectPreEquisites at:pckg2) includes:pck1
].
- self halt.
+ self shouldImplement
"
alspa_batch_application allPreRequisitesSorted
@@ -228,6 +228,9 @@
!
startupSelector_code
+ "generate a the code that answers the startupSelector.
+ try #open and #start."
+
|clsName cls sel|
Error
@@ -237,14 +240,10 @@
cls := Smalltalk classNamed:clsName.
].
- sel := #'start'.
+ sel := #start.
cls notNil ifTrue:[
(cls respondsTo:#open) ifTrue:[
- sel := #'open'
- ] ifFalse:[
- (cls respondsTo:#main) ifTrue:[
- sel := #'main'
- ]
+ sel := #open
].
].
@@ -1212,7 +1211,7 @@
clean::
-rm -f *.so %(APPLICATION_NAME).$(O)
-clobber::
+clobber:: clean
-rm -f %(APPLICATION_NAME) *.img *.sav
'
@@ -2106,33 +2105,19 @@
generateRequiredMakePrerequisites_make_dot_proto
- | topRelativePath libobjPath libPath|
+ | topRelativePath libPath|
^ String streamContents:[:s |
self allPreRequisites do:[:projectID |
topRelativePath := self unixPathToPackage:projectID from: 'stx'.
libPath := '$(TOP)/', topRelativePath.
- libobjPath := libPath asFilename constructString: (self libraryNameFor:projectID).
- s
- nextPutAll: libobjPath, '$(OBJ):';cr;
- tab; nextPutAll: '(cd ', libPath; nextPutLine:' ; make)'; cr.
+ s tab; nextPutAll: '(cd ', libPath; nextPutLine:' ; $(MAKE))'.
].
-"/$(TOP)/libbasic/libbasic$(OBJ):
-"/ (cd $(TOP)/libbasic ; make)
-
-
-"/ self isGUIApplication ifTrue:[
-"/ self guiClassFileNames_unix do:[:eachFilename |
-"/ s space; nextPutAll:eachFilename,'$(O_EXT)'; nextPutLine:' \'.
-"/ ].
-"/ ].
-"/ self subProjects do:[:projectID |
-"/ s space; nextPutAll:(self libraryNameFor:projectID),'$(O_EXT)'; nextPutLine:' \'.
-"/ ].
s cr.
].
"
+ exept_expecco_application generateRequiredMakePrerequisites_make_dot_proto
alspa_batch_application generateRequiredMakePrerequisites_make_dot_proto
"
!
@@ -2237,5 +2222,5 @@
!ApplicationDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.91 2007-12-04 08:34:03 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ApplicationDefinition.st,v 1.92 2007-12-05 12:25:21 stefan Exp $'
! !