Tools__ProjectBuilderAssistantApplication.st
changeset 2910 8024f7e8f9f4
parent 2907 c842e3e6f526
child 2913 94e5ae8e15b2
--- a/Tools__ProjectBuilderAssistantApplication.st	Mon Sep 03 21:23:09 2012 +0200
+++ b/Tools__ProjectBuilderAssistantApplication.st	Mon Sep 03 22:29:39 2012 +0200
@@ -30,7 +30,8 @@
 		newStartupClassName usedCompilerHolder listOfNewProjectsName
 		newProjectsNameListExtendedComboBox productNameHolder
 		companyNameHolder compilerWarnMessageHolder
-		compilerWarnMessageVisibleHolder listOfPrerequisitesInProject'
+		compilerWarnMessageVisibleHolder listOfPrerequisitesInProject
+		nameOfUsedCompilerSuiteHolder'
 	classVariableNames:''
 	poolDictionaries:''
 	category:'System-Support-Projects'
@@ -1201,6 +1202,14 @@
                     comboList: listOfPossibleCompilers
                     useIndex: false
                   )
+                 (LabelSpec
+                    label: 'Compiler Suite'
+                    name: 'Label2'
+                    layout: (LayoutFrame 163 0 10 0 0 1 32 0)
+                    translateLabel: true
+                    labelChannel: nameOfUsedCompilerSuiteHolder
+                    adjust: left
+                  )
                  )
                
               )
@@ -1211,7 +1220,7 @@
               layout: (LayoutFrame 2 0.0 158 0 -2 1.0 303 0)
               level: -1
               visibilityChannel: compilerWarnMessageVisibleHolder
-              backgroundColor: (Color 100.0 49.999237048905 49.999237048905)
+              backgroundColor: (Color 100.0 49.9992370489052 49.9992370489052)
               translateLabel: true
               labelChannel: compilerWarnMessageHolder
               adjust: left
@@ -2069,6 +2078,17 @@
     ^ makeOutputHolder.
 !
 
+nameOfUsedCompilerSuiteHolder
+    <resource: #uiAspect>
+
+    nameOfUsedCompilerSuiteHolder isNil ifTrue:[
+        nameOfUsedCompilerSuiteHolder := nil asValue.
+    ].
+    ^ nameOfUsedCompilerSuiteHolder.
+
+    "Created: / 03-09-2012 / 19:32:27 / cg"
+!
+
 newApplicationsName
     <resource: #uiAspect>
 
@@ -2587,36 +2607,40 @@
     |cmd suite warnMsg1 warnMsg2 sep|
 
     cmd := 'cc'.
-    suite := 'C-Compiler'.
     warnMsg1 := warnMsg2 := ''.
 
     self usedCompilerHolder value = 'bcc' ifTrue:[
         cmd := 'bcc32'.
-        suite := 'Borland C-Compiler'.
     ].
     self usedCompilerHolder value = 'vc' ifTrue:[
         cmd := 'cl'.
-        suite := 'Microsoft Visual C C-Compiler'.
         warnMsg2 := 'Due to bugs in this C-compiler, some classes may not be compilable.'.
     ].
     self usedCompilerHolder value = 'lcc' ifTrue:[
         cmd := 'lcc'.
-        suite := 'LCC C-Compiler'.
         warnMsg2 := 'The LCC C-compiler suite is not yet supported (linkage).'.
     ].
+    self usedCompilerHolder value = 'tcc' ifTrue:[
+        cmd := 'tcc'.
+        OperatingSystem isMSWINDOWSlike ifTrue:[
+            warnMsg2 := 'The Tiny C-compiler suite is not yet supported on MSDOS systems.'.
+        ].
+    ].
     self usedCompilerHolder value = 'gcc' ifTrue:[
         cmd := 'gcc'.
-        suite := 'GNU C-Compiler'.
         OperatingSystem isMSWINDOWSlike ifTrue:[
             warnMsg2 := 'The GNU C-compiler suite is not yet supported on MSDOS systems.'.
         ].
     ].
+    suite := self suiteNameOfCompiler:(self usedCompilerHolder value).
+    self nameOfUsedCompilerSuiteHolder value:suite.
 
     (OperatingSystem canExecuteCommand:cmd) ifFalse:[
         warnMsg1 :=
 'The "%1"-command seems to be not in your path.
 Please ensure that you installed the 
-"%2" compiler suite correctly.' bindWith:cmd with:suite.
+"%2" compiler suite correctly.
+(However, the makefiles might know where to find the compiler)' bindWith:cmd with:suite.
     ].
 
     (warnMsg1 notEmpty or:[warnMsg2 notEmpty]) ifTrue:[
@@ -2630,6 +2654,8 @@
     ] ifFalse:[
         self compilerWarnMessageVisibleHolder value:false
     ].
+
+    "Modified: / 03-09-2012 / 19:32:09 / cg"
 !
 
 enterContentsSpecification
@@ -2704,6 +2730,28 @@
     makeOutputWindow contents:makeOutputHolder value
 !
 
+suiteNameOfCompiler:usedCompiler
+    usedCompiler = 'bcc' ifTrue:[
+        ^ 'Borland C-Compiler'.
+    ].
+    usedCompiler = 'vc' ifTrue:[
+        ^ 'Microsoft Visual C C-Compiler'.
+    ].
+    usedCompiler = 'lcc' ifTrue:[
+        ^ 'LCC C-Compiler'.
+    ].
+    usedCompiler = 'tcc' ifTrue:[
+        ^ 'Tiny C-Compiler'.
+    ].
+    usedCompiler = 'gcc' ifTrue:[
+        ^ 'GNU C-Compiler'.
+    ].
+
+    ^ 'C-Compiler'.
+
+    "Created: / 03-09-2012 / 19:28:41 / cg"
+!
+
 update:something with:anArgument from:changedObject
     changedObject == Smalltalk ifTrue:[
         (something == #newClass