--- a/STXInstaller.st Wed Sep 18 10:14:23 1996 +0200
+++ b/STXInstaller.st Fri Sep 20 11:24:51 1996 +0200
@@ -1,8 +1,11 @@
+'From Smalltalk/X, Version:2.10.9 on 20-sep-1996 at 11:23:45' !
+
Object subclass:#STXInstaller
- instanceVariableNames:'stxLibDir stxBinDir installDocFiles installSourceFiles
- installSTCFiles installGoodyFiles actionPercentageHolder
- actionTextHolder commandTraceView resources'
- classVariableNames:'LastBinDir LastLibDir'
+ instanceVariableNames:'stxLibDir stxLibBinDir stxBinDir installDocFiles
+ installSourceFiles installSTCFiles installGoodyFiles
+ actionPercentageHolder actionTextHolder commandTraceView
+ resources'
+ classVariableNames:'LastBinDir LastLibBinDir LastLibDir'
poolDictionaries:''
category:'eXept-tools'
!
@@ -49,6 +52,29 @@
"Modified: 18.7.1996 / 19:45:08 / cg"
!
+defaultLibBinDirs
+ |dirs|
+
+ dirs := OrderedCollection new.
+ dirs add:'/usr/local/lib'.
+ dirs add:'/usr/lib'.
+ dirs add:'/lib'.
+ dirs add:(Filename homeDirectory
+ constructString:'lib').
+
+ dirs add:((Filename homeDirectory
+ construct:'stx')
+ constructString:'lib').
+ dirs add:'/tmp/stxlib'.
+ dirs add:'/home/stx/lib'.
+ dirs add:'/home2/stx/lib'.
+
+ ^ dirs sort
+
+ "Created: 18.7.1996 / 19:43:21 / cg"
+ "Modified: 18.7.1996 / 19:46:04 / cg"
+!
+
defaultLibDirs
|dirs|
@@ -82,8 +108,8 @@
dirsToMake := OrderedCollection new.
dirsToMake add:stxBinDir.
dirsToMake add:stxLibDir.
- dirsToMake add:(stxLibDir asFilename constructString:'lib').
- dirsToMake add:(stxLibDir asFilename constructString:'lib/configurations').
+ dirsToMake add:stxLibBinDir.
+ dirsToMake add:(stxLibDir asFilename constructString:'configurations').
dirsToMake add:(stxLibDir asFilename constructString:'doc').
dirsToMake add:(stxLibDir asFilename constructString:'doc/online').
dirsToMake add:(stxLibDir asFilename constructString:'doc/online/english').
@@ -117,51 +143,51 @@
installDocFiles ifTrue:[
fileSpec := fileSpec , #(
- ( 'doc' #lib nil false '644' )
+ ( 'doc' #lib nil false '644' )
).
].
installSourceFiles ifTrue:[
fileSpec := fileSpec , #(
- ( 'projects/smalltalk/source' #lib nil false '644' )
+ ( 'projects/smalltalk/source' #lib nil false '644' )
).
].
installSTCFiles ifTrue:[
fileSpec := fileSpec , #(
- ( 'stc/stc' #bin nil false '755' )
- ( 'rules/stmkmp' #bin nil false '755' )
- ( 'rules/stmkmf' #bin nil false '755' )
- ( 'include' #lib nil false '644' )
- ( 'configurations' #lib nil false '644' )
- ( 'configurations/PACKS' #lib 'configurations' false '644' )
- ( 'configurations/my*' #lib 'configurations' false '644' )
- ( 'configurations/vendor*' #lib 'configurations' false '644' )
- ( 'rules' #lib nil false '644' )
+ ( 'stc/stc' #bin nil false '755' )
+ ( 'rules/stmkmp' #bin nil false '755' )
+ ( 'rules/stmkmf' #bin nil false '755' )
+ ( 'include' #lib nil false '644' )
+ ( 'configurations' #lib nil false '644' )
+ ( 'configurations/PACKS' #lib 'configurations' false '644' )
+ ( 'configurations/my*' #lib 'configurations' false '644' )
+ ( 'configurations/vendor*' #lib 'configurations' false '644' )
+ ( 'rules' #lib nil false '644' )
- ( 'support/VGL/vogl/src/libvogl.*' #lib 'lib' false '644' )
- ( 'support/VGL/vogl/src/*.h' #lib 'include' false '644' )
- ( 'support/DLD/dld-3.2.5/libdld.*' #lib 'lib' false '644' )
- ( 'goodies/persistency/db-1.6/PORT/libdb.*' #lib 'lib' false '644' )
+ ( 'support/VGL/vogl/src/libvogl.*' #lib 'lib' false '644' )
+ ( 'support/VGL/vogl/src/*.h' #lib 'include' false '644' )
+ ( 'support/DLD/dld-3.2.5/libdld.*' #lib 'lib' false '644' )
+ ( 'goodies/persistency/db-1.6/PORT/libdb.*' #lib 'lib' false '644' )
- ( 'librun/librun.*' #lib 'lib' false '644' )
- ( 'libbasic/libbasic.*' #lib 'lib' false '644' )
- ( 'libbasic2/libbasic2.*' #lib 'lib' false '644' )
- ( 'libbasic3/libbasic3.*' #lib 'lib' false '644' )
- ( 'libhtml/libhtml.*' #lib 'lib' false '644' )
- ( 'libcomp/libcomp.*' #lib 'lib' false '644' )
- ( 'libview/libview.*' #lib 'lib' false '644' )
- ( 'libview2/libview2.*' #lib 'lib' false '644' )
- ( 'libwidg/libwidg.*' #lib 'lib' false '644' )
- ( 'libwidg2/libwidg2.*' #lib 'lib' false '644' )
- ( 'libwidg3/libwidg3.*' #lib 'lib' false '644' )
- ( 'libsnmp/libsnmp.*' #lib 'lib' false '644' )
- ( 'contrib/libPVM/libPVM.*' #lib 'lib' false '644' )
- ( 'goodies/persistency/libdbase.*' #lib 'lib' false '644' )
- ( 'libtable/libtable.*' #lib 'lib' false '644' )
- ( 'libtool/libtool.*' #lib 'lib' false '644' )
- ( 'libxt/libxt.*' #lib 'lib' false '644' )
- ( 'librt/librt.*' #lib 'lib' false '644' )
+ ( 'librun/librun.*' #libBin nil false '644' )
+ ( 'libbasic/libbasic.*' #libBin nil false '644' )
+ ( 'libbasic2/libbasic2.*' #libBin nil false '644' )
+ ( 'libbasic3/libbasic3.*' #libBin nil false '644' )
+ ( 'libhtml/libhtml.*' #libBin nil false '644' )
+ ( 'libcomp/libcomp.*' #libBin nil false '644' )
+ ( 'libview/libview.*' #libBin nil false '644' )
+ ( 'libview2/libview2.*' #libBin nil false '644' )
+ ( 'libwidg/libwidg.*' #libBin nil false '644' )
+ ( 'libwidg2/libwidg2.*' #libBin nil false '644' )
+ ( 'libwidg3/libwidg3.*' #libBin nil false '644' )
+ ( 'libsnmp/libsnmp.*' #libBin nil false '644' )
+ ( 'contrib/libPVM/libPVM.*' #libBin nil false '644' )
+ ( 'goodies/persistency/libdbase.*' #libBin nil false '644' )
+ ( 'libtable/libtable.*' #libBin nil false '644' )
+ ( 'libtool/libtool.*' #libBin nil false '644' )
+ ( 'libxt/libxt.*' #libBin nil false '644' )
+ ( 'librt/librt.*' #libBin nil false '644' )
).
].
@@ -200,7 +226,11 @@
dest == #bin ifTrue:[
destDir := stxBinDir
] ifFalse:[
- destDir := stxLibDir
+ dest == #libBin ifTrue:[
+ destDir := stxLibBinDir
+ ] ifFalse:[
+ destDir := stxLibDir
+ ]
].
destDir := destDir asFilename.
@@ -372,7 +402,7 @@
"open a dialog to enter destination directories"
|d cm l green dark img
- stxLibDirHolder stxBinDirHolder
+ stxLibDirHolder stxLibBinDirHolder stxBinDirHolder
installDocHolder installSourceHolder installSTCHolder installGoodiesHolder
binMegabytes libMegabytes
|
@@ -383,12 +413,17 @@
LastLibDir isNil ifTrue:[
LastLibDir := '/usr/local/lib/smalltalk'
].
+ LastLibBinDir isNil ifTrue:[
+ LastLibBinDir := '/usr/local/lib'
+ ].
LastBinDir isNil ifTrue:[
LastBinDir := '/usr/local/bin'
].
stxLibDirHolder := LastLibDir asValue.
+ stxLibBinDirHolder := LastLibBinDir asValue.
stxBinDirHolder := LastBinDir asValue.
+
installDocHolder := true asValue.
installSourceHolder := true asValue.
installSTCHolder := true asValue.
@@ -432,11 +467,23 @@
(d componentAt:'binaryBox.label') backgroundColor:dark; foregroundColor:Color white.
+ cm := ComboBoxView on:stxLibBinDirHolder.
+ cm list:self defaultLibBinDirs.
+ d
+ addLabelledField:cm
+ label:(resources string:'libraries')
+ adjust:#left
+ tabable:true
+ from:0.0 to:1.0 separateAtX:0.25
+ nameAs:'libraryBinBox'.
+
+ (d componentAt:'libraryBinBox.label') backgroundColor:dark; foregroundColor:Color white.
+
cm := ComboBoxView on:stxLibDirHolder.
cm list:self defaultLibDirs.
d
addLabelledField:cm
- label:(resources string:'libraries')
+ label:(resources string:'help files')
adjust:#left
tabable:true
from:0.0 to:1.0 separateAtX:0.25
@@ -485,7 +532,9 @@
d addVerticalSpace.
d addHorizontalLine.
- d addAbortButton; addOkButtonLabelled:(resources string:'install').
+ d addHelpButtonFor:'STXInstaller/installHelp.html';
+ addAbortButton;
+ addOkButtonLabelled:(resources string:'install').
d extent:400@300.
d allViewBackground:dark.
@@ -493,6 +542,7 @@
d openAtCenter.
d accepted ifTrue:[
stxLibDir := LastLibDir := stxLibDirHolder value.
+ stxLibBinDir := LastLibBinDir := stxLibBinDirHolder value.
stxBinDir := LastBinDir := stxBinDirHolder value.
installDocFiles := installDocHolder value.
installSourceFiles := installSourceHolder value.