STC settings cleanup: cleaned up C flags settings jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Sat, 05 Dec 2015 07:23:08 +0000
branchjv
changeset 15985 62b9a70f8323
parent 15984 a4af4142d67b
child 15986 df48308c20cf
STC settings cleanup: cleaned up C flags settings For user's courtesy, also show flags that are passed to the C compiler always (by STCCompilerInterface). Cleaned up initialization of flags for GCC.
AbstractSettingsApplication.st
abbrev.stc
stx_libtool.st
--- a/AbstractSettingsApplication.st	Thu Dec 10 06:39:51 2015 +0100
+++ b/AbstractSettingsApplication.st	Sat Dec 05 07:23:08 2015 +0000
@@ -12451,6 +12451,35 @@
     ^ #('primitive code only' 'never')
 ! !
 
+!AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'help specs'!
+
+helpSpec
+    "This resource specification was automatically generated
+     by the UIHelpTool of ST/X."
+
+    "Do not manually edit this!! If it is corrupted,
+     the UIHelpTool may not be able to read the specification."
+
+    "
+     UIHelpTool openOnClass:AbstractSettingsApplication::STCCompilerSettingsAppl    
+    "
+
+    <resource: #help>
+
+    ^ super helpSpec addPairsFrom:#(
+
+#ccOptions
+'Additional flags to pass to the C compiler when compiling a module. 
+In most cases this can be left empty.'
+
+#ccOptionsBuiltin
+'These options are always passed to the C compiler.'
+
+)
+
+    "Modified: / 09-12-2015 / 09:58:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'image specs'!
 
 defaultIcon
@@ -12581,499 +12610,536 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
     #(FullSpec
        name: windowSpec
