--- a/Launcher.st Thu Apr 23 12:54:56 1998 +0200
+++ b/Launcher.st Thu Apr 23 14:24:59 1998 +0200
@@ -1201,13 +1201,12 @@
constantFoldingOptions constantFolding justInTimeCompilation
warnEnabler check component oldIndent t supportsJustInTimeCompilation y
y2 fullDebugSupport yMax
- compileLazy loadBinaries canLoadBinaries|
+ compileLazy loadBinaries canLoadBinaries strings idx thisIsADemoVersion|
canLoadBinaries := ObjectFileLoader notNil and:[ObjectFileLoader canLoadObjectFiles].
loadBinaries := Smalltalk loadBinaries asValue.
compileLazy := Autoload compileLazy asValue.
-
warnings := Compiler warnings asValue.
warnSTX := Compiler warnSTXSpecials asValue.
@@ -1224,20 +1223,27 @@
constantFolding := SelectionInList new list:(resources array:#('disabled' 'level1 (always safe)' 'level2 (usually safe)' 'full')).
constantFolding selectionIndex:3.
- stcCompilationOptions := #( always default never).
- stcCompilation := SelectionInList new
- list:(resources array:#('always'
- 'primitive code only'
- 'never'
- )).
- stcCompilation selectionIndex:2.
+ thisIsADemoVersion := (Smalltalk releaseIdentification = 'ST/X_free_demo_vsn').
+thisIsADemoVersion := true.
+ thisIsADemoVersion ifTrue:[
+ stcCompilationOptions := #( never).
+ strings := #('never').
+ idx := 1.
+ ] ifFalse:[
+ stcCompilationOptions := #( always default never).
+ strings := #('always' 'primitive code only' 'never').
+ idx := 2.
+ ].
+
+ stcCompilation := SelectionInList new list:(resources array:strings).
+ stcCompilation selectionIndex:idx.
(supportsJustInTimeCompilation := ObjectMemory supportsJustInTimeCompilation)
ifTrue:[
- justInTimeCompilation := ObjectMemory justInTimeCompilation:nil.
- fullDebugSupport := ObjectMemory fullSingleStepSupport:nil.
+ justInTimeCompilation := ObjectMemory justInTimeCompilation:nil.
+ fullDebugSupport := ObjectMemory fullSingleStepSupport:nil.
] ifFalse:[
- justInTimeCompilation := false.
- fullDebugSupport := (Compiler lineNumberInfo == #full) asValue.
+ justInTimeCompilation := false.
+ fullDebugSupport := (Compiler lineNumberInfo == #full) asValue.
].
justInTimeCompilation := justInTimeCompilation asValue.
fullDebugSupport := fullDebugSupport asValue.
@@ -1249,20 +1255,20 @@
cc := Compiler ccPath asValue.
ObjectFileLoader notNil ifTrue:[
- (t := ObjectFileLoader searchedLibraries) notNil ifTrue:[
- stcLibraries := (String fromStringCollection:t separatedBy:' ') asValue.
- ].
- (t := ObjectFileLoader libPath) notNil ifTrue:[
- stcLibraryPath := t asValue.
- ]
+ (t := ObjectFileLoader searchedLibraries) notNil ifTrue:[
+ stcLibraries := (String fromStringCollection:t separatedBy:' ') asValue.
+ ].
+ (t := ObjectFileLoader libPath) notNil ifTrue:[
+ stcLibraryPath := t asValue.
+ ]
].
catchRedefs := Class catchMethodRedefinitions asValue.
historyLines := HistoryManager notNil and:[HistoryManager isLoaded and:[HistoryManager isActive]].
historyLines ifFalse:[
- fullHistoryUpdate := false
+ fullHistoryUpdate := false
] ifTrue:[
- fullHistoryUpdate := HistoryManager fullHistoryUpdate asValue.
+ fullHistoryUpdate := HistoryManager fullHistoryUpdate asValue.
].
historyLines := historyLines asValue.
@@ -1271,29 +1277,29 @@
keepSource selectionIndex:1.
warnEnabler := [
- warnings value ifTrue:[
- warnSTXBox enable.
- warnOldStyleBox enable.
- warnCommonMistakesBox enable.
- warnCompatibilityBox enable.
- allowUnderscore value ifTrue:[
- warnUnderscoreBox enable.
- ] ifFalse:[
- warnUnderscoreBox disable.
- ].
- allowDollar value ifTrue:[
- warnDollarBox enable.
- ] ifFalse:[
- warnDollarBox disable.
- ].
- ] ifFalse:[
- warnSTXBox disable.
- warnUnderscoreBox disable.
- warnDollarBox disable.
- warnOldStyleBox disable.
- warnCommonMistakesBox disable.
- warnCompatibilityBox disable.
- ]].
+ warnings value ifTrue:[
+ warnSTXBox enable.
+ warnOldStyleBox enable.
+ warnCommonMistakesBox enable.
+ warnCompatibilityBox enable.
+ allowUnderscore value ifTrue:[
+ warnUnderscoreBox enable.
+ ] ifFalse:[
+ warnUnderscoreBox disable.
+ ].
+ allowDollar value ifTrue:[
+ warnDollarBox enable.
+ ] ifFalse:[
+ warnDollarBox disable.
+ ].
+ ] ifFalse:[
+ warnSTXBox disable.
+ warnUnderscoreBox disable.
+ warnDollarBox disable.
+ warnOldStyleBox disable.
+ warnCommonMistakesBox disable.
+ warnCompatibilityBox disable.
+ ]].
warnings onChangeSend:#value to:warnEnabler.
allowUnderscore onChangeSend:#value to:warnEnabler.
@@ -1319,114 +1325,117 @@
box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
canLoadBinaries ifFalse:[
- loadBinaries value:false.
- check disable
+ loadBinaries value:false.
+ check disable
].
supportsJustInTimeCompilation ifTrue:[
- component := box
- addCheckBox:(resources string:'just in time compilation to machine code')
- on:justInTimeCompilation.
+ component := box
+ addCheckBox:(resources string:'just in time compilation to machine code')
+ on:justInTimeCompilation.
].
box addHorizontalLine.
ObjectFileLoader notNil ifTrue:[
- compilationList := box addPopUpList:(resources string:'stc compilation to machine code') on:stcCompilation.
- stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
-
- component := box
- addLabelledInputField:(resources string:'include directories:')
- adjust:#right
- on:stcIncludes
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
+ compilationList := box addPopUpList:(resources string:'stc compilation to machine code') on:stcCompilation.
+
+ thisIsADemoVersion ifFalse:[
+ stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
+
+ component := box
+ addLabelledInputField:(resources string:'include directories:')
+ adjust:#right
+ on:stcIncludes
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
"/ box addVerticalSpace.
- component := box
- addLabelledInputField:(resources string:'defines:')
- adjust:#right
- on:stcDefines
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
+ component := box
+ addLabelledInputField:(resources string:'defines:')
+ adjust:#right
+ on:stcDefines
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
"/ box addVerticalSpace.
- component := box
- addLabelledInputField:(resources string:'stc options:')
- adjust:#right
- on:stcOptions
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
+ component := box
+ addLabelledInputField:(resources string:'stc options:')
+ adjust:#right
+ on:stcOptions
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
"/ box addVerticalSpace.
- component := box
- addLabelledInputField:(resources string:'cc command:')
- adjust:#right
- on:cc
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
-
- component := box
- addLabelledInputField:(resources string:'cc options:')
- adjust:#right
- on:ccOptions
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
-
- stcLibraries notNil ifTrue:[
+ component := box
+ addLabelledInputField:(resources string:'cc command:')
+ adjust:#right
+ on:cc
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
+
+ component := box
+ addLabelledInputField:(resources string:'cc options:')
+ adjust:#right
+ on:ccOptions
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
+
+ stcLibraries notNil ifTrue:[
"/ box addVerticalSpace.
- component := box
- addLabelledInputField:(resources string:'C-libraries:')
- adjust:#right
- on:stcLibraries
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
- ].
-
- stcLibraryPath notNil ifTrue:[
+ component := box
+ addLabelledInputField:(resources string:'C-libraries:')
+ adjust:#right
+ on:stcLibraries
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
+ ].
+
+ stcLibraryPath notNil ifTrue:[
"/ box addVerticalSpace.
- component := box
- addLabelledInputField:(resources string:'stc libPath:')
- adjust:#right
- on:stcLibraryPath
- tabable:true
- separateAtX:0.3.
- component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- component preferredExtent:(250 @ component preferredExtent y).
- canLoadBinaries ifFalse:[component disable].
- ].
+ component := box
+ addLabelledInputField:(resources string:'stc libPath:')
+ adjust:#right
+ on:stcLibraryPath
+ tabable:true
+ separateAtX:0.3.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ component preferredExtent:(250 @ component preferredExtent y).
+ canLoadBinaries ifFalse:[component disable].
+ ].
+ ].
"/ box addVerticalSpace.
- box addHorizontalLine.
-
- "/ if there is no compiler around,
- "/ change to compile nothing, and disable the checkBoxes
- Compiler canCreateMachineCode ifFalse:[
- stcCompilation selectionIndex:3.
- compilationList disable.
- ].
+ box addHorizontalLine.
+
+ "/ if there is no compiler around,
+ "/ change to compile nothing, and disable the checkBoxes
+ Compiler canCreateMachineCode ifFalse:[
+ stcCompilation selectionIndex:3.
+ compilationList disable.
+ ].
].
y := box yPosition.
@@ -1488,71 +1497,73 @@
box yPosition:(yMax max: box yPosition).
box
- addHelpButtonFor:'Launcher/compilerSettings.html';
- addAbortButton;
- addOkButton.
+ addHelpButtonFor:'Launcher/compilerSettings.html';
+ addAbortButton;
+ addOkButton.
warnEnabler value.
box open.
box accepted ifTrue:[
- HistoryManager notNil ifTrue:[
- HistoryManager fullHistoryUpdate:fullHistoryUpdate value.
- historyLines value ifTrue:[
- HistoryManager activate
- ] ifFalse:[
- HistoryManager deactivate
- ].
- ].
- Class catchMethodRedefinitions:catchRedefs value.
- ClassCategoryReader sourceMode:(keepSourceOptions at:keepSource selectionIndex).
- Compiler warnings:warnings value.
- Compiler warnSTXSpecials:warnSTX value.
- Compiler warnOldStyleAssignment:warnOldStyle value.
- Compiler warnUnderscoreInIdentifier:warnUnderscore value.
- Compiler warnDollarInIdentifier:warnDollar value.
- Compiler warnCommonMistakes:warnCommonMistakes value.
- Compiler warnPossibleIncompatibilities:warnCompatibility value.
- Compiler allowUnderscoreInIdentifier:allowUnderscore value.
- Compiler allowDollarInIdentifier:allowDollar value.
- Compiler arraysAreImmutable:immutableArrays value.
- fullDebugSupport value ifTrue:[
- Compiler lineNumberInfo:#full.
- ] ifFalse:[
- Compiler lineNumberInfo:true
- ].
-
- Compiler stcCompilation:(stcCompilationOptions at:stcCompilation selectionIndex).
- Compiler stcCompilationIncludes:stcIncludes value.
- Compiler stcCompilationDefines:stcDefines value.
- Compiler stcCompilationOptions:stcOptions value.
- Compiler ccCompilationOptions:ccOptions value.
- Compiler ccPath:cc value.
- Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex).
-
- supportsJustInTimeCompilation ifTrue:[
- justInTimeCompilation value ifTrue:[
- Method allInstancesDo:[:m | m checked:false].
- ].
- ObjectMemory justInTimeCompilation:justInTimeCompilation value.
- ObjectMemory fullSingleStepSupport:fullDebugSupport value.
- ].
- ObjectFileLoader notNil ifTrue:[
- stcLibraries notNil ifTrue:[
- ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
- ].
- stcLibraryPath notNil ifTrue:[
- ObjectFileLoader libPath:(stcLibraryPath value).
- ]
- ].
- Autoload compileLazy:compileLazy value.
- Smalltalk loadBinaries:loadBinaries value.
+ HistoryManager notNil ifTrue:[
+ HistoryManager fullHistoryUpdate:fullHistoryUpdate value.
+ historyLines value ifTrue:[
+ HistoryManager activate
+ ] ifFalse:[
+ HistoryManager deactivate
+ ].
+ ].
+ Class catchMethodRedefinitions:catchRedefs value.
+ ClassCategoryReader sourceMode:(keepSourceOptions at:keepSource selectionIndex).
+ Compiler warnings:warnings value.
+ Compiler warnSTXSpecials:warnSTX value.
+ Compiler warnOldStyleAssignment:warnOldStyle value.
+ Compiler warnUnderscoreInIdentifier:warnUnderscore value.
+ Compiler warnDollarInIdentifier:warnDollar value.
+ Compiler warnCommonMistakes:warnCommonMistakes value.
+ Compiler warnPossibleIncompatibilities:warnCompatibility value.
+ Compiler allowUnderscoreInIdentifier:allowUnderscore value.
+ Compiler allowDollarInIdentifier:allowDollar value.
+ Compiler arraysAreImmutable:immutableArrays value.
+ fullDebugSupport value ifTrue:[
+ Compiler lineNumberInfo:#full.
+ ] ifFalse:[
+ Compiler lineNumberInfo:true
+ ].
+
+ Compiler stcCompilation:(stcCompilationOptions at:stcCompilation selectionIndex).
+ thisIsADemoVersion ifFalse:[
+ Compiler stcCompilationIncludes:stcIncludes value.
+ Compiler stcCompilationDefines:stcDefines value.
+ Compiler stcCompilationOptions:stcOptions value.
+ Compiler ccCompilationOptions:ccOptions value.
+ Compiler ccPath:cc value.
+ ].
+ Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex).
+
+ supportsJustInTimeCompilation ifTrue:[
+ justInTimeCompilation value ifTrue:[
+ Method allInstancesDo:[:m | m checked:false].
+ ].
+ ObjectMemory justInTimeCompilation:justInTimeCompilation value.
+ ObjectMemory fullSingleStepSupport:fullDebugSupport value.
+ ].
+ ObjectFileLoader notNil ifTrue:[
+ stcLibraries notNil ifTrue:[
+ ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
+ ].
+ stcLibraryPath notNil ifTrue:[
+ ObjectFileLoader libPath:(stcLibraryPath value).
+ ]
+ ].
+ Autoload compileLazy:compileLazy value.
+ Smalltalk loadBinaries:loadBinaries value.
].
box destroy
"Modified: / 10.9.1995 / 19:19:18 / claus"
"Modified: / 9.9.1996 / 22:42:47 / stefan"
- "Modified: / 29.10.1997 / 15:48:31 / cg"
+ "Modified: / 23.4.1998 / 14:22:21 / cg"
!
displaySettings
@@ -5002,5 +5013,5 @@
!Launcher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.323 1998-04-23 09:43:05 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.324 1998-04-23 12:24:59 cg Exp $'
! !