--- a/Project.st Wed Feb 02 13:39:32 2000 +0100
+++ b/Project.st Wed Feb 02 19:09:45 2000 +0100
@@ -20,15 +20,15 @@
category:'System-Support'
!
-Object subclass:#ClassInfo
- instanceVariableNames:'conditionForInclusion className classFileName'
+Object subclass:#MethodInfo
+ instanceVariableNames:'conditionForInclusion methodName className fileName'
classVariableNames:''
poolDictionaries:''
privateIn:Project
!
-Object subclass:#MethodInfo
- instanceVariableNames:'conditionForInclusion methodName className fileName'
+Object subclass:#ClassInfo
+ instanceVariableNames:'conditionForInclusion className classFileName'
classVariableNames:''
poolDictionaries:''
privateIn:Project
@@ -2440,7 +2440,7 @@
self prerequisitePackages do:[:aPackageId |
|p|
- "/ add sub-packages
+ "/ add sub-packages only
(aPackageId startsWith:pkg) ifTrue:[
p := aPackageId copyFrom:pkg size + 1.
(p startsWith:$/) ifTrue:[
@@ -2523,7 +2523,14 @@
# add the path(es) here:,
# ********** OPTIONAL: MODIFY the next lines ***
# LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=' , ((self propertyAt:#'make.stc.LOCALINCLUDES') ? '') , '
+LOCALINCLUDES='.
+ s nextPutAll:((self propertyAt:#'make.stc.LOCALINCLUDES') ? '').
+ self prerequisitePackages do:[:aPackageId |
+ |prj|
+
+ s nextPutAll:'-I$(TOP)/../' , (aPackageId copyReplaceAll:$: with:$/) , ' '.
+ ].
+ s nextPutAll:'
# if you need any additional defines for embedded C code,
# add them here:,
@@ -2624,6 +2631,18 @@
].
s cr.
+ self prerequisitePackages size > 0 ifTrue:[
+ s nextPutAll:'
+# make required packages
+prerequisites::
+'.
+ self prerequisitePackages do:[:aPackageId |
+ |prj|
+
+ s tab; nextPutAll:'(cd $(TOP)/../' , (aPackageId copyReplaceAll:$: with:$/) , '; $(MAKE) ) '; cr.
+ ].
+ s cr.
+ ].
s nextPutAll:'
# add more install actions here
install::
@@ -3514,56 +3533,6 @@
"Modified: 14.2.1997 / 15:38:47 / cg"
! !
-!Project::ClassInfo methodsFor:'accessing'!
-
-classFileName
- "return the value of the instance variable 'classFileName' (automatically generated)"
-
- ^ classFileName!
-
-classFileName:something
- "set the value of the instance variable 'classFileName' (automatically generated)"
-
- classFileName := something.!
-
-className
- "return the value of the instance variable 'className' (automatically generated)"
-
- ^ className!
-
-className:something
- "set the value of the instance variable 'className' (automatically generated)"
-
- className := something.!
-
-conditionForInclusion
- "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
- ^ conditionForInclusion!
-
-conditionForInclusion:something
- "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
-
- conditionForInclusion := something.! !
-
-!Project::ClassInfo methodsFor:'printing & storing'!
-
-displayString
- ^ 'ClassInfo: ' , className
-! !
-
-!Project::ClassInfo methodsFor:'queries'!
-
-theClass
- |cls|
-
- cls := Smalltalk classNamed:className.
- cls isNil ifTrue:[ ^ nil].
- ^ cls
-
- "Created: / 26.9.1999 / 13:39:00 / cg"
-! !
-
!Project::MethodInfo methodsFor:'accessing'!
className
@@ -3633,9 +3602,59 @@
"Created: / 26.9.1999 / 13:39:07 / cg"
! !
+!Project::ClassInfo methodsFor:'accessing'!
+
+classFileName
+ "return the value of the instance variable 'classFileName' (automatically generated)"
+
+ ^ classFileName!
+
+classFileName:something
+ "set the value of the instance variable 'classFileName' (automatically generated)"
+
+ classFileName := something.!
+
+className
+ "return the value of the instance variable 'className' (automatically generated)"
+
+ ^ className!
+
+className:something
+ "set the value of the instance variable 'className' (automatically generated)"
+
+ className := something.!
+
+conditionForInclusion
+ "return the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+ ^ conditionForInclusion!
+
+conditionForInclusion:something
+ "set the value of the instance variable 'conditionForInclusion' (automatically generated)"
+
+ conditionForInclusion := something.! !
+
+!Project::ClassInfo methodsFor:'printing & storing'!
+
+displayString
+ ^ 'ClassInfo: ' , className
+! !
+
+!Project::ClassInfo methodsFor:'queries'!
+
+theClass
+ |cls|
+
+ cls := Smalltalk classNamed:className.
+ cls isNil ifTrue:[ ^ nil].
+ ^ cls
+
+ "Created: / 26.9.1999 / 13:39:00 / cg"
+! !
+
!Project class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.147 2000-02-01 20:26:23 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.148 2000-02-02 18:09:45 tm Exp $'
! !
Project initialize!