--- a/Launcher.st Fri Apr 12 19:09:48 1996 +0200
+++ b/Launcher.st Sat Apr 13 13:52:46 1996 +0200
@@ -613,7 +613,7 @@
stcCompilation compilationList stcCompilationOptions stcIncludes stcDefines stcOptions
stcLibraries historyLines sourceMode catchRedefs keepSourceOptions keepSource
foldConstants constantFoldingOptions constantFolding
- warnEnabler check y component oldIndent|
+ warnEnabler check component oldIndent|
warnings := Compiler warnings asValue.
@@ -681,36 +681,70 @@
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.
+ component := box
+ addLabelledInputField:(resources string:'stc include directories:')
+ adjust:#right
+ on:stcIncludes
+ tabable:true
+ separateAtX:0.5.
+ component 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.
+
+ component := box
+ addLabelledInputField:(resources string:'stc defines:')
+ adjust:#right
+ on:stcDefines
+ tabable:true
+ separateAtX:0.5.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+
+"/ 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.
+
+ component := box
+ addLabelledInputField:(resources string:'stc options:')
+ adjust:#right
+ on:stcOptions
+ tabable:true
+ separateAtX:0.5.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+"/ 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.
+
+ component := box
+ addLabelledInputField:(resources string:'stc C-libraries:')
+ adjust:#right
+ on:stcLibraries
+ tabable:true
+ separateAtX:0.5.
+ component immediateAccept:true; acceptOnLeave:false; cursorMovementWhenUpdating:#beginOfLine.
+
+"/ 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.
@@ -780,7 +814,7 @@
box destroy
"Modified: 10.9.1995 / 19:19:18 / claus"
- "Modified: 20.2.1996 / 23:52:33 / cg"
+ "Modified: 13.4.1996 / 13:51:37 / cg"
!
fontSettings
@@ -964,7 +998,7 @@
memorySettings
|box check igcLimit igcFreeLimit igcFreeAmount newSpaceSize
compressLimit
- oldIncr y component fields|
+ oldIncr component fields|
"/
"/ extract relevant system settings ...
@@ -989,77 +1023,84 @@
You have been warned.'.
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'size of newSpace :').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:newSpaceSize tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'size of newSpace:')
+ adjust:#right
+ on:newSpaceSize
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'incremental GC allocation trigger:').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:igcLimit tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'incremental GC allocation trigger:')
+ adjust:#right
+ on:igcLimit
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
+
box addTextLabel:'(start IGC whenever this amount has been allocated)'.
-
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'incremental GC freespace trigger:').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:igcFreeLimit tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'incremental GC freespace trigger:')
+ adjust:#right
+ on:igcFreeLimit
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
+
box addTextLabel:'(start IGC whenever freespace drops below this)'.
-
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'incremental GC amount:').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:igcFreeAmount tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'incremental GC amount:')
+ adjust:#right
+ on:igcFreeAmount
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
+
box addTextLabel:'(try to keep this amount for peak requests)'.
-
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'oldspace increment:').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:oldIncr tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'oldspace increment:')
+ adjust:#right
+ on:oldIncr
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
+
box addTextLabel:'(increase oldSpace in chunks of this size)'.
-
box addHorizontalLine.
- y := box yPosition.
- component := box addTextLabel:(resources string:'oldspace compress limit:').
- component width:0.7; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:compressLimit tabable:true.
+ component := box
+ addLabelledInputField:(resources string:'oldspace compress limit:')
+ adjust:#right
+ on:compressLimit
+ tabable:true
+ separateAtX:0.7.
+ component acceptOnLeave:false.
+ component converter:(PrintConverter new initForNumber).
fields add:component.
- component width:0.3; left:0.7; acceptOnLeave:false.
- component converter:(PrintConverter new initForNumber).
+
box addTextLabel:'(suppress compressing GC if more memory is in use)'.
+ box addHorizontalLine.
- box addHorizontalLine.
box addAbortButton; addOkButton.
"/
@@ -1071,28 +1112,28 @@
"/ update system settings
"/
box accepted ifTrue:[
- fields do:[:comp | comp accept].
+ fields do:[:comp | comp accept].
- igcFreeAmount value ~~ ObjectMemory freeSpaceGCAmount ifTrue:[
- ObjectMemory freeSpaceGCAmount:igcFreeAmount value.
- ].
- igcFreeLimit value ~~ ObjectMemory freeSpaceGCLimit ifTrue:[
- ObjectMemory freeSpaceGCLimit:igcFreeLimit value.
- ].
- igcLimit value ~~ ObjectMemory incrementalGCLimit ifTrue:[
- ObjectMemory incrementalGCLimit:igcLimit value.
- ].
- newSpaceSize value ~~ ObjectMemory newSpaceSize ifTrue:[
- ObjectMemory newSpaceSize:newSpaceSize value.
- ].
- oldIncr value ~~ ObjectMemory oldSpaceIncrement ifTrue:[
- ObjectMemory oldSpaceIncrement:oldIncr value.
- ].
- ObjectMemory oldSpaceCompressLimit:compressLimit value.
+ igcFreeAmount value ~~ ObjectMemory freeSpaceGCAmount ifTrue:[
+ ObjectMemory freeSpaceGCAmount:igcFreeAmount value.
+ ].
+ igcFreeLimit value ~~ ObjectMemory freeSpaceGCLimit ifTrue:[
+ ObjectMemory freeSpaceGCLimit:igcFreeLimit value.
+ ].
+ igcLimit value ~~ ObjectMemory incrementalGCLimit ifTrue:[
+ ObjectMemory incrementalGCLimit:igcLimit value.
+ ].
+ newSpaceSize value ~~ ObjectMemory newSpaceSize ifTrue:[
+ ObjectMemory newSpaceSize:newSpaceSize value.
+ ].
+ oldIncr value ~~ ObjectMemory oldSpaceIncrement ifTrue:[
+ ObjectMemory oldSpaceIncrement:oldIncr value.
+ ].
+ ObjectMemory oldSpaceCompressLimit:compressLimit value.
].
box destroy
- "Modified: 1.2.1996 / 11:43:28 / cg"
+ "Modified: 13.4.1996 / 13:51:23 / cg"
!
messageSettings
@@ -1130,7 +1171,7 @@
|box check logDoits shadows updChanges changeFileName returnFocus
loadBinaries compileLazy hostNameInLabel useManager localSourceFirst
showAccelerators
- y component localCheck oldIndent|
+ component localCheck oldIndent|
"/
"/ extract relevant system settings ...
@@ -1157,12 +1198,20 @@
box addCheckBox:(resources string:'log compiles in changes file') on:updChanges.
box addCheckBox:(resources string:'log doIts in changes file') on:logDoits.
- y := box yPosition.
- component := box addTextLabel:(resources string:'change file name:').
- component width:0.5; adjust:#right; borderWidth:0.
- box yPosition:y.
- component := box addInputFieldOn:changeFileName tabable:true.
- component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false.
+ component := box
+ addLabelledInputField:(resources string:'change file name:')
+ adjust:#right
+ on:changeFileName
+ tabable:true
+ separateAtX:0.5.
+ component immediateAccept:true; acceptOnLeave:false.
+
+"/ y := box yPosition.
+"/ component := box addTextLabel:(resources string:'change file name:').
+"/ component width:0.5; adjust:#right; borderWidth:0.
+"/ box yPosition:y.
+"/ component := box addInputFieldOn:changeFileName tabable:true.
+"/ component width:0.5; left:0.5; immediateAccept:true; acceptOnLeave:false.
box addHorizontalLine.
@@ -1230,7 +1279,7 @@
].
box destroy
- "Modified: 22.3.1996 / 15:13:50 / cg"
+ "Modified: 13.4.1996 / 13:51:30 / cg"
!
printerSettings
@@ -2409,5 +2458,5 @@
!NewLauncher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.104 1996-04-11 14:41:35 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.105 1996-04-13 11:52:46 cg Exp $'
! !