-       window:
+       window: 
       (WindowSpec
-	 label: 'STC Compiler Settings'
-	 name: 'STC Compiler Settings'
-	 flags: 1
-	 min: (Point 10 10)
-	 bounds: (Rectangle 0 0 600 602)
-       )
-       component:
+         label: 'STC Compiler Settings'
+         name: 'STC Compiler Settings'
+         flags: 1
+         min: (Point 10 10)
+         bounds: (Rectangle 0 0 600 602)
+       )
+       component: 
       (SpecCollection
-	 collection: (
-	  (VerticalPanelViewSpec
-	     name: 'VerticalPanel2'
-	     layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
-	     horizontalLayout: fit
-	     verticalLayout: top
-	     horizontalSpace: 3
-	     verticalSpace: 0
-	     component:
-	    (SpecCollection
-	       collection: (
-		(ViewSpec
-		   name: 'SeparatingBox1'
-		   extent: (Point 600 4)
-		 )
-		(ViewSpec
-		   name: 'InfoTextBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 name: 'Label14'
-			 layout: (LayoutFrame 0 0 0 0 0 1 0 1)
-			 translateLabel: true
-			 labelChannel: helpText
-			 adjust: left
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 90)
-		 )
-		(ViewSpec
-		   name: 'STCCompilationBox11'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'STC Compilation to Machine Code:'
-			 name: 'Label11'
-			 layout: (LayoutFrame 0 0 0 0 240 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (PopUpListSpec
-			 label: 'PopUp List'
-			 name: 'StcCompilation'
-			 layout: (LayoutFrame 241 0 0 0 -5 1 22 0)
-			 tabable: true
-			 model: stcCompilationSelection
-			 enableChannel: canLoadBinaries
-			 menu: stcCompilationList
-			 useIndex: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 29)
-		 )
-		(ViewSpec
-		   name: 'STCCommandBox1'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'STC Command:'
-			 name: 'Label1'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField1'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: stc
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'STCOptionsBox2'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'STC Options:'
-			 name: 'Label2'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField2'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: stcOptions
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'KeepCIntermediateBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Keep Intermediate C File:'
-			 name: 'Label15'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (CheckToggleSpec
-			 name: 'CheckToggle1'
-			 layout: (LayoutOrigin 203 0 4 0)
-			 model: stcKeepCIntermediate
-			 isTriggerOnDown: true
-			 showLamp: false
-			 lampColor: (Color 100.0 100.0 0.0)
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'CCCommandBox3'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'CC Command:'
-			 name: 'Label3'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField3'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: cc
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'CCOptionsBox4'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'CC Options:'
-			 name: 'Label4'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField4'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: ccOptions
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'IncludeDirectoriesBox5'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Include Directories:'
-			 name: 'Label5'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField5'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: stcIncludes
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'STCDefinesBox6'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Defines:'
-			 name: 'Label6'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField6'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: stcDefines
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'LinkCommandBox7'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Link Command:'
-			 name: 'Label7'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField7'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: linkCommand
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'LinkArgumentsBox8'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Link Arguments:'
-			 name: 'Label8'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField8'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: linkArgs
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'LinkSharedArgumentsBox1'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Link Shared Arguments:'
-			 name: 'Label12'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField11'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: linkSharedArgs
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'CLibrariesBox9'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'C-Libraries:'
-			 name: 'Label9'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField9'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: canLoadBinaries
-			 model: stcLibraries
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'STCLibraryPathBox10'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'STC Library Path:'
-			 name: 'Label10'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField10'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 enableChannel: enableStcLibraryPath
-			 model: stcLibraryPath
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'MakeCommandBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Make Command:'
-			 name: 'Label13'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (InputFieldSpec
-			 name: 'EntryField12'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 model: makeCommand
-			 acceptOnLeave: true
-			 acceptOnReturn: true
-			 acceptOnTab: true
-			 acceptOnLostFocus: true
-			 acceptOnPointerLeave: true
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		(ViewSpec
-		   name: 'SeparatingBox2'
-		   extent: (Point 600 12)
-		 )
-		(ViewSpec
-		   name: 'SetupForBox'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Set above Options for:'
-			 name: 'Label16'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (PopUpListSpec
-			 name: 'PopUpList1'
-			 layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
-			 tabable: true
-			 model: supportedCCompilerSelection
-			 menu: supportedCCompilerList
-			 useIndex: true
-			 stateChangeCallBackSelector: supportedCCompilerSelectionChanged
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 29)
-		 )
-		(ViewSpec
-		   name: 'Box1'
-		   component:
-		  (SpecCollection
-		     collection: (
-		      (LabelSpec
-			 label: 'Verbose (Trace Commands):'
-			 name: 'Label17'
-			 layout: (LayoutFrame 0 0 0 0 200 0 22 0)
-			 translateLabel: true
-			 adjust: right
-		       )
-		      (CheckToggleSpec
-			 name: 'CheckToggle2'
-			 layout: (LayoutOrigin 203 0 4 0)
-			 model: verbose
-			 isTriggerOnDown: true
-			 showLamp: false
-			 lampColor: (Color 100.0 100.0 0.0)
-		       )
-		      )
-
-		   )
-		   extent: (Point 600 30)
-		 )
-		)
-
-	     )
-	   )
-	  )
-
+         collection: (
+          (VerticalPanelViewSpec
+             name: 'VerticalPanel2'
+             layout: (LayoutFrame 0 0.0 0 0.0 0 1.0 0 1.0)
+             horizontalLayout: fit
+             verticalLayout: top
+             horizontalSpace: 3
+             verticalSpace: 0
+             component: 
+            (SpecCollection
+               collection: (
+                (ViewSpec
+                   name: 'SeparatingBox1'
+                   extent: (Point 600 4)
+                 )
+                (ViewSpec
+                   name: 'InfoTextBox'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         name: 'Label14'
+                         layout: (LayoutFrame 0 0 0 0 0 1 0 1)
+                         translateLabel: true
+                         labelChannel: helpText
+                         adjust: left
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 90)
+                 )
+                (ViewSpec
+                   name: 'STCCompilationBox11'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'STC Compilation to Machine Code:'
+                         name: 'Label11'
+                         layout: (LayoutFrame 0 0 0 0 240 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (PopUpListSpec
+                         label: 'PopUp List'
+                         name: 'StcCompilation'
+                         layout: (LayoutFrame 241 0 0 0 -5 1 22 0)
+                         translateLabel: true
+                         tabable: true
+                         model: stcCompilationSelection
+                         enableChannel: canLoadBinaries
+                         menu: stcCompilationList
+                         useIndex: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 29)
+                 )
+                (ViewSpec
+                   name: 'STCCommandBox1'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'STC Command:'
+                         name: 'Label1'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField1'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: stc
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'STCOptionsBox2'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'STC Options:'
+                         name: 'Label2'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField2'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: stcOptions
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'KeepCIntermediateBox'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Keep Intermediate C File:'
+                         name: 'Label15'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (CheckToggleSpec
+                         name: 'CheckToggle1'
+                         layout: (LayoutOrigin 203 0 4 0)
+                         translateLabel: true
+                         model: stcKeepCIntermediate
+                         isTriggerOnDown: true
+                         showLamp: false
+                         lampColor: (Color 100.0 100.0 0.0)
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'CCCommandBox3'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'CC Command:'
+                         name: 'Label3'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField3'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: cc
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'CCOptionsBox1'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Built-in C flags:'
+                         name: 'Label18'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         activeHelpKey: ccOptionsBuiltin
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField13'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         activeHelpKey: ccOptionsBuiltin
+                         initiallyDisabled: true
+                         enableChannel: canLoadBinaries
+                         model: ccOptionsBuiltin
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 29)
+                 )
+                (ViewSpec
+                   name: 'CCOptionsBox2'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'C flags:'
+                         name: 'Label4'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         activeHelpKey: ccOptions
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField4'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         activeHelpKey: ccOptions
+                         enableChannel: canLoadBinaries
+                         model: ccOptions
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'IncludeDirectoriesBox5'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Include Directories:'
+                         name: 'Label5'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField5'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: stcIncludes
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'STCDefinesBox6'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Defines:'
+                         name: 'Label6'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField6'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: stcDefines
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'LinkCommandBox7'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Link Command:'
+                         name: 'Label7'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField7'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: linkCommand
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'LinkArgumentsBox8'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Link Arguments:'
+                         name: 'Label8'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField8'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: linkArgs
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'LinkSharedArgumentsBox1'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Link Shared Arguments:'
+                         name: 'Label12'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField11'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: linkSharedArgs
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'CLibrariesBox9'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'C-Libraries:'
+                         name: 'Label9'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField9'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: canLoadBinaries
+                         model: stcLibraries
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'STCLibraryPathBox10'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'STC Library Path:'
+                         name: 'Label10'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField10'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         enableChannel: enableStcLibraryPath
+                         model: stcLibraryPath
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'MakeCommandBox'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Make Command:'
+                         name: 'Label13'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (InputFieldSpec
+                         name: 'EntryField12'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         model: makeCommand
+                         acceptOnLeave: true
+                         acceptOnReturn: true
+                         acceptOnTab: true
+                         acceptOnLostFocus: true
+                         acceptOnPointerLeave: true
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                (ViewSpec
+                   name: 'SeparatingBox2'
+                   extent: (Point 600 12)
+                 )
+                (ViewSpec
+                   name: 'SetupForBox'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Set above Options for:'
+                         name: 'Label16'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (PopUpListSpec
+                         name: 'PopUpList1'
+                         layout: (LayoutFrame 201 0 0 0 -5 1 22 0)
+                         translateLabel: true
+                         tabable: true
+                         model: supportedCCompilerSelection
+                         menu: supportedCCompilerList
+                         useIndex: true
+                         stateChangeCallBackSelector: supportedCCompilerSelectionChanged
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 29)
+                 )
+                (ViewSpec
+                   name: 'Box1'
+                   component: 
+                  (SpecCollection
+                     collection: (
+                      (LabelSpec
+                         label: 'Verbose (Trace Commands):'
+                         name: 'Label17'
+                         layout: (LayoutFrame 0 0 0 0 200 0 22 0)
+                         translateLabel: true
+                         adjust: right
+                       )
+                      (CheckToggleSpec
+                         name: 'CheckToggle2'
+                         layout: (LayoutOrigin 203 0 4 0)
+                         translateLabel: true
+                         model: verbose
+                         isTriggerOnDown: true
+                         showLamp: false
+                         lampColor: (Color 100.0 100.0 0.0)
+                       )
+                      )
+                    
+                   )
+                   extent: (Point 600 30)
+                 )
+                )
+              
+             )
+           )
+          )
+        
        )
      )
 ! !
@@ -13160,23 +13226,32 @@
 !
 
 setupForGCC
+    | stcPath |
     self cc value:'gcc'.
-    ExternalBytes sizeofPointer == 4 ifTrue:[
-        self ccOptions value:'-m32'.
-        self linkArgs value:'-m32'.
-        self linkSharedArgs value:'-shared -m32'.
-    ] ifFalse:[
-        self ccOptions value:'-m64 -FPIC'.
-        self linkArgs value:'-m64'.
-        self linkSharedArgs value:'-shared -m64'.
-    ].
-    self stcIncludes value:'-I..\..\include -I/usr/include/freetype2'.
+    self linkSharedArgs value:'-shared'.
+
+    stcPath := self stc value asFilename.
+    (stcPath exists not and:[ stcPath isAbsolute ]) ifTrue:[ 
+        stcPath := OperatingSystem pathOfCommand:'stc'.
+    ].
+    (stcPath exists and:[stcPath isExecutable]) ifTrue:[
+        | stcInclude |
+
+        stcInclude := stcPath directory / 'include'.
+        stcInclude isDictionary ifTrue:[ 
+            self stcIncludes value:'-I', stcInclude pathName.
+        ].
+    ].
+
+
     self linkCommand value:'gcc'.
     self stcLibraries value:''.
     self makeCommand value:'make'.
 
     self updateModifiedChannel.
     self supportedCCompilerSelection value:0
+
+    "Modified: / 05-12-2015 / 07:14:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 setupForMINGW
@@ -13282,6 +13357,12 @@
     ^ ccOptions.
 !
 
+ccOptionsBuiltin
+    ^ STCCompilerInterface builtinCFlags
+
+    "Created: / 09-12-2015 / 09:54:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 enableStcLibraryPath
 
     ^ (ObjectFileLoader libPath notNil and:[self canLoadBinaries])
@@ -19769,5 +19850,10 @@
 
 version_CVS
     ^ '$Header$'
-! !
-
+!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
--- a/abbrev.stc	Thu Dec 10 06:39:51 2015 +0100
+++ b/abbrev.stc	Sat Dec 05 07:23:08 2015 +0000
@@ -6,8 +6,6 @@
 AbstractFileBrowser AbstractFileBrowser stx:libtool 'Interface-Tools-File' 3
 AbstractLauncherApplication AbstractLauncherApplication stx:libtool 'Interface-Smalltalk' 7
 AbstractSettingsApplication AbstractSettingsApplication stx:libtool 'Interface-Smalltalk' 1
-AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
-ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
 Bookmark Bookmark stx:libtool 'Interface-Bookmarks' 0
 BookmarkBar BookmarkBar stx:libtool 'Interface-Bookmarks' 1
 BookmarkEditor BookmarkEditor stx:libtool 'Interface-Bookmarks' 1
@@ -17,12 +15,9 @@
 BookmarksEditDialog BookmarksEditDialog stx:libtool 'Interface-Tools-File' 1
 BrowserView BrowserView stx:libtool 'Interface-Browsers' 2
 ChangesBrowser ChangesBrowser stx:libtool 'Interface-Browsers' 2
-ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
-ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
 CodeCompletionHelpMenuView CodeCompletionHelpMenuView stx:libtool 'Interface-Help' 2
 CodeCompletionHelpView CodeCompletionHelpView stx:libtool 'Interface-Help' 2
 CodeGenerator CodeGenerator stx:libtool 'Interface-Browsers' 0
-CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 1
 CodeGeneratorTool CodeGeneratorTool stx:libtool 'Interface-Browsers' 0
 DebugView DebugView stx:libtool 'Interface-Debugger' 2
 Diff Diff stx:libtool 'Collections-Support' 0
@@ -33,37 +28,25 @@
 Diff3TextView Diff3TextView stx:libtool 'Views-Text' 2
 DiffListUtility DiffListUtility stx:libtool 'Views-Text' 0
 DiffTextView DiffTextView stx:libtool 'Views-Text' 2
-EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
 EditFieldWithCompletion EditFieldWithCompletion stx:libtool 'Views-Text' 2
 EditFieldWithCompletionSpec EditFieldWithCompletionSpec stx:libtool 'Interface-Support-UI-Specs' 0
-EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 1
 FileBrowser FileBrowser stx:libtool 'Interface-Tools-File' 2
 FileBrowserV2PanelView FileBrowserV2PanelView stx:libtool 'Interface-Tools-File' 2
-FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 1
-FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 1
 FileBrowserV2UISpecifications FileBrowserV2UISpecifications stx:libtool 'Interface-Tools-File' 0
 FileDialog FileDialog stx:libtool 'Interface-Tools-File' 1
-FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 1
 FileOperation FileOperation stx:libtool 'Interface-Support' 0
 FilenameEditFieldV2 FilenameEditFieldV2 stx:libtool 'Interface-Tools-File' 2
-HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
-HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 InspectorView InspectorView stx:libtool 'Interface-Inspector' 2
 MemoryMonitor MemoryMonitor stx:libtool 'Monitors-ST/X' 1
 MemoryMonitorView MemoryMonitorView stx:libtool 'Monitors-ST/X' 2
 MemoryUsageView MemoryUsageView stx:libtool 'Monitors-ST/X' 2
 MultiViewToolApplication MultiViewToolApplication stx:libtool 'Interface-Smalltalk' 7
 NewChangesBrowser NewChangesBrowser stx:libtool 'Interface-Browsers' 7
-OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
 PerforceSourceCodeManagerUtilities PerforceSourceCodeManagerUtilities stx:libtool 'System-SourceCodeManagement' 0
 ProcessMonitorV2 ProcessMonitorV2 stx:libtool 'Monitors-ST/X' 1
-ProjectView ProjectView stx:libtool 'Interface-Tools' 2
-RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
 SyntaxElement SyntaxElement stx:libtool 'Interface-CodeView-Syntax' 0
 SyntaxHighlighter2 SyntaxHighlighter2 stx:libtool 'Interface-CodeView-Syntax' 3
 SystemBrowser SystemBrowser stx:libtool 'Interface-Browsers' 1
-SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 2
-TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 1
 Tools::AbstractTestRunner Tools__AbstractTestRunner stx:libtool 'SUnit-UI' 1
 Tools::BreakpointBrowser Tools__BreakpointBrowser stx:libtool 'Interface-Debugger' 1
 Tools::Browslet Tools__Browslet stx:libtool 'Interface-Browsers-Browslets' 1
@@ -80,10 +63,8 @@
 Tools::CodeCompletionMenu Tools__CodeCompletionMenu stx:libtool 'Interface-CodeView' 2
 Tools::CodeCritics Tools__CodeCritics stx:libtool 'Interface-Browsers-New' 0
 Tools::CodeView2 Tools__CodeView2 stx:libtool 'Interface-CodeView' 2
-Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::CodeViewService Tools__CodeViewService stx:libtool 'Interface-CodeView' 0
 Tools::DiffCodeView2 Tools__DiffCodeView2 stx:libtool 'Interface-CodeView' 2
-Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 1
 Tools::HierarchicalChangesetDialog Tools__HierarchicalChangesetDialog stx:libtool 'Interface-Dialogs' 1
 Tools::InlineMessageDialog Tools__InlineMessageDialog stx:libtool 'Interface-Tools' 1
 Tools::Inspector2 Tools__Inspector2 stx:libtool 'Interface-Inspector2' 1
@@ -96,7 +77,6 @@
 Tools::MethodCategoryCache Tools__MethodCategoryCache stx:libtool 'Interface-Browsers-New' 0
 Tools::MethodRewriter Tools__MethodRewriter stx:libtool 'Interface-Tools' 1
 Tools::NavigationHistory Tools__NavigationHistory stx:libtool 'Interface-Browsers-New-History' 0
-Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-Browsers-New-History' 1
 Tools::NavigationState Tools__NavigationState stx:libtool 'Interface-Browsers-New' 0
 Tools::NavigatorModel Tools__NavigatorModel stx:libtool 'Interface-Browsers-New' 1
 Tools::NewClassWizardDialog Tools__NewClassWizardDialog stx:libtool 'Interface-Browsers-New' 1
@@ -116,27 +96,17 @@
 Tools::TagsBrowser Tools__TagsBrowser stx:libtool 'Interface-Tools-File-Tags' 1
 Tools::TextDiffTool Tools__TextDiffTool stx:libtool 'Interface-Diff' 1
 Tools::TextMergeInfo Tools__TextMergeInfo stx:libtool 'Interface-Diff' 0
-Tools::ToDoList Tools__ToDoList stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
-Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
-Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
 Tools::Toolbox Tools__Toolbox stx:libtool 'Interface-Tools' 0
 Tools::WebBrowserPage Tools__WebBrowserPage stx:libtool 'Interface-Browsers-Web' 1
 VersionDiffBrowser VersionDiffBrowser stx:libtool 'Interface-Browsers' 1
 ViewWithAcceptAndCancelBar ViewWithAcceptAndCancelBar stx:libtool 'Views-Basic' 2
 Win32FileDialog Win32FileDialog stx:libtool 'Interface-Tools-File' 0
-XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
 stx_libtool stx_libtool stx:libtool '* Projects & Packages *' 3
 AbstractDirectoryBrowser AbstractDirectoryBrowser stx:libtool 'Interface-Tools-File' 3
 AbstractFileFinderApplicationComponent AbstractFileFinderApplicationComponent stx:libtool 'Interface-Tools-File' 1
-AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 AbstractSourceCodeManagementSettingsAppl AbstractSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 BookmarkMenuBuilder BookmarkMenuBuilder stx:libtool 'Interface-Bookmarks' 0
-ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
 ClassInspectorView ClassInspectorView stx:libtool 'Interface-Inspector' 2
-ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
-ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
-ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
 ContextInspectorView ContextInspectorView stx:libtool 'Interface-Inspector' 2
 DictionaryInspectorView DictionaryInspectorView stx:libtool 'Interface-Inspector' 2
 Diff3ExclusiveVisitor Diff3ExclusiveVisitor stx:libtool 'Collections-Sequenceable-Diff' 0
@@ -146,25 +116,19 @@
 FileBrowserV2SettingsAppl FileBrowserV2SettingsAppl stx:libtool 'Interface-Tools-File' 1
 FileDialogWithPreview FileDialogWithPreview stx:libtool 'Interface-Tools-File' 1
 ImageInspectorView ImageInspectorView stx:libtool 'Interface-Inspector' 2
-Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
-LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
 NewLauncher NewLauncher stx:libtool 'Interface-Smalltalk' 7
 OrderedCollectionInspectorView OrderedCollectionInspectorView stx:libtool 'Interface-Inspector' 2
 ParseTreeIndex ParseTreeIndex stx:libtool 'Interface-CodeView-Syntax' 0
-ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
-SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
 SetInspectorView SetInspectorView stx:libtool 'Interface-Inspector' 2
 SettingsDialog SettingsDialog stx:libtool 'Interface-Smalltalk' 1
 SmalltalkCodeGeneratorTool SmalltalkCodeGeneratorTool stx:libtool 'Interface-Browsers' 0
 SyntaxElementVariable SyntaxElementVariable stx:libtool 'Interface-CodeView-Syntax' 0
-TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 7
 Tools::BackgroundSourceProcessingService Tools__BackgroundSourceProcessingService stx:libtool 'Interface-CodeView' 0
 Tools::BreakpointService Tools__BreakpointService stx:libtool 'Interface-CodeView' 0
 Tools::BrowserList Tools__BrowserList stx:libtool 'Interface-Browsers-New' 1
 Tools::CodeCompletionService Tools__CodeCompletionService stx:libtool 'Interface-CodeView' 0
 Tools::CodeNavigationService Tools__CodeNavigationService stx:libtool 'Interface-CodeView' 0
 Tools::CodeView2SettingsAppl Tools__CodeView2SettingsAppl stx:libtool 'Interface-CodeView' 1
-Tools::CompilerWarningToDoListEntry Tools__CompilerWarningToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
 Tools::Diff2CodeView2 Tools__Diff2CodeView2 stx:libtool 'Interface-CodeView' 2
 Tools::Diff3CodeView2 Tools__Diff3CodeView2 stx:libtool 'Interface-CodeView' 2
 Tools::FontSettingsApplication Tools__FontSettingsApplication stx:libtool 'Interface-Smalltalk' 1
@@ -175,7 +139,6 @@
 Tools::NewSystemBrowser Tools__NewSystemBrowser stx:libtool 'Interface-Browsers-New' 1
 Tools::OrganizerCanvas Tools__OrganizerCanvas stx:libtool 'Interface-Browsers-New' 1
 Tools::SendersBrowslet Tools__SendersBrowslet stx:libtool 'Interface-Browsers-Browslets' 1
-Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 1
 Tools::StringSearchToolForTextView Tools__StringSearchToolForTextView stx:libtool 'Interface-Tools' 1
 Tools::TestRunnerMini Tools__TestRunnerMini stx:libtool 'SUnit-UI' 1
 Tools::TextDiff2Tool Tools__TextDiff2Tool stx:libtool 'Interface-Diff' 1
@@ -185,19 +148,15 @@
 BookmarkAddMenuBuilder BookmarkAddMenuBuilder stx:libtool 'Interface-Bookmarks' 0
 BookmarkToolbarMenuBuilder BookmarkToolbarMenuBuilder stx:libtool 'Interface-Bookmarks' 0
 CVSSourceCodeManagementSettingsAppl CVSSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
-ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
 DataBaseSourceCodeManagementSettingsAppl DataBaseSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 DirectoryContentsBrowser DirectoryContentsBrowser stx:libtool 'Interface-Tools-File' 3
 DirectoryDifferenceViewApplication DirectoryDifferenceViewApplication stx:libtool 'Interface-Tools-File' 1
 DirectoryTreeBrowser DirectoryTreeBrowser stx:libtool 'Interface-Tools-File' 3
-ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 FileBasedSourceCodeManagementSettingsAppl FileBasedSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 FindFileApplication FindFileApplication stx:libtool 'Interface-Tools-File' 1
 GitSourceCodeManagementSettingsAppl GitSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 MercurialSourceCodeManagementSettingsAppl MercurialSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 PerforceSourceCodeManagementSettingsAppl PerforceSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
-SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
-SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
 StoreSourceCodeManagementSettingsAppl StoreSourceCodeManagementSettingsAppl stx:libtool 'System-SourceCodeManagement' 1
 Tools::BrowserListWithFilter Tools__BrowserListWithFilter stx:libtool 'Interface-Browsers-New' 1
 Tools::ClassCategoryList Tools__ClassCategoryList stx:libtool 'Interface-Browsers-New' 1
@@ -212,8 +171,6 @@
 Tools::SmalltalkToolbox Tools__SmalltalkToolbox stx:libtool 'Interface-Tools' 0
 Tools::TestRunnerEmbedded Tools__TestRunnerEmbedded stx:libtool 'SUnit-UI' 1
 Tools::VariableList Tools__VariableList stx:libtool 'Interface-Browsers-New' 1
-VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0
-ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
 Tools::ChangeList Tools__ChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::ChangeSetDiffList Tools__ChangeSetDiffList stx:libtool 'Interface-Diff' 1
 Tools::FullMethodCategoryList Tools__FullMethodCategoryList stx:libtool 'Interface-Browsers-New' 1
@@ -228,4 +185,46 @@
 Tools::HierarchicalChangeList Tools__HierarchicalChangeList stx:libtool 'Interface-Browsers-ChangeSet' 1
 Tools::HierarchicalPackageFilterList Tools__HierarchicalPackageFilterList stx:libtool 'Interface-Browsers-New-Profiler' 1
 Tools::InheritanceClassList Tools__InheritanceClassList stx:libtool 'Interface-Browsers-New' 1
-XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 0
+AbstractRevisionItem AbstractRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+AbstractVersionDiffBrowserItem AbstractVersionDiffBrowserItem stx:libtool 'Interface-Browsers-Support' 0
+ApplicationBuilder ApplicationBuilder stx:libtool 'Interface-Tools' 8
+ChangeSetBrowser ChangeSetBrowser stx:libtool 'Interface-Browsers' 2
+ClassItem ClassItem stx:libtool 'Interface-Browsers-Support' 0
+ClassItemRoot ClassItemRoot stx:libtool 'Interface-Browsers-Support' 0
+ClassItemRootForRevision ClassItemRootForRevision stx:libtool 'Interface-Browsers-Support' 0
+ClassNameItem ClassNameItem stx:libtool 'Interface-Browsers-Support' 0
+ClassRevisionTree ClassRevisionTree stx:libtool 'Interface-Browsers-Support' 1
+ClassVariablesInspectorView ClassVariablesInspectorView stx:libtool 'Interface-Inspector' 2
+CodeGeneratorTests CodeGeneratorTests stx:libtool 'Interface-Browsers' 1
+ColorInspectorView ColorInspectorView stx:libtool 'Interface-Inspector' 2
+EWorldIconLibrary EWorldIconLibrary stx:libtool 'Interface-Smalltalk' 0
+EventMonitor EventMonitor stx:libtool 'Monitors-ST/X' 1
+ExpandableRevisionItem ExpandableRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+FileBrowserV2SettingsDialog FileBrowserV2SettingsDialog stx:libtool 'Interface-Tools-File' 1
+FileBrowserV2Tests FileBrowserV2Tests stx:libtool 'Interface-Tools-File' 1
+FileDialogV2 FileDialogV2 stx:libtool 'Interface-Tools-File' 1
+HierarchicalClassRevisionList HierarchicalClassRevisionList stx:libtool 'Interface-Browsers-Support' 0
+HierarchicalVersionDiffBrowser HierarchicalVersionDiffBrowser stx:libtool 'Interface-Browsers' 1
+Launcher Launcher stx:libtool 'Interface-Smalltalk' 7
+LibraryBuilder LibraryBuilder stx:libtool 'Interface-Tools' 8
+OldLauncher OldLauncher stx:libtool 'Interface-Smalltalk' 2
+ProcessMonitor ProcessMonitor stx:libtool 'Monitors-ST/X' 2
+ProjectView ProjectView stx:libtool 'Interface-Tools' 2
+RCSConflictEditTextView RCSConflictEditTextView stx:libtool 'Views-Text' 2
+SemaphoreMonitor SemaphoreMonitor stx:libtool 'Monitors-ST/X' 2
+SmalltalkInspectorView SmalltalkInspectorView stx:libtool 'Interface-Inspector' 2
+SourceRevisionItem SourceRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+SystemStatusMonitor SystemStatusMonitor stx:libtool 'Monitors-ST/X' 2
+TerminalApplication TerminalApplication stx:libtool 'Interface-Smalltalk' 7
+TextDiffTests TextDiffTests stx:libtool 'Collections-Sequenceable-Diff' 1
+Tools::CodeView2DemoApp Tools__CodeView2DemoApp stx:libtool 'Interface-CodeView' 1
+Tools::CompilerWarningToDoListEntry Tools__CompilerWarningToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::DiffCodeView2DemoApp Tools__DiffCodeView2DemoApp stx:libtool 'Interface-CodeView' 1
+Tools::NavigationHistoryTests Tools__NavigationHistoryTests stx:libtool 'Interface-Browsers-New-History' 1
+Tools::SmalltalkMergeTool Tools__SmalltalkMergeTool stx:libtool 'Interface-Diff & Merge tool' 1
+Tools::ToDoList Tools__ToDoList stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoListBrowser Tools__ToDoListBrowser stx:libtool 'Interface-Smalltalk-ToDo' 1
+Tools::ToDoListEntry Tools__ToDoListEntry stx:libtool 'Interface-Smalltalk-ToDo' 0
+Tools::ToDoNotification Tools__ToDoNotification stx:libtool 'Interface-Smalltalk-ToDo' 1
+VersionRevisionItem VersionRevisionItem stx:libtool 'Interface-Browsers-Support' 0
+XTermView XTermView stx:libtool 'Interface-Tools-Terminal' 2
--- a/stx_libtool.st	Thu Dec 10 06:39:51 2015 +0100
+++ b/stx_libtool.st	Sat Dec 05 07:23:08 2015 +0000
@@ -196,8 +196,6 @@
         AbstractFileBrowser
         AbstractLauncherApplication
         AbstractSettingsApplication
-        (AbstractVersionDiffBrowserItem autoload)
-        (ApplicationBuilder autoload)
         Bookmark
         BookmarkBar
         BookmarkEditor
@@ -207,12 +205,9 @@
         BookmarksEditDialog
         BrowserView
         ChangesBrowser
-        (ClassNameItem autoload)
-        (ClassRevisionTree autoload)
         CodeCompletionHelpMenuView
         CodeCompletionHelpView
         CodeGenerator
-        (CodeGeneratorTests autoload)
         CodeGeneratorTool
         DebugView
         Diff
@@ -223,37 +218,25 @@
         Diff3TextView
         DiffListUtility
         DiffTextView
-        (EWorldIconLibrary autoload)
         EditFieldWithCompletion
         EditFieldWithCompletionSpec
-        (EventMonitor autoload)
         FileBrowser
         FileBrowserV2PanelView
-        (FileBrowserV2SettingsDialog autoload)
-        (FileBrowserV2Tests autoload)
         FileBrowserV2UISpecifications
         FileDialog
-        (FileDialogV2 autoload)
         FileOperation
         FilenameEditFieldV2
-        (HierarchicalClassRevisionList autoload)
-        (HierarchicalVersionDiffBrowser autoload)
         InspectorView
         MemoryMonitor
         MemoryMonitorView
         MemoryUsageView
         MultiViewToolApplication
         (NewChangesBrowser autoload)
-        (OldLauncher autoload)
         PerforceSourceCodeManagerUtilities
         ProcessMonitorV2
-        (ProjectView autoload)
-        (RCSConflictEditTextView autoload)
         SyntaxElement
         SyntaxHighlighter2
         SystemBrowser
-        (SystemStatusMonitor autoload)
-        (TextDiffTests autoload)
         #'Tools::AbstractTestRunner'
         #'Tools::BreakpointBrowser'
         #'Tools::Browslet'
@@ -270,10 +253,8 @@
         #'Tools::CodeCompletionMenu'
         #'Tools::CodeCritics'
         #'Tools::CodeView2'
-        (#'Tools::CodeView2DemoApp' autoload)
         #'Tools::CodeViewService'
         #'Tools::DiffCodeView2'
-        (#'Tools::DiffCodeView2DemoApp' autoload)
         #'Tools::HierarchicalChangesetDialog'
         #'Tools::InlineMessageDialog'
         #'Tools::Inspector2'
@@ -286,7 +267,6 @@
         #'Tools::MethodCategoryCache'
         #'Tools::MethodRewriter'
         #'Tools::NavigationHistory'
-        (#'Tools::NavigationHistoryTests' autoload)
         #'Tools::NavigationState'
         #'Tools::NavigatorModel'
         #'Tools::NewClassWizardDialog'
@@ -306,27 +286,17 @@
         #'Tools::TagsBrowser'
         #'Tools::TextDiffTool'
         #'Tools::TextMergeInfo'
-        (#'Tools::ToDoList' autoload)
-        (#'Tools::ToDoListBrowser' autoload)
-        (#'Tools::ToDoListEntry' autoload)
-        (#'Tools::ToDoNotification' autoload)
         #'Tools::Toolbox'
         #'Tools::WebBrowserPage'
         VersionDiffBrowser
         ViewWithAcceptAndCancelBar
         Win32FileDialog
-        (XTermView autoload)
         #'stx_libtool'
         AbstractDirectoryBrowser
         AbstractFileFinderApplicationComponent
-        (AbstractRevisionItem autoload)
         AbstractSourceCodeManagementSettingsAppl
         BookmarkMenuBuilder
-        (ChangeSetBrowser autoload)
         ClassInspectorView
-        (ClassItem autoload)
-        (ClassItemRoot autoload)
-        (ColorInspectorView autoload)
         ContextInspectorView
         DictionaryInspectorView
         Diff3ExclusiveVisitor
@@ -336,25 +306,19 @@
         FileBrowserV2SettingsAppl
         FileDialogWithPreview
         ImageInspectorView
-        (Launcher autoload)
-        (LibraryBuilder autoload)
         NewLauncher
         OrderedCollectionInspectorView
         ParseTreeIndex
-        (ProcessMonitor autoload)
-        (SemaphoreMonitor autoload)
         SetInspectorView
         SettingsDialog
         SmalltalkCodeGeneratorTool
         SyntaxElementVariable
-        (TerminalApplication autoload)
         #'Tools::BackgroundSourceProcessingService'
         #'Tools::BreakpointService'
         #'Tools::BrowserList'
         #'Tools::CodeCompletionService'
         #'Tools::CodeNavigationService'
         #'Tools::CodeView2SettingsAppl'
-        (#'Tools::CompilerWarningToDoListEntry' autoload)
         #'Tools::Diff2CodeView2'
         #'Tools::Diff3CodeView2'
         #'Tools::FontSettingsApplication'
@@ -365,7 +329,6 @@
         #'Tools::NewSystemBrowser'
         #'Tools::OrganizerCanvas'
         #'Tools::SendersBrowslet'
-        (#'Tools::SmalltalkMergeTool' autoload)
         #'Tools::StringSearchToolForTextView'
         #'Tools::TestRunnerMini'
         #'Tools::TextDiff2Tool'
@@ -375,19 +338,15 @@
         BookmarkAddMenuBuilder
         BookmarkToolbarMenuBuilder
         CVSSourceCodeManagementSettingsAppl
-        (ClassItemRootForRevision autoload)
         DataBaseSourceCodeManagementSettingsAppl
         DirectoryContentsBrowser
         DirectoryDifferenceViewApplication
         DirectoryTreeBrowser
-        (ExpandableRevisionItem autoload)
         FileBasedSourceCodeManagementSettingsAppl
         FindFileApplication
         GitSourceCodeManagementSettingsAppl
         MercurialSourceCodeManagementSettingsAppl
         PerforceSourceCodeManagementSettingsAppl
-        (SmalltalkInspectorView autoload)
-        (SourceRevisionItem autoload)
         StoreSourceCodeManagementSettingsAppl
         #'Tools::BrowserListWithFilter'
         #'Tools::ClassCategoryList'
@@ -402,8 +361,6 @@
         #'Tools::SmalltalkToolbox'
         #'Tools::TestRunnerEmbedded'
         #'Tools::VariableList'
-        (VersionRevisionItem autoload)
-        (ClassVariablesInspectorView autoload)
         #'Tools::ChangeList'
         #'Tools::ChangeSetDiffList'
         #'Tools::FullMethodCategoryList'
@@ -418,6 +375,49 @@
         #'Tools::HierarchicalChangeList'
         #'Tools::HierarchicalPackageFilterList'
         #'Tools::InheritanceClassList'
+        (AbstractRevisionItem autoload)
+        (AbstractVersionDiffBrowserItem autoload)
+        (ApplicationBuilder autoload)
+        (ChangeSetBrowser autoload)
+        (ClassItem autoload)
+        (ClassItemRoot autoload)
+        (ClassItemRootForRevision autoload)
+        (ClassNameItem autoload)
+        (ClassRevisionTree autoload)
+        (ClassVariablesInspectorView autoload)
+        (CodeGeneratorTests autoload)
+        (ColorInspectorView autoload)
+        (EWorldIconLibrary autoload)
+        (EventMonitor autoload)
+        (ExpandableRevisionItem autoload)
+        (FileBrowserV2SettingsDialog autoload)
+        (FileBrowserV2Tests autoload)
+        (FileDialogV2 autoload)
+        (HierarchicalClassRevisionList autoload)
+        (HierarchicalVersionDiffBrowser autoload)
+        (Launcher autoload)
+        (LibraryBuilder autoload)
+        (OldLauncher autoload)
+        (ProcessMonitor autoload)
+        (ProjectView autoload)
+        (RCSConflictEditTextView autoload)
+        (SemaphoreMonitor autoload)
+        (SmalltalkInspectorView autoload)
+        (SourceRevisionItem autoload)
+        (SystemStatusMonitor autoload)
+        (TerminalApplication autoload)
+        (TextDiffTests autoload)
+        (#'Tools::CodeView2DemoApp' autoload)
+        (#'Tools::CompilerWarningToDoListEntry' autoload)
+        (#'Tools::DiffCodeView2DemoApp' autoload)
+        (#'Tools::NavigationHistoryTests' autoload)
+        (#'Tools::SmalltalkMergeTool' autoload)
+        (#'Tools::ToDoList' autoload)
+        (#'Tools::ToDoListBrowser' autoload)
+        (#'Tools::ToDoListEntry' autoload)
+        (#'Tools::ToDoNotification' autoload)
+        (VersionRevisionItem autoload)
+        (XTermView autoload)
     )
 !