--- a/ProjectDefinition.st Thu Feb 07 13:53:24 2008 +0100
+++ b/ProjectDefinition.st Thu Feb 07 13:53:37 2008 +0100
@@ -641,10 +641,15 @@
pTop := self unixPathToTopFor:fromPackageID.
(pTop endsWith:'/stx') ifTrue:[
- ^ (pTop copyButLast:'stx' size),(self topRelativePathToPackage_unix:toPackageID)
+ pTop := pTop copyButLast:'stx' size.
] ifFalse:[
- ^ pTop,'/../',(self topRelativePathToPackage_unix:toPackageID)
+ pTop isEmpty ifTrue:[
+ pTop := '../'.
+ ] ifFalse:[
+ pTop := pTop, '/../'.
+ ].
].
+ ^ pTop, (self topRelativePathToPackage_unix:toPackageID)
"
self unixPathToPackage:'bosch:dapasx/kernel' from:'bosch:dapasx/application'
@@ -663,7 +668,7 @@
parts := aProjectID asCollectionOfSubstringsSeparatedByAny:':/'.
aProjectID asPackageId module = 'stx' ifTrue:[
- parts size == 1 ifTrue:[^ '.'].
+ parts size == 1 ifTrue:[^ ''].
^ (((2 to:parts size-1) collect:[:p | '../']) asStringWith:'') , '..'
].
@@ -2560,16 +2565,9 @@
!
objectLine_make_dot_spec_mappings: aClassName
- |cls fn|
-
- (cls := Smalltalk classNamed:aClassName) isNil ifTrue:[
- fn := Smalltalk fileNameForClass:aClassName
- ] ifFalse:[
- fn := cls classFilename asFilename withoutSuffix baseName
- ].
^ Dictionary new
- at: 'CLASSFILE' put: fn;
+ at: 'CLASSFILE' put:(Smalltalk fileNameForClass:aClassName);
yourself
"Created: / 08-08-2006 / 20:17:28 / fm"
@@ -3959,7 +3957,7 @@
!ProjectDefinition class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.174 2008-02-06 10:22:29 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/ProjectDefinition.st,v 1.175 2008-02-07 12:53:37 stefan Exp $'
! !
ProjectDefinition initialize!