--- a/Launcher.st	Thu Oct 29 12:18:48 1998 +0100
+++ b/Launcher.st	Thu Nov 05 13:05:52 1998 +0100
@@ -2822,6 +2822,7 @@
      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
@@ -2862,33 +2863,26 @@
 
     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.
     ] ifFalse:[
-        justInTimeCompilation := false.
+        justInTimeCompilation := javaJustInTimeCompilation := false.
         fullDebugSupport := (Compiler lineNumberInfo == #full) asValue.
     ].
     justInTimeCompilation := justInTimeCompilation asValue.
+    javaJustInTimeCompilation := javaJustInTimeCompilation 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.
-"/        ]
-"/    ].
-
     catchMethodRedefs := Class catchMethodRedefinitions asValue.
     catchClassRedefs := Class catchClassRedefinitions asValue.
     historyLines := HistoryManager notNil and:[HistoryManager isLoaded and:[HistoryManager isActive]].
@@ -2967,6 +2961,11 @@
         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.
@@ -2982,92 +2981,6 @@
 
                                self stcCompilerSettingsFor:requestor.
                               ]).
-
-"/            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:'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].
-"/
-"/            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:'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].
-"/
-"/            stcLibraries 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:[
-"/                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 addHorizontalLine.
@@ -3175,33 +3088,21 @@
         ].
 
         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].
             ].
+            supportsJava ifTrue:[
+                javaJustInTimeCompilation value ifTrue:[
+                    JavaMethod allInstancesDo:[:m | m checked:false].
+                ].
+            ].
             ObjectMemory justInTimeCompilation:justInTimeCompilation value.
+            ObjectMemory javaJustInTimeCompilation:javaJustInTimeCompilation 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.
     ].
@@ -3209,7 +3110,7 @@
 
     "Modified: / 10.9.1995 / 19:19:18 / claus"
     "Modified: / 9.9.1996 / 22:42:47 / stefan"
-    "Modified: / 21.10.1998 / 19:14:48 / cg"
+    "Modified: / 5.11.1998 / 13:04:01 / cg"
 !
 
 displaySettingsFor:requestor
@@ -5957,5 +5858,5 @@
 !Launcher class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.388 1998-10-21 17:16:56 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Launcher.st,v 1.389 1998-11-05 12:05:52 cg Exp $'
 ! !