equal
deleted
inserted
replaced
71 |
71 |
72 "Modified: / 5.6.1998 / 18:35:18 / cg" |
72 "Modified: / 5.6.1998 / 18:35:18 / cg" |
73 ! |
73 ! |
74 |
74 |
75 defaultPackagePath |
75 defaultPackagePath |
76 "redefined to add stx.app packages and /Library stuff" |
76 "redefined to add /Application and /Library stuff" |
77 |
77 |
78 |path executablePath executableDir packagesDir |
78 |path executablePath executableDir packagesDir |
79 libDir appDir versionsDir vsnDirName vsnDir| |
79 libDir appDir versionsDir vsnDirName vsnDir| |
80 |
80 |
81 path := super defaultPackagePath. |
81 path := super defaultPackagePath. |
83 executablePath := OperatingSystem pathOfSTXExecutable. |
83 executablePath := OperatingSystem pathOfSTXExecutable. |
84 executablePath notNil ifTrue:[ |
84 executablePath notNil ifTrue:[ |
85 executableDir := executablePath asFilename directory. |
85 executableDir := executablePath asFilename directory. |
86 packagesDir := executableDir directory directory / 'Packages'. |
86 packagesDir := executableDir directory directory / 'Packages'. |
87 packagesDir exists ifTrue:[ |
87 packagesDir exists ifTrue:[ |
88 path add:packagesDir. |
88 packagesDir := packagesDir pathName. |
|
89 (path includes:packagesDir) ifFalse:[ |
|
90 path add:packagesDir. |
|
91 ]. |
89 ]. |
92 ]. |
90 libDir := '/Library/Frameworks/SmalltalkX.framework' asFilename. |
93 libDir := '/Library/Frameworks/SmalltalkX.framework' asFilename. |
91 libDir exists ifTrue:[ |
94 libDir exists ifTrue:[ |
92 versionsDir := libDir / 'Versions'. |
95 versionsDir := libDir / 'Versions'. |
93 versionsDir exists ifTrue:[ |
96 versionsDir exists ifTrue:[ |
95 bindWith:Smalltalk majorVersionNr |
98 bindWith:Smalltalk majorVersionNr |
96 with:Smalltalk minorVersionNr |
99 with:Smalltalk minorVersionNr |
97 with:Smalltalk revisionNr. |
100 with:Smalltalk revisionNr. |
98 vsnDir := versionsDir / vsnDirName. |
101 vsnDir := versionsDir / vsnDirName. |
99 vsnDir exists ifTrue:[ |
102 vsnDir exists ifTrue:[ |
100 path add:vsnDir pathName. |
103 vsnDir := vsnDir pathName. |
|
104 (path includes:vsnDir) ifFalse:[ |
|
105 path add:vsnDir. |
|
106 ]. |
101 ]. |
107 ]. |
102 ]. |
108 ]. |
103 ]. |
109 ]. |
104 appDir := '/Applications/SmalltalkX/' asFilename. |
110 appDir := '/Applications/SmalltalkX/' asFilename. |
105 appDir exists ifTrue:[ |
111 appDir exists ifTrue:[ |
109 bindWith:Smalltalk majorVersionNr |
115 bindWith:Smalltalk majorVersionNr |
110 with:Smalltalk minorVersionNr |
116 with:Smalltalk minorVersionNr |
111 with:Smalltalk revisionNr. |
117 with:Smalltalk revisionNr. |
112 vsnDir := versionsDir / vsnDirName. |
118 vsnDir := versionsDir / vsnDirName. |
113 vsnDir exists ifTrue:[ |
119 vsnDir exists ifTrue:[ |
114 path add:vsnDir pathName. |
120 vsnDir := vsnDir pathName. |
|
121 (path includes:vsnDir) ifFalse:[ |
|
122 path add:vsnDir. |
|
123 ]. |
115 ]. |
124 ]. |
116 ]. |
125 ]. |
117 ]. |
126 ]. |
118 ]. |
127 ]. |
119 ^ path |
128 ^ path |