--- a/ProjectDefinition.st Fri Apr 25 12:17:26 2008 +0200
+++ b/ProjectDefinition.st Fri Apr 25 14:04:02 2008 +0200
@@ -308,36 +308,28 @@
msdosPathToPackage:toPackageID from:fromPackageID
"Returns the path to the package defined by aPackageID relative to my path"
- |parts1 parts2 common up down rel|
+ |parts1 parts2 common up down|
parts1 := fromPackageID asCollectionOfSubstringsSeparatedByAny:':/'.
parts2 := toPackageID asCollectionOfSubstringsSeparatedByAny:':/'.
common := parts1 commonPrefixWith:parts2.
- common notEmpty ifTrue:[
- up := ((1 to:parts1 size - common size) collect:[:p | '..\']) asStringWith:''.
- down := (parts2 copyFrom:common size+1) asStringWith:'\'.
- (up isEmpty and:[down isEmpty]) ifTrue:[^ '.'].
- ^ up,down
+ up := ((1 to:parts1 size - common size) collect:[:p | '..']) asStringWith:'\'.
+ down := (parts2 copyFrom:common size+1) asStringWith:'\'.
+ up isEmpty ifTrue:[
+ down isEmpty ifTrue:[^ '.'].
+ ^ down.
].
-
- rel := (self topRelativePathToPackage_win32:toPackageID).
- (rel startsWith:'stx\') ifTrue:[
- ^ '$(TOP)',(rel copyFrom:'stx\' size)
+ down isEmpty ifTrue:[
+ ^ up.
].
-
- ^ '$(TOP)\..\',rel.
-
-"/ pTop := self msdosPathToTopFor:fromPackageID.
-"/ (pTop endsWith:'\stx') ifTrue:[
-"/ ^ (pTop copyButLast:'stx' size),(self topRelativePathToPackage_win32:toPackageID)
-"/ ] ifFalse:[
-"/ ^ pTop,'\..\',(self topRelativePathToPackage_win32:toPackageID)
-"/ ].
+ ^ up, '\', down
"
self msdosPathToPackage:'bosch:dapasx/kernel' from:'bosch:dapasx/application'
self msdosPathToPackage:'stx:libbasic' from:'bosch:dapasx/application'
self msdosPathToPackage:'bosch:dapasx/application' from:'stx:libbasic'
+ self msdosPathToPackage:'exept:expecco' from:'exept:expecco/application'
+ self msdosPathToPackage:'exept:expecco/application' from:'exept:expecco'
"
"Created: / 17-08-2006 / 14:26:39 / cg"
@@ -3995,7 +3987,7 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.181 2008-04-24 18:25:40 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.182 2008-04-25 12:04:02 stefan Exp $'
! !
ProjectDefinition initialize!