--- a/ProjectDefinition.st Thu Sep 14 22:59:50 2006 +0200
+++ b/ProjectDefinition.st Thu Sep 14 23:00:02 2006 +0200
@@ -222,7 +222,7 @@
msdosPathToPackage:toPackageID from:fromPackageID
"Returns the path to the package defined by aPackageID relative to my path"
- |pTop parts1 parts2 common up down|
+ |pTop parts1 parts2 common up down rel|
parts1 := fromPackageID asCollectionOfSubstringsSeparatedByAny:':/'.
parts2 := toPackageID asCollectionOfSubstringsSeparatedByAny:':/'.
@@ -234,13 +234,20 @@
^ up,down
].
- pTop := self msdosPathToTopFor:fromPackageID.
- (pTop endsWith:'\stx') ifTrue:[
- ^ (pTop copyButLast:'stx' size),(self topRelativePathToPackage_win32:toPackageID)
- ] ifFalse:[
- ^ pTop,'\..\',(self topRelativePathToPackage_win32:toPackageID)
+ rel := (self topRelativePathToPackage_win32:toPackageID).
+ (rel startsWith:'stx\') ifTrue:[
+ ^ '$(TOP)',(rel copyFrom:'stx' size+1)
].
+ ^ '$(TOP)\..\',rel.
+
+"/ pTop := self msdosPathToTopFor:fromPackageID.
+"/ (pTop endsWith:'\stx') ifTrue:[
+"/ ^ (pTop copyButLast:'stx' size),(self topRelativePathToPackage_win32:toPackageID)
+"/ ] ifFalse:[
+"/ ^ pTop,'\..\',(self topRelativePathToPackage_win32:toPackageID)
+"/ ].
+
"
self msdosPathToPackage:'bosch:dapasx/kernel' from:'bosch:dapasx/application'
self msdosPathToPackage:'stx:libbasic' from:'bosch:dapasx/application'
@@ -248,7 +255,7 @@
"
"Created: / 17-08-2006 / 14:26:39 / cg"
- "Modified: / 14-09-2006 / 15:27:45 / cg"
+ "Modified: / 14-09-2006 / 22:04:56 / cg"
!
msdosPathToTopFor:aProjectID
@@ -2822,7 +2829,7 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.62 2006-09-14 19:50:58 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.63 2006-09-14 21:00:02 cg Exp $'
! !
ProjectDefinition initialize!