oops - stc compilation parameters
authorClaus Gittinger <cg@exept.de>
Wed, 21 Oct 1998 19:16:56 +0200
changeset 1947 1e3ccc0b663e
parent 1946 d942281c3222
child 1948 c5d2e8aac578
oops - stc compilation parameters
Launcher.st
--- a/Launcher.st	Wed Oct 21 17:21:23 1998 +0200
+++ b/Launcher.st	Wed Oct 21 19:16:56 1998 +0200
@@ -2851,51 +2851,51 @@
 
     thisIsADemoVersion := (Smalltalk releaseIdentification = 'ST/X_free_demo_vsn').
     thisIsADemoVersion ifTrue:[
-	stcCompilationOptions := #( never).
-	strings := #('never').
-	idx := 1.
+        stcCompilationOptions := #( never).
+        strings := #('never').
+        idx := 1.
     ] ifFalse:[
-	stcCompilationOptions := #( always default never).
-	strings := #('always' 'primitive code only' 'never').
-	idx := 2.
+        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.
 
-    stcIncludes := Compiler stcCompilationIncludes asValue.
-    stcDefines := Compiler stcCompilationDefines asValue.
-    stcOptions := Compiler stcCompilationOptions asValue.
-    ccOptions := Compiler ccCompilationOptions asValue.
-    cc := Compiler ccPath asValue.
-    stc := Compiler stcPath asValue.
-
-    ObjectFileLoader notNil ifTrue:[
-	(t := ObjectFileLoader searchedLibraries) notNil ifTrue:[
-	    stcLibraries := (String fromStringCollection:t separatedBy:' ') asValue.
-	].
-	(t := ObjectFileLoader libPath) notNil ifTrue:[
-	    stcLibraryPath := t asValue.
-	]
-    ].
+"/    stcIncludes := Compiler stcCompilationIncludes asValue.
+"/    stcDefines := Compiler stcCompilationDefines asValue.
+"/    stcOptions := Compiler stcCompilationOptions asValue.
+"/    ccOptions := Compiler ccCompilationOptions asValue.
+"/    cc := Compiler ccPath asValue.
+"/    stc := Compiler stcPath asValue.
+
+"/    ObjectFileLoader notNil ifTrue:[
+"/        (t := ObjectFileLoader searchedLibraries) notNil ifTrue:[
+"/            stcLibraries := (String fromStringCollection:t separatedBy:' ') asValue.
+"/        ].
+"/        (t := ObjectFileLoader libPath) notNil ifTrue:[
+"/            stcLibraryPath := t asValue.
+"/        ]
+"/    ].
 
     catchMethodRedefs := Class catchMethodRedefinitions asValue.
     catchClassRedefs := Class catchClassRedefinitions asValue.
     historyLines := HistoryManager notNil and:[HistoryManager isLoaded and:[HistoryManager isActive]].
     historyLines ifFalse:[
-	fullHistoryUpdate := false asValue   
+        fullHistoryUpdate := false asValue   
     ] ifTrue:[
-	fullHistoryUpdate := HistoryManager fullHistoryUpdate asValue.
+        fullHistoryUpdate := HistoryManager fullHistoryUpdate asValue.
     ].
     historyLines := historyLines asValue.
 
@@ -2904,29 +2904,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.
@@ -2960,28 +2960,28 @@
     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.
-
-	thisIsADemoVersion ifFalse:[
-	    stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
-
-	    stcSetupButt := box addComponent:(Button label:(resources string:'stc compilation parameters...') 
-		       action:[|manager|
-
-			       self stcCompilerSettingsFor:requestor.
-			      ]).
+        compilationList := box addPopUpList:(resources string:'stc compilation to machine code') on:stcCompilation.
+
+        thisIsADemoVersion ifFalse:[
+            stcCompilation selectionIndex:( stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2).
+
+            stcSetupButt := box addComponent:(Button label:(resources string:'stc compilation parameters...') 
+                       action:[|manager|
+
+                               self stcCompilerSettingsFor:requestor.
+                              ]).
 
 "/            component := box 
 "/                            addLabelledInputField:(resources string:'stc command:')
@@ -3068,16 +3068,16 @@
 "/                canLoadBinaries ifFalse:[component disable].
 "/            ].
 
-	].
-
-	box addHorizontalLine.
-
-	"/ if there is no compiler around,
-	"/ change to compile nothing, and disable the checkBoxes
-	Compiler canCreateMachineCode ifFalse:[
-	    stcCompilation selectionIndex:(3 min:stcCompilationOptions size).
-	    compilationList disable.
-	].
+        ].
+
+        box addHorizontalLine.
+
+        "/ if there is no compiler around,
+        "/ change to compile nothing, and disable the checkBoxes
+        Compiler canCreateMachineCode ifFalse:[
+            stcCompilation selectionIndex:(3 min:stcCompilationOptions size).
+            compilationList disable.
+        ].
     ].
 
     y := box yPosition.
