Project.st
changeset 4796 eee167a75fcd
parent 4792 8e50b8218546
child 4805 a7e6d2cb9b29
--- a/Project.st	Thu Sep 23 18:04:23 1999 +0200
+++ b/Project.st	Thu Sep 23 19:55:34 1999 +0200
@@ -1359,7 +1359,8 @@
      of the project - this loadAll file is supposed to be located
      in the projects source directory."
 
-    |d f out in topName classes classInfo numBad firstBad msg methodsFile|
+    |d f out in topName classes classInfo numBad firstBad msg 
+     methodsFile prerequisitePackages|
 
     classes := self classes.
     numBad := 0.
@@ -1428,10 +1429,35 @@
 "/
 "/ Prerequisites:
 "/
+'.
+    prerequisitePackages := self prerequisitePackages 
+                                collect:[:entry |
+                                    |pName|
+
+                                    entry isString ifTrue:[
+                                        pName := entry
+                                    ] ifFalse:[
+                                        entry isArray ifTrue:[
+                                            pName := entry at:1
+                                        ] ifFalse:[
+                                            pName := entry name
+                                        ]
+                                    ]
+                                ].
+
+    prerequisitePackages size == 0 ifTrue:[
+    out nextPutAll:'
 "/ Smalltalk loadPackage:''module:directory''.
 "/ Smalltalk loadPackage:''....''.
-"/ Smalltalk loadPackage:''....''.
-!!
+'   ] ifFalse:[
+        out cr.
+        prerequisitePackages do:[:packName |
+            out nextPutLine:'Smalltalk loadPackage:''' , packName , '''.'.
+        ]
+    ].
+
+    out nextPutAll:
+'!!
 
 "{ package:''' , self package , ''' }"!!
 
@@ -1663,29 +1689,36 @@
 # STCWARNINGS=-warn
 # STCWARNINGS=-warnNonStandard
 # STCWARNINGS=-warnEOLComments
-STCWARNINGS=
+STCWARNINGS='.
+        (self propertyAt:#'make.stc.warnEOLComments') == false ifTrue:[
+            s nextPutAll:'-warnEOLComments '.
+        ].
+        (self propertyAt:#'make.stc.warnNonStandard') == false ifTrue:[
+            s nextPutAll:'-warnNonStandard '.
+        ].
+        s nextPutAll:((self propertyAt:#'make.stc.WARNINGOPTIONS') ? '') , '
 
 # if your embedded C code requires any system includes, 
 # add the path(es) here:, 
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALINCLUDES=-Ifoo -Ibar
-LOCALINCLUDES=
+LOCALINCLUDES=' , ((self propertyAt:#'make.stc.LOCALINCLUDES') ? '') , '
 
 # if you need any additional defines for embedded C code, 
 # add them here:, 
 # ********** OPTIONAL: MODIFY the next lines ***
 # LOCALDEFINES=-Dfoo -Dbar -DDEBUG
-LOCALDEFINES=
+LOCALDEFINES=' , ((self propertyAt:#'make.stc.LOCALDEFINES') ? '') , '
 
 STCLOCALOPT=-I. $(STCLOCALOPTIMIZATIONS) $(STCWARNINGS) $(LOCALINCLUDES) $(LOCALDEFINES) -H. ''-P$(PACKAGE)'' ''-Z$(LIBNAME)'' $(COMMONSYMFLAG) $(INITCODESEPFLAG)
 
 # ********** OPTIONAL: MODIFY the next line ***
 # additional C-libraries that should be pre-linked with the class-objects
-LD_OBJ_LIBS=
+LD_OBJ_LIBS=' , ((self propertyAt:#'make.LD_OBJ_LIBS') ? '') , '
 
 # ********** OPTIONAL: MODIFY the next line ***
 # additional C targets or libraries should be added below
-LOCAL_EXTRA_TARGETS=
+LOCAL_EXTRA_TARGETS=' , ((self propertyAt:#'make.LOCAL_EXTRA_TARGETS') ? '') , '
 
 all:: preMake classLibRule postMake
 
@@ -2651,6 +2684,6 @@
 !Project class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.106 1999-09-22 19:08:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Project.st,v 1.107 1999-09-23 17:55:34 cg Exp $'
 ! !
 Project initialize!