#OTHER by cg
authorClaus Gittinger <cg@exept.de>
Tue, 21 Jun 2016 16:01:26 +0200
changeset 20022 d8efe52abe8a
parent 20021 66ff2331e8cf
child 20023 c91a69e8f369
#OTHER by cg class: ApplicationDefinition changed:7 methods prereq order back to previous
ApplicationDefinition.st
--- a/ApplicationDefinition.st	Tue Jun 21 10:26:22 2016 +0200
+++ b/ApplicationDefinition.st	Tue Jun 21 16:01:26 2016 +0200
@@ -1396,7 +1396,7 @@
 
 generateAllPreRequisiteLibs_modules_dot_stx
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:projectID | 
+        self allPreRequisitesSorted do:[:projectID | 
             (self shouldBeLoadedInitially:projectID) ifFalse:[
                 s nextPut:$*.
             ].
@@ -1413,7 +1413,7 @@
      exept_expecco_application generateAllPreRequisiteLibs_modules_dot_stx
     "
 
-    "Modified: / 06-06-2016 / 14:31:09 / cg"
+    "Modified: / 07-09-2006 / 17:22:58 / cg"
 !
 
 generateExtensionLine: extensionLineTemplate
@@ -1451,7 +1451,7 @@
 generatePreRequisiteLines_bc_dot_mak         
 
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:eachPackage |
+        self allPreRequisitesSorted do:[:eachPackage |
             |mappings newObjectLine|
             mappings := self preRequisiteLine_bc_dot_mak_mappings: eachPackage.
             newObjectLine := self replaceMappings: mappings
@@ -1474,12 +1474,13 @@
     "
 
     "Created: / 09-08-2006 / 11:24:39 / fm"
-    "Modified: / 06-06-2016 / 14:33:30 / cg"
+    "Modified: / 14-09-2006 / 21:58:47 / cg"
 !
 
 generatePreRequisiteLines_make_dot_proto        
+
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:eachPackage |
+        self allPreRequisitesSorted do:[:eachPackage |
             |mappings newObjectLine|
             mappings := self preRequisiteLine_make_dot_proto_mappings: eachPackage.
             newObjectLine := self replaceMappings: mappings
@@ -1502,32 +1503,31 @@
     "
 
     "Created: / 09-08-2006 / 11:24:39 / fm"
-    "Modified: / 06-06-2016 / 14:33:55 / cg"
+    "Modified: / 14-09-2006 / 21:58:47 / cg"
 !
 
 generateRequiredLibobjs_make_dot_proto
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:projectID |
+        self allPreRequisitesSorted do:[:projectID |
             |libobjPath libPath|
 
             libPath := self pathToPackage:projectID withSeparator:'/'.
             libobjPath := libPath , '/', (self libraryNameFor:projectID).
             s space; nextPutAll: libobjPath; nextPutLine:'$(O_EXT) \'.
         ].
+
         s cr.
     ].
 
     "
      exept_expecco_application generateRequiredLibobjs_make_dot_proto      
     "
-
-    "Modified: / 06-06-2016 / 14:34:17 / cg"
 !
 
 generateRequiredLibs_bc_dot_mak
     ^ String streamContents:[:s |
         s nextPutLine:' \'.
-        self allPreRequisitesWithMandatorySorted do:[:projectID | 
+        self allPreRequisitesSorted do:[:projectID | 
             s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:'.dll \'.
         ].
 
@@ -1548,13 +1548,13 @@
      bosch_dapasx_application generateRequiredLibs_bc_dot_mak      
     "
 
-    "Modified: / 06-06-2016 / 14:34:41 / cg"
+    "Modified: / 07-09-2006 / 17:22:51 / cg"
 !
 
 generateRequiredLibs_make_dot_proto
     "/ cg: why not (self libraryNameFor:projectID),'.so'; ???
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:projectID |
+        self allPreRequisitesSorted do:[:projectID | 
             s space; nextPutAll:(self libraryNameFor:projectID); nextPutLine:' \'.
         ].
 "/ Subprojects are only built, but not linked to the executable!!
@@ -1573,14 +1573,12 @@
     "
      alspa_batch_application generateRequiredLibs_make_dot_proto      
     "
-
-    "Modified: / 06-06-2016 / 14:34:59 / cg"
 !
 
 generateRequiredLinkLibobjs_make_dot_proto
 
     ^ String streamContents:[:s |
-        self allPreRequisitesWithMandatorySorted do:[:projectID |
+        self allPreRequisitesSorted do:[:projectID | 
             s space; nextPutAll:(self libraryNameFor:projectID),'$(O_EXT)'; nextPutLine:' \'.
         ].
 
@@ -1598,8 +1596,6 @@
     "
      alspa_batch_application generateRequiredLinkLibobjs_make_dot_proto      
     "
-
-    "Modified: / 06-06-2016 / 14:35:15 / cg"
 !
 
 generateSubProjectLibs_bc_dot_mak