@@ -3139,77 +3139,77 @@
     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:catchMethodRedefs value.
-	Class catchClassRedefinitions:catchClassRedefs 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.
-	    stc value ~= Compiler stcPath ifTrue:[
-		Compiler stcPath:stc 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:catchMethodRedefs value.
+        Class catchClassRedefinitions:catchClassRedefs 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.
+"/            stc value ~= Compiler stcPath ifTrue:[
+"/                Compiler stcPath:stc 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: / 2.10.1998 / 18:57:34 / cg"
+    "Modified: / 21.10.1998 / 19:14:48 / cg"
 !
 
 displaySettingsFor:requestor
@@ -4905,12 +4905,12 @@
     linkArgs := ObjectFileLoader linkArgs 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.
+        ]
     ].
 
     box := DialogBox new.
@@ -4918,160 +4918,160 @@
 
     thisIsADemoVersion := (Smalltalk releaseIdentification = 'ST/X_free_demo_vsn').
     ObjectFileLoader notNil ifTrue:[
-	thisIsADemoVersion ifFalse:[
-
-	    component := box 
-			    addLabelledInputField:(resources string:'stc command:')
-			    adjust:#right
-			    on:stc 
-			    tabable:true
-			    separateAtX:0.3.
-	    component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
-	    component preferredExtent:(100 @ 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].
-
-	    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:(150 @ 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].
-
-	    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].
+        thisIsADemoVersion ifFalse:[
+
+            component := box 
+                            addLabelledInputField:(resources string:'stc command:')
+                            adjust:#right
+                            on:stc 
+                            tabable:true
+                            separateAtX:0.3.
+            component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+            component preferredExtent:(100 @ 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].
+
+            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:(150 @ 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].
+
+            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.
 
 "/        box addVerticalSpace.
 
-	    component := box 
-			    addLabelledInputField:(resources string:'link command:')
-			    adjust:#right
-			    on:linkCommand 
-			    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:'link args:')
-			    adjust:#right
-			    on:linkArgs 
-			    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:'link command:')
+                            adjust:#right
+                            on:linkCommand 
+                            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:'link args:')
+                            adjust:#right
+                            on:linkArgs 
+                            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 
-	addHelpButtonFor:'Launcher/compilerSettings.html';
-	addAbortButton; 
-	addOkButton.
+        addHelpButtonFor:'Launcher/compilerSettings.html';
+        addAbortButton; 
+        addOkButton.
 
     box open.
 
     box accepted ifTrue:[
-	thisIsADemoVersion  ifFalse:[
-	    Compiler stcCompilationIncludes:stcIncludes value.
-	    Compiler stcCompilationDefines:stcDefines value.
-	    Compiler stcCompilationOptions:stcOptions value.
-	    Compiler ccCompilationOptions:ccOptions value.
-	    Compiler ccPath:cc value.
-	    stc value ~= Compiler stcPath ifTrue:[
-		Compiler stcPath:stc value
-	    ].
-	    ObjectFileLoader linkCommand:linkCommand value.
-	    ObjectFileLoader linkArgs:linkArgs value.
-	].
-
-	ObjectFileLoader notNil ifTrue:[
-	    stcLibraries notNil ifTrue:[
-		ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
-	    ].
-	    stcLibraryPath notNil ifTrue:[
-		ObjectFileLoader libPath:(stcLibraryPath value).
-	    ]
-	].
+        thisIsADemoVersion  ifFalse:[
+            Compiler stcCompilationIncludes:stcIncludes value.
+            Compiler stcCompilationDefines:stcDefines value.
+            Compiler stcCompilationOptions:stcOptions value.
+            Compiler ccCompilationOptions:ccOptions value.
+            Compiler ccPath:cc value.
+            stc value ~= Compiler stcPath ifTrue:[
+                Compiler stcPath:stc value
+            ].
+            ObjectFileLoader linkCommand:linkCommand value.
+            ObjectFileLoader linkArgs:linkArgs value.
+        ].
+
+        ObjectFileLoader notNil ifTrue:[
+            stcLibraries notNil ifTrue:[
+                ObjectFileLoader searchedLibraries:(stcLibraries value asCollectionOfWords).
+            ].
+            stcLibraryPath notNil ifTrue:[
+                ObjectFileLoader libPath:(stcLibraryPath value).
+            ]
+        ].
     ].
     box destroy
 
     "Modified: / 10.9.1995 / 19:19:18 / claus"
     "Modified: / 9.9.1996 / 22:42:47 / stefan"
     "Created: / 2.10.1998 / 16:27:49 / cg"
-    "Modified: / 2.10.1998 / 16:39:43 / cg"
+    "Modified: / 21.10.1998 / 19:15:10 / cg"
 !
 
 toolSettingsFor:requestor
@@ -5957,5 +5957,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.387 1998-10-19 22:39:10 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.388 1998-10-21 17:16:56 cg Exp $'
 ! !