--- a/Launcher.st Mon Dec 04 20:19:01 1995 +0100
+++ b/Launcher.st Tue Dec 05 11:29:51 1995 +0100
@@ -593,27 +593,29 @@
stcIncludes := Compiler stcCompilationIncludes asValue.
stcDefines := Compiler stcCompilationDefines asValue.
stcOptions := Compiler stcCompilationOptions asValue.
- stcLibraries := (String fromStringCollection:ObjectFileLoader searchedLibraries separatedBy:' ') asValue.
+ ObjectFileLoader notNil ifTrue:[
+ stcLibraries := (String fromStringCollection:ObjectFileLoader searchedLibraries separatedBy:' ') asValue.
+ ].
catchRedefs := Class catchMethodRedefinitions asValue.
historyLines := (HistoryManager notNil and:[HistoryManager isActive]) asValue.
warnEnabler := Plug new.
warnEnabler
- respondTo:#check
- with:[warnings value ifTrue:[
- warnSTXBox enable.
- warnOldStyleBox enable.
- allowUnderscore value ifTrue:[
- warnUnderscoreBox enable.
- ] ifFalse:[
- warnUnderscoreBox disable.
- ].
- ] ifFalse:[
- warnSTXBox disable.
- warnUnderscoreBox disable.
- warnOldStyleBox disable.
- ]].
+ respondTo:#check
+ with:[warnings value ifTrue:[
+ warnSTXBox enable.
+ warnOldStyleBox enable.
+ allowUnderscore value ifTrue:[
+ warnUnderscoreBox enable.
+ ] ifFalse:[
+ warnUnderscoreBox disable.
+ ].
+ ] ifFalse:[
+ warnSTXBox disable.
+ warnUnderscoreBox disable.
+ warnOldStyleBox disable.
+ ]].
warnings onChangeSend:#check to:warnEnabler.
allowUnderscore onChangeSend:#check to:warnEnabler.
@@ -627,48 +629,50 @@
box addHorizontalLine.
- compilationList := box addPopUpList:(resources string:'compilation to machine code') on:stcCompilation.
- stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
+ ObjectFileLoader notNil ifTrue:[
+ compilationList := box addPopUpList:(resources string:'compilation to machine code') on:stcCompilation.
+ stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
- y := box yPosition.
- component := box addTextLabel:(resources string:'stc include directories:').
- component width:0.5; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:stcIncludes tabable:true.
- component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ y := box yPosition.
+ component := box addTextLabel:(resources string:'stc include directories:').
+ component width:0.5; adjust:#right; borderWidth:0.
+ box yPosition:y.
+ component := box addInputFieldOn:stcIncludes tabable:true.
+ component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- box addVerticalSpace.
- y := box yPosition.
- component := box addTextLabel:'stc defines:'.
- component width:0.5; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:stcDefines tabable:true.
- component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ box addVerticalSpace.
+ y := box yPosition.
+ component := box addTextLabel:'stc defines:'.
+ component width:0.5; adjust:#right; borderWidth:0.
+ box yPosition:y.
+ component := box addInputFieldOn:stcDefines tabable:true.
+ component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- box addVerticalSpace.
- y := box yPosition.
- component := box addTextLabel:'stc options:'.
- component width:0.5; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:stcOptions tabable:true.
- component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ box addVerticalSpace.
+ y := box yPosition.
+ component := box addTextLabel:'stc options:'.
+ component width:0.5; adjust:#right; borderWidth:0.
+ box yPosition:y.
+ component := box addInputFieldOn:stcOptions tabable:true.
+ component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- box addVerticalSpace.
- y := box yPosition.
- component := box addTextLabel:'stc C-libraries:'.
- component width:0.5; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:stcLibraries tabable:true.
- component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+ box addVerticalSpace.
+ y := box yPosition.
+ component := box addTextLabel:'stc C-libraries:'.
+ component width:0.5; adjust:#right; borderWidth:0.
+ box yPosition:y.
+ component := box addInputFieldOn:stcLibraries tabable:true.
+ component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
- box addVerticalSpace.
- box addHorizontalLine.
+ 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.
+ "/ if there is no compiler around,
+ "/ change to compile nothing, and disable the checkBoxes
+ Compiler canCreateMachineCode ifFalse:[
+ stcCompilation selectionIndex:3.
+ compilationList disable.
+ ].
].
box addCheckBox:(resources string:'allow underscore in identifiers') on:allowUnderscore.
@@ -693,25 +697,25 @@
box showAtPointer.
box accepted ifTrue:[
- HistoryManager notNil ifTrue:[
- historyLines value ifTrue:[
- HistoryManager activate
- ] ifFalse:[
- HistoryManager deactivate
- ].
- ].
- Class catchMethodRedefinitions:catchRedefs value.
- Compiler warnings:warnings value.
- Compiler warnSTXSpecials:warnSTX value.
- Compiler warnOldStyleAssignment:warnOldStyle value.
- Compiler warnUnderscoreInIdentifier:warnUnderscore value.
- Compiler allowUnderscoreInIdentifier:allowUnderscore value.
- Compiler arraysAreImmutable:immutableArrays value.
- Compiler stcCompilation:(stcCompilationOptions at:stcCompilation selectionIndex).
- Compiler stcCompilationIncludes:stcIncludes value.
- Compiler stcCompilationDefines:stcDefines value.
- Compiler stcCompilationOptions:stcOptions value.
- ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
+ HistoryManager notNil ifTrue:[
+ historyLines value ifTrue:[
+ HistoryManager activate
+ ] ifFalse:[
+ HistoryManager deactivate
+ ].
+ ].
+ Class catchMethodRedefinitions:catchRedefs value.
+ Compiler warnings:warnings value.
+ Compiler warnSTXSpecials:warnSTX value.
+ Compiler warnOldStyleAssignment:warnOldStyle value.
+ Compiler warnUnderscoreInIdentifier:warnUnderscore value.
+ Compiler allowUnderscoreInIdentifier:allowUnderscore value.
+ Compiler arraysAreImmutable:immutableArrays value.
+ Compiler stcCompilation:(stcCompilationOptions at:stcCompilation selectionIndex).
+ Compiler stcCompilationIncludes:stcIncludes value.
+ Compiler stcCompilationDefines:stcDefines value.
+ Compiler stcCompilationOptions:stcOptions value.
+ ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
]
"Modified: 10.9.1995 / 19:19:18 / claus"
@@ -936,8 +940,8 @@
box addCheckBox:(resources string:'lazy compilation when autoloading') on:compileLazy.
check := box addCheckBox:(resources string:'if present, load binary objects when autoloading') on:loadBinaries.
ObjectFileLoader isNil ifTrue:[
- loadBinaries value:false.
- check disable
+ loadBinaries value:false.
+ check disable
].
box addHorizontalLine.
@@ -948,13 +952,13 @@
box showAtPointer.
box accepted ifTrue:[
- Smalltalk logDoits:logDoits value.
- PopUpView shadows:shadows value.
- Class updateChanges:updChanges value.
- Autoload compileLazy:compileLazy value.
- Smalltalk loadBinaries:loadBinaries value.
- StandardSystemView includeHostNameInLabel:hostNameInLabel value.
- ObjectMemory nameForChanges:changeFileName value.
+ Smalltalk logDoits:logDoits value.
+ PopUpView shadows:shadows value.
+ Class updateChanges:updChanges value.
+ Autoload compileLazy:compileLazy value.
+ Smalltalk loadBinaries:loadBinaries value.
+ StandardSystemView includeHostNameInLabel:hostNameInLabel value.
+ ObjectMemory nameForChanges:changeFileName value.
]
"Modified: 4.12.1995 / 01:10:49 / cg"
@@ -1906,5 +1910,5 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.57 1995-12-04 19:17:08 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.58 1995-12-05 10:29:51 chrisy Exp $'
! !