--- a/LibraryDefinition.st Wed Aug 16 12:58:49 2006 +0200
+++ b/LibraryDefinition.st Wed Aug 16 12:58:51 2006 +0200
@@ -13,10 +13,10 @@
"{ Package: 'stx:libbasic3' }"
Object subclass:#ProjectDefinition
- instanceVariableNames:''
- classVariableNames:''
- poolDictionaries:''
- category:'System-Support-Projects'
+ instanceVariableNames:''
+ classVariableNames:''
+ poolDictionaries:''
+ category:'System-Support-Projects'
!
!ProjectDefinition class methodsFor:'documentation'!
@@ -197,15 +197,26 @@
msdosPathToPackage:aPackageID
"Returns the path to stx counting the number of $/ and $: in the package name and adding for each one '../' to get the ST/X top directory"
- ^ self msdosPathToTop , '\..\' , (aPackageID asString copy replaceAll:$: by:$/)
+ ^ self msdosPathToTop , '\..\' , (aPackageID asString copy replaceAny:':/' by:$\)
"
- DapasX_Datenbasis pathToPackage:'bosch:dapasx/kernel'
+ self msdosPathToPackage:'bosch:dapasx/kernel'
"
"Created: / 09-08-2006 / 16:35:22 / fm"
!
+msdosPathToProjectFor: aProjectID
+
+ ^ aProjectID asString copy replaceAny:':/' with:$\
+
+"
+ self msdosPathToProjectFor: #'bosch:dapasx/datenbasis'
+"
+
+ "Modified: / 09-08-2006 / 18:20:29 / fm"
+!
+
msdosPathToTop
"Returns the path to stx counting the number of $/ and $: in the package name and adding for each one '../' to get the ST/X top directory"
@@ -292,28 +303,6 @@
"Modified: / 11-08-2006 / 14:02:56 / cg"
!
-pathToProject
-
- ^ self pathToProjectFor: self package
-
-"
- bosch_dapasx_datenbasis_Definition pathToProject
-"
-
- "Modified: / 09-08-2006 / 18:20:29 / fm"
-!
-
-pathToProjectFor: aProjectID
-
- ^ aProjectID asString copy replaceAny:':/' with:$\
-
-"
- self pathToProjectFor: #'bosch:dapasx/datenbasis'
-"
-
- "Modified: / 09-08-2006 / 18:20:29 / fm"
-!
-
unixPathToPackage:aPackageID
"Returns the path to stx counting the number of $/ and $: in the package name and adding for each one '../' to get the ST/X top directory"
@@ -326,6 +315,17 @@
"Created: / 09-08-2006 / 16:35:22 / fm"
!
+unixPathToProjectFor: aProjectID
+
+ ^ aProjectID asString copy replaceAny:':/' with:$/
+
+"
+ self unixPathToProjectFor: #'bosch:dapasx/datenbasis'
+"
+
+ "Modified: / 09-08-2006 / 18:20:29 / fm"
+!
+
unixPathToTop
"Returns the path to stx counting the number of $/ and $: in the package name and adding for each one '../' to get the ST/X top directory"
@@ -1065,7 +1065,13 @@
"/ b has a private class which is a subclass of a
|mustComeBefore pivateClassesOfB|
- mustComeBefore := b isSubclassOf:a.
+
+ mustComeBefore := false.
+ (a isSharedPool and:[(b sharedPools includes: a name)]) ifTrue:[
+ mustComeBefore := true
+ ].
+
+ mustComeBefore := mustComeBefore or:[b isSubclassOf:a].
pivateClassesOfB := pivateClassesOf at:b.
pivateClassesOfB do:[:eachClassInB |
mustComeBefore := mustComeBefore or:[eachClassInB isSubclassOf:a]
@@ -1084,6 +1090,7 @@
]
]
"
+ bosch_dapasx_hw_schnittstellen_Definition generateObjects_make_dot_spec
DapasXProject generateObjects_make_dot_spec
DapasX_Datenbasis generateObjects_make_dot_spec
@@ -1647,5 +1654,5 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.14 2006-08-15 18:06:04 fm Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/LibraryDefinition.st,v 1.15 2006-08-16 10:58:51 fm Exp $'
! !