fixed compiler settings - removed #always option for stc
authorMichael Beyl <mb@exept.de>
Tue, 14 Oct 2003 10:03:54 +0200
changeset 5278 67cd86f196dc
parent 5277 d08adb84ea30
child 5279 165a7b841a86
fixed compiler settings - removed #always option for stc
AbstractSettingsApplication.st
--- a/AbstractSettingsApplication.st	Tue Oct 14 09:57:41 2003 +0200
+++ b/AbstractSettingsApplication.st	Tue Oct 14 10:03:54 2003 +0200
@@ -7270,19 +7270,14 @@
 
 !AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'defaults'!
 
-stcCompilationDemoStrings
-
-    ^ #('never')
-!
-
-stcCompilationFullVersionStrings
-
-    ^ #('always' 'primitive code only' 'never')
-!
-
 stcCompilationOptions
 
-    ^ #( always default never)
+    ^ #(default never)
+!
+
+stcCompilationStrings
+
+    ^ #('primitive code only' 'never')
 ! !
 
 !AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'image specs'!
@@ -7714,13 +7709,10 @@
             self stcLibraryPath value:t
         ]
     ].
-    self thisIsADemoVersion ifTrue:[
-        self stcCompilationSelection value:(self class stcCompilationOptions 
-                    indexOf:(Compiler stcCompilation)
-                    ifAbsent:2)
-    ] ifFalse:[
-        self stcCompilationSelection value:2
-    ].
+
+    self stcCompilationSelection value:(self class stcCompilationOptions 
+             indexOf:(Compiler stcCompilation)
+             ifAbsent:1).
     self modifiedChannel value:false
 ! !
 
@@ -7787,11 +7779,7 @@
 stcCompilationList
 
     stcCompilationList isNil ifTrue:[
-        self thisIsADemoVersion ifTrue:[
-            stcCompilationList := (resources array:(self class stcCompilationDemoStrings)) asList.
-        ] ifFalse:[
-            stcCompilationList := (resources array:(self class stcCompilationFullVersionStrings)) asList.
-        ]
+        stcCompilationList := (resources array:(self class stcCompilationStrings)) asList.
     ].
     ^ stcCompilationList.
 !
@@ -7799,11 +7787,7 @@
 stcCompilationSelection
 
     stcCompilationSelection isNil ifTrue:[
-        self thisIsADemoVersion ifTrue:[
-            stcCompilationSelection := (self class stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:2) asValue.
-        ] ifFalse:[
-            stcCompilationSelection := 2 asValue.
-        ].
+       stcCompilationSelection := (self class stcCompilationOptions indexOf:(Compiler stcCompilation) ifAbsent:1) asValue.
         stcCompilationSelection onChangeSend:#updateModifiedChannel to:self.
     ].
     ^ stcCompilationSelection.
@@ -7880,11 +7864,6 @@
             ])]) 
         ]]]]]]]]]]] 
     )
-!
-
-thisIsADemoVersion
-
-    ^ Smalltalk releaseIdentification = 'ST/X_free_demo_vsn'
 ! !
 
 !AbstractSettingsApplication::SourceCodeFormatSettingsAppl class methodsFor:'defaults'!
@@ -10927,5 +10906,5 @@
 !AbstractSettingsApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.111 2003-09-24 15:48:53 penk Exp $'
-! !
+    ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.112 2003-10-14 08:03:54 mb Exp $'
+! !