hg/stx-libtool2: comparison STXInstaller.st

equal deleted inserted replaced

-:a5a7054e2b7d
+:2087134eea96
 dirsToMake add:(stxLibDir asFilename constructString:'binary').
 dirsToMake add:(stxLibDir asFilename constructString:'bitmaps').
 dirsToMake add:(stxLibDir asFilename constructString:'goodies').
 ^ dirsToMake
+!
+listOfOptionalPackages
+^ #(
+'libDB'
+'clients/CBrowser'
+'libtool2'
+'libcompat'
+'libui'
+'libxt'
+"/ mhmh - these should not be needed here ...
+'projects/smalltalk/bitmaps/javaImages'
+'doc/online/english/overview/icons'
+)
+"Created: 2.3.1997 / 12:39:59 / cg"
+"Modified: 2.3.1997 / 13:24:41 / cg"
 !
 specOfFilesToCopy
 |fileSpec|
 msg at:4 put:'    ' , (fileName asText allBold).
 msg at:6 put:'    ' , (destDir asText allBold).
 actionTextHolder value:nil.
 actionTextHolder value:msg.
-cmd := 'cp -r ../../' , fileName , ' ' , destDir.
+((fileName includes:$*) not
-commandTraceView showCR:cmd , ' ...'.
+and:[('../../' , fileName) asFilename exists not]) ifTrue:[
-"/            cmd := 'sh -c "echo ; ' , cmd , ' 2>&1"' .
+(self listOfOptionalPackages includes:fileName) ifFalse:[
-cmd := cmd , ' 2>&1' .
+commandTraceView showCR:('cannot copy ' , fileName , ' - not included in distribution')
+]
-doneSemaphore := Semaphore new.
+] ifFalse:[
+cmd := 'cp -r ../../' , fileName , ' ' , destDir.
-[
+commandTraceView showCR:cmd , ' ...'.
+cmd := cmd , ' 2>&1' .
-p := PipeStream readingFrom:cmd.
-p isNil ifTrue:[
+doneSemaphore := Semaphore new.
-self warn:('command error. Could not execute:\\' , cmd) withCRs.
-] ifFalse:[
+[
-[p atEnd] whileFalse:[
-(p readWaitWithTimeout:0.1) ifFalse:[
+p := PipeStream readingFrom:cmd.
-line := p nextLine.
+p isNil ifTrue:[
-(line notNil and:[line notEmpty]) ifTrue:[
+self warn:('command error. Could not execute:\\' , cmd) withCRs.
-commandTraceView showCR:(('  ' , line) asText emphasizeAllWith:(#color->Color red)).
+] ifFalse:[
+[p atEnd] whileFalse:[
+(p readWaitWithTimeout:0.1) ifFalse:[
+line := p nextLine.
+(line notNil and:[line notEmpty]) ifTrue:[
+commandTraceView showCR:(('  ' , line) asText emphasizeAllWith:(#color->Color red)).
+]
 ]
-]
+].
+p close.
 ].
-p close.
+doneSemaphore signal.
-].
+] forkAt:4.
-doneSemaphore signal.
-] forkAt:4.
+doneSemaphore wait.
+]
-doneSemaphore wait.
 ].
 nDone := nDone + 1
 ].
 ^ true
 "Created: 17.7.1996 / 15:16:20 / cg"
-"Modified: 9.1.1997 / 03:15:23 / cg"
+"Modified: 2.3.1997 / 12:43:47 / cg"
 !
 createDirectories
 |msg dirsToMake numDirs nDone|
 OperatingSystem executeCommand:('(cd ' , stxLibDir , '/doc/online ; make links)').
 ^ true
 "Created: 17.7.1996 / 15:24:19 / cg"
 "Modified: 18.7.1996 / 22:18:38 / cg"
+!
+outputInitialMessage
+#(
+'Notice:'
+''
+'During the installation, you may get error messages'
+'complaining that some files where not found'
+'and could therefore not be copied.'
+) do:[:line |
+commandTraceView showCR:((resources string:line) asText emphasizeAllWith:(#color->Color blue)).
+commandTraceView endEntry.
+].
+Delay waitForSeconds:2.
+#(
+''
+'This is normal behavior; since the CD may contain'
+'broken symbolic links to non-existing packages'
+'which are either not contained on your ordered'
+'package (i.e. non-commercial) or not yet published by eXept.'
+) do:[:line |
+commandTraceView showCR:((resources string:line) asText emphasizeAllWith:(#color->Color blue)).
+commandTraceView endEntry.
+].
+Delay waitForSeconds:2.
+#(
+''
+'Please excuse this inconvenience.'
+''
+) do:[:line |
+commandTraceView showCR:((resources string:line) asText emphasizeAllWith:(#color->Color blue)).
+commandTraceView endEntry.
+].
+Delay waitForSeconds:2.
+"Created: 2.3.1997 / 12:49:52 / cg"
+"Modified: 2.3.1997 / 13:22:45 / cg"
 ! !
 !STXInstaller methodsFor:'startup'!
 askAndInstall
 self warn:(resources string:'must be in the ''projects/smalltalk'' directory').
 ^ self
 ].
 [self askForDestination] whileTrue:[
-self checkForExistingInstallationAndConfirm ifFalse:[
+self checkForExistingInstallationAndConfirm ifTrue:[
-^ self
+self preInstall.
-].
+self doInstall ifTrue:[
-self preInstall.
+self postInstall.
-self doInstall ifTrue:[
+^ self
-self postInstall.
+].
-^ self
+(self confirm:(resources string:'installation failed or aborted - retry ?'))
-].
+ifFalse:[
-(self confirm:(resources string:'installation failed or aborted - retry ?'))
+^ self
-ifFalse:[
+]
-^ self
 ]
 ].
-"Modified: 18.7.1996 / 21:20:56 / cg"
+"Modified: 2.3.1997 / 13:46:23 / cg"
 !
 askForDestination
 "open a dialog to enter destination directories"
 |d cm l green dark img
 stxLibDirHolder stxLibBinDirHolder stxBinDirHolder
 installDocHolder installSourceHolder installSTCHolder installGoodiesHolder
-binMegabytes libMegabytes
+binMegabytes libMegabytes docMegabytes stcMegabytes srcMegabytes
 |
 binMegabytes := 10.
-libMegabytes := 10.
+libMegabytes := 30.
+docMegabytes := 11.
+stcMegabytes := 1.
+srcMegabytes := 15.
 LastLibDir isNil ifTrue:[
 LastLibDir := '/usr/local/lib/smalltalk'
 ].
 LastLibBinDir isNil ifTrue:[
 d addVerticalSpace.
 (d addTextLabel:(resources string:'optional:'))
 adjust:#left; foregroundColor:Color white backgroundColor:dark.
-(d addCheckBox:((resources string:'doc files') , ' (+8 Mb)') on:installDocHolder)
+(d addCheckBox:((resources string:'doc files (+%1 Mb)' with:docMegabytes)) on:installDocHolder)
 labelView foregroundColor:Color white backgroundColor:dark.
-(d addCheckBox:((resources string:'stc & support files') , ' (+2 Mb)') on:installSTCHolder)
+(d addCheckBox:((resources string:'stc & support files (+%1 Mb)' with:stcMegabytes)) on:installSTCHolder)
 labelView foregroundColor:Color white backgroundColor:dark.
 d addVerticalSpace.
 d addHorizontalLine.
 d addVerticalSpace.
 (d addTextLabel:(resources string:'optional (but highly recommended):'))
 adjust:#left; foregroundColor:Color white backgroundColor:dark.
-(d addCheckBox:((resources string:'smalltalk source files') , ' (+12 Mb)') on:installSourceHolder)
+(d addCheckBox:((resources string:'smalltalk source files (+%1 Mb)' with:srcMegabytes)) on:installSourceHolder)
 labelView foregroundColor:Color white backgroundColor:dark.
-(d addCheckBox:((resources string:'goodies') , ' (+0.5 Mb)') on:installGoodiesHolder)
+(d addCheckBox:((resources string:'goodies (+0.5 Mb)')) on:installGoodiesHolder)
 labelView foregroundColor:Color white backgroundColor:dark.
 d addVerticalSpace.
 d addHorizontalLine.
 d addHelpButtonFor:'STXInstaller/installHelp.html';
 addAbortButton;
 addOkButtonLabelled:(resources string:'install').
-d extent:400@300.
+d extent:500@400.
 d allViewBackground:dark.
 d openAtCenter.
 d accepted ifTrue:[
 ^ true
 ].
 d destroy.
 ^ false
-"Modified: 18.7.1996 / 19:43:38 / cg"
+"Modified: 2.3.1997 / 13:40:44 / cg"
 !
 checkForExistingInstallationAndConfirm
 "look if there is another installation and confirm
 reinstalling; return true if ok, false if not"
 with:stxLibDir asText allBold)
 label:(resources string:'Attention')
 labels:(resources array:#('remove first' 'overwrite' 'cancel'))
 values:#(remove over nil)
 default:nil.
 whatToDo isNil ifTrue:[^false].
 whatToDo == #remove ifTrue:[
 ((stxLibDir findString:'stx') == 0
 and:[(stxLibDir findString:'smalltalk') == 0]) ifTrue:[
 "/ confirm again
 (self confirm:(resources
 string:'are you certain that the directory to remove
-is really an smalltalk directory ?
+(' , stxLibDir , ') is really a smalltalk directory ?
-Remove it now ?')) ifFalse:[ ^ true].
+Remove it now ?')) ifFalse:[
+(self confirm:(resources
+string:'overwrite ?')) ifTrue:[^ true].
+^ false
+]
 ].
 (OperatingSystem recursiveRemoveDirectory:stxLibDir)
 ifFalse:[
 self warn:(resources string:'mhmh - could not remove old installation.')
 ].
 ].
 ^ true
-"/        ^ DialogBox
-"/            confirm:('detected existing installation in '
-"/                     , stxLibDir asText allBold
-"/                     , '\\continue & overwrite ?') withCRs
-"/           yesLabel:'overwrite' noLabel:'cancel'
 ].
 ^ true
-"Modified: 18.7.1996 / 20:01:36 / cg"
+"Modified: 2.3.1997 / 13:45:13 / cg"
 !
 doInstall
 "install ST/X; return true if ok, false if not"
 |progressView ok textView|
 textView := HVScrollableView for:TextCollector.
-textView preferredExtent:(100 @ 250).
+textView preferredExtent:(200 @ 300).
 commandTraceView := textView scrolledView.
 progressView := ProgressIndicator
 inBoxWithLabel:'ST/X Installation' icon:(Depth8Image fromImage:Launcher aboutIcon)
 text:#('ST/X Installation' '' '' '' '' '' '' '') asStringCollection
 abortable:true
 view:textView
 closeWhenDone:false.
-progressView topView extent:(500 min:Display width) @ 300.
+progressView topView extent:(640 min:Display width) @ (500 min:Display height).
 ok := false.
 progressView showProgressOf:
 [:progressValue :currentAction| |msg|
 Processor activeProcess withPriority:7 do:[
 actionPercentageHolder := progressValue.
 actionTextHolder := currentAction.
+self outputInitialMessage.
 (self createDirectories) ifTrue:[
 ok := self copyFiles
 ].
 self createSymbolicLinks.
 ].
 ^ ok
 "Created: 17.7.1996 / 15:11:27 / cg"
-"Modified: 17.7.1996 / 15:24:27 / cg"
+"Modified: 2.3.1997 / 12:59:47 / cg"
 !
 open
 self askAndInstall.
 '' errorPrintCR.
 cshInfo withCRs errorPrintCR.
 '' errorPrintCR.
 '*********************************************************' errorPrintCR.
 ].
-self information:msg.
+msg := msg , '\\Have fun using ST/X !!'.
+self information:msg withCRs.
 "
 STXInstaller new postInstall
 "
-"Modified: 18.7.1996 / 22:10:42 / cg"
+"Modified: 2.3.1997 / 13:28:18 / cg"
 !
 preInstall
 "clobber the doc directory, to avoid copying cyclic symbolic links"

changeset 73	2087134eea96
parent 31	0f95ba9204f6
child 117	45af2b7a5eca