--- a/Launcher.st Thu Nov 05 13:05:52 1998 +0100
+++ b/Launcher.st Thu Nov 05 14:27:20 1998 +0100
@@ -2822,7 +2822,6 @@
stcLibraries stcLibraryPath cc stc ccOptions historyLines fullHistoryUpdate
catchMethodRedefs catchClassRedefs keepSourceOptions keepSource
constantFoldingOptions constantFolding justInTimeCompilation
- supportsJava javaJustInTimeCompilation
warnEnabler check component oldIndent t supportsJustInTimeCompilation y
y2 fullDebugSupport yMax
compileLazy loadBinaries canLoadBinaries strings idx thisIsADemoVersion
@@ -2864,23 +2863,15 @@
stcCompilation := SelectionInList new list:(resources array:strings).
stcCompilation selectionIndex:idx.
- supportsJava := JavaMethod notNil and:[JavaVM notNil].
-
(supportsJustInTimeCompilation := ObjectMemory supportsJustInTimeCompilation)
ifTrue:[
- justInTimeCompilation := ObjectMemory justInTimeCompilation:nil.
- supportsJava ifTrue:[
- javaJustInTimeCompilation := ObjectMemory javaJustInTimeCompilation:nil.
- ] ifFalse:[
- javaJustInTimeCompilation := false
- ].
- fullDebugSupport := ObjectMemory fullSingleStepSupport:nil.
+ justInTimeCompilation := ObjectMemory justInTimeCompilation.
+ fullDebugSupport := ObjectMemory fullSingleStepSupport.
] ifFalse:[
- justInTimeCompilation := javaJustInTimeCompilation := false.
+ justInTimeCompilation := false.
fullDebugSupport := (Compiler lineNumberInfo == #full) asValue.
].
justInTimeCompilation := justInTimeCompilation asValue.
- javaJustInTimeCompilation := javaJustInTimeCompilation asValue.
fullDebugSupport := fullDebugSupport asValue.
catchMethodRedefs := Class catchMethodRedefinitions asValue.
@@ -2961,11 +2952,6 @@
component := box
addCheckBox:(resources string:'just in time compilation to machine code')
on:justInTimeCompilation.
- supportsJava ifTrue:[
- component := box
- addCheckBox:(resources string:'java just in time compilation to machine code')
- on:javaJustInTimeCompilation.
- ]
].
box addHorizontalLine.
@@ -3091,16 +3077,11 @@
Compiler foldConstants:(constantFoldingOptions at:constantFolding selectionIndex).
supportsJustInTimeCompilation ifTrue:[
- justInTimeCompilation value ifTrue:[
+ justInTimeCompilation := justInTimeCompilation value.
+ justInTimeCompilation ifTrue:[
Method allInstancesDo:[:m | m checked:false].
].
- supportsJava ifTrue:[
- javaJustInTimeCompilation value ifTrue:[
- JavaMethod allInstancesDo:[:m | m checked:false].
- ].
- ].
- ObjectMemory justInTimeCompilation:justInTimeCompilation value.
- ObjectMemory javaJustInTimeCompilation:javaJustInTimeCompilation value.
+ ObjectMemory justInTimeCompilation:justInTimeCompilation.
ObjectMemory fullSingleStepSupport:fullDebugSupport value.
].
Autoload compileLazy:compileLazy value.
@@ -3110,7 +3091,7 @@
"Modified: / 10.9.1995 / 19:19:18 / claus"
"Modified: / 9.9.1996 / 22:42:47 / stefan"
- "Modified: / 5.11.1998 / 13:04:01 / cg"
+ "Modified: / 5.11.1998 / 14:25:59 / cg"
!
displaySettingsFor:requestor
@@ -3326,13 +3307,21 @@
"open a dialog on infoMessage related settings"
|box audio javaHome resources component
- extraFileSecurityChecks extraSocketSecurityChecks|
+ extraFileSecurityChecks extraSocketSecurityChecks
+ supportsJustInTimeCompilation
+ javaJustInTimeCompilation javaNativeCodeOptimization|
resources := requestor class classResources.
audio := JavaVM audioEnabled asValue.
extraFileSecurityChecks := JavaVM fileOpenConfirmation asValue.
extraSocketSecurityChecks := JavaVM socketConnectConfirmation asValue.
+ (supportsJustInTimeCompilation := ObjectMemory supportsJustInTimeCompilation) ifTrue:[
+ javaJustInTimeCompilation := ObjectMemory javaJustInTimeCompilation asValue.
+ javaNativeCodeOptimization := ObjectMemory javaNativeCodeOptimization asValue.
+ ] ifFalse:[
+ javaJustInTimeCompilation := javaNativeCodeOptimization := false
+ ].
javaHome := (Java javaHome ? '') asValue.
@@ -3343,6 +3332,15 @@
box addCheckBox:(resources string:'Confirm file open for write') on:extraFileSecurityChecks.
box addCheckBox:(resources string:'Confirm socket connect') on:extraSocketSecurityChecks.
box addHorizontalLine.
+ supportsJustInTimeCompilation ifTrue:[
+ box
+ addCheckBox:(resources string:'java just in time compilation to machine code')
+ on:javaJustInTimeCompilation.
+ box
+ addCheckBox:(resources string:'optimize native code')
+ on:javaNativeCodeOptimization.
+ ].
+ box addHorizontalLine.
component := box
addLabelledInputField:(resources string:'java home:')
adjust:#right
@@ -3379,11 +3377,20 @@
JavaVM audioEnabled:audio value.
JavaVM fileOpenConfirmation: extraFileSecurityChecks value.
JavaVM socketConnectConfirmation: extraSocketSecurityChecks value.
+ javaJustInTimeCompilation value ~~ ObjectMemory javaJustInTimeCompilation ifTrue:[
+ ObjectMemory javaJustInTimeCompilation:javaJustInTimeCompilation value.
+ javaJustInTimeCompilation value ifTrue:[
+ JavaMethod allInstancesDo:[:m | m checked:false].
+ ].
+ ].
+ javaNativeCodeOptimization value ~~ ObjectMemory javaNativeCodeOptimization ifTrue:[
+ ObjectMemory javaNativeCodeOptimization:javaNativeCodeOptimization value.
+ ].
].
box destroy
"Created: / 18.7.1998 / 22:32:58 / cg"
- "Modified: / 19.10.1998 / 18:08:30 / cg"
+ "Modified: / 5.11.1998 / 14:24:25 / cg"
!
keyboardSettingsFor:requestor
@@ -5858,5 +5865,5 @@
!Launcher class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.389 1998-11-05 12:05:52 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.390 1998-11-05 13:27:20 cg Exp $'
! !