Mercurial Mercurial > hg > stx-libtool / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
path fixes
authorClaus Gittinger <cg@exept.de>
Tue, 21 Apr 1998 00:39:08 +0200
changeset 1564 9a5fedae64f2
parent 1563 8c4c3707a071
child 1565 e0fb0e6d81ac
path fixes
ApplicationBuilder.st file | annotate | diff | comparison | revisions
LibraryBuilder.st file | annotate | diff | comparison | revisions 
--- a/ApplicationBuilder.st	Sun Apr 19 21:07:17 1998 +0200
+++ b/ApplicationBuilder.st	Tue Apr 21 00:39:08 1998 +0200
@@ -1221,15 +1221,15 @@
 initialize
     "initialize all aspects"
 
-    |homeDir|
+    |topDir|
 
     super initialize.
 
     aspects := self class aspects.
 
-    homeDir := Filename homeDirectory asFilename.
+    topDir := (Filename currentDirectory asFilename construct:'..') construct:'..'.
 
-    self aspectsAt: #topDirectory      putFirst: (homeDir construct: 'stx') name.
+    self aspectsAt: #topDirectory      putFirst: topDir pathName.
     aspects     at: #systemLibraries   put: ObjectFileLoader searchedLibraries asValue.
     (aspects at: #systemLibrary        put: ((aspects at: #systemLibraries) value at: 1 ifAbsent: '') asValue) addDependent: self.
     self aspectsAt: #oldSystemLibrary putFirst: (aspects at: #systemLibrary) value.
@@ -1239,17 +1239,17 @@
 
     self aspectsAt: #applicationName   putFirst: 'application'.
     self aspectsAt: #startupMessage    putFirst: 'Smalltalk start'.
-    self aspectsAt: #startupCFile      putFirst: (homeDir construct: 'stx/librun/main.c') name.
+    self aspectsAt: #startupCFile      putFirst: (topDir construct: 'librun/main.c') pathName.
 
-    self aspectsAt: #targetDirectory   putFirst: (homeDir construct: 'stx/projects/application') name.
-    self aspectsAt: #libraryDirectory  putFirst: (homeDir construct: 'stx/projects/smalltalk') name.
+    self aspectsAt: #targetDirectory   putFirst: ((topDir construct: 'projects') construct:'application') pathName.
+    self aspectsAt: #libraryDirectory  putFirst: ((topDir construct: 'projects') construct:'smalltalk') pathName.
 
     self aspectsAt: #stxLibraries      putFirst: 
         (ObjectMemory binaryModuleInfo collect: [:binMoInfo| (binMoInfo name copy reverse upTo: $ ) reverse]) asSortedCollection.
 
     self aspectsAt: #userLibraries     putFirst: OrderedCollection new.
 
-    aspects at:     #buildDate         put:      Date today printString, ' ', Time now printString.
+    aspects at:     #buildDate         put:      (Date today printString, ' ', Time now printString) asValue.
 
     self aspectsAt: #linkRCFiles       putFirst: true.
     self aspectsAt: #linkResources     putFirst: true.
@@ -1357,5 +1357,5 @@
 !ApplicationBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/ApplicationBuilder.st,v 1.5 1998-04-18 22:58:38 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/ApplicationBuilder.st,v 1.6 1998-04-20 22:38:49 cg Exp $'
 ! !
--- a/LibraryBuilder.st	Sun Apr 19 21:07:17 1998 +0200
+++ b/LibraryBuilder.st	Tue Apr 21 00:39:08 1998 +0200
@@ -995,11 +995,11 @@
 initialize
     "initializes all aspects"
 
-    |homeDir myAspects|
+    |topDir myAspects|
 
     super initialize.
 
-    homeDir := Filename homeDirectory asFilename.
+    topDir := (Filename currentDirectory asFilename construct:'..') construct:'..'.
 
     myAspects := IdentityDictionary new.
     aspects associationsDo: [:aspect| myAspects at: aspect key put: aspect value copy].
@@ -1010,8 +1010,8 @@
     self aspectsAt: #libraryClasses  putFirst: OrderedCollection new.
     self getLibraryClasses. "do check classes"
     self aspectsAt: #libraryDefines  putFirst: '-L/usr/X11/lib -Llib -Lbinary -L. -L/usr/local/lib -L/usr/lib -L/lib -lm -ldl -lXext -lX11'.
-    self aspectsAt: #targetDirectory putFirst: (homeDir construct: 'stx/libnew') name.
-    self aspectsAt: #sourceDirectory putFirst: (homeDir construct: 'stx') name.
+    self aspectsAt: #targetDirectory putFirst: (topDir pathName asFilename construct: 'libnew') pathName.
+    self aspectsAt: #sourceDirectory putFirst: topDir pathName.
 
     self aspectsAt: #standardHeaderPath                   putFirst: '/rules/stdHeader'.
     self aspectsAt: #commonDefinesPath                    putFirst: '/configurations/COMMON/defines'.
@@ -1064,5 +1064,5 @@
 !LibraryBuilder class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/LibraryBuilder.st,v 1.4 1998-04-18 22:59:32 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/LibraryBuilder.st,v 1.5 1998-04-20 22:39:08 cg Exp $'
 ! !
hg/stx-libtool