Tools__ProjectBuilderAssistantApplication.st
changeset 2919 f6656592583b
parent 2917 086fcfdbd182
child 2922 995b64590960
--- a/Tools__ProjectBuilderAssistantApplication.st	Wed Sep 05 20:22:28 2012 +0200
+++ b/Tools__ProjectBuilderAssistantApplication.st	Wed Sep 05 20:24:52 2012 +0200
@@ -31,7 +31,7 @@
 		newProjectsNameListExtendedComboBox productNameHolder
 		companyNameHolder compilerWarnMessageHolder
 		compilerWarnMessageVisibleHolder listOfPrerequisitesInProject
-		nameOfUsedCompilerSuiteHolder'
+		nameOfUsedCompilerSuiteHolder usedCompilerIndexHolder'
 	classVariableNames:'LastUsedCompiler'
 	poolDictionaries:''
 	category:'System-Support-Projects'
@@ -1216,16 +1216,18 @@
                
               )
             )
-           (LabelSpec
-              label: 'Compiler Warn-Label'
-              name: 'Label1'
+           (TextEditorSpec
+              name: 'TextEditor1'
               layout: (LayoutFrame 2 0.0 158 0 -2 1.0 303 0)
               level: -1
               visibilityChannel: compilerWarnMessageVisibleHolder
+              model: compilerWarnMessageHolder
+              hasHorizontalScrollBar: true
+              hasVerticalScrollBar: true
+              miniScrollerHorizontal: true
               backgroundColor: (Color 100.0 49.9992370489052 49.9992370489052)
-              translateLabel: true
-              labelChannel: compilerWarnMessageHolder
-              adjust: left
+              hasKeyboardFocusInitially: false
+              postBuildCallback: postBuildWarnMessageView:
             )
            )
          
@@ -2094,7 +2096,7 @@
 listOfPossibleCompilers
     ^ Tools::ProjectBuilder listOfPossibleCompilers
 
-    "Modified: / 21-01-2012 / 14:05:52 / cg"
+    "Modified: / 05-09-2012 / 19:10:24 / cg"
 !
 
 listOfPrerequisitesInProject
@@ -2417,6 +2419,12 @@
     newProjectsNameListExtendedComboBox := anExtendedComboBox.
 !
 
+postBuildWarnMessageView:aView
+    aView font:(Label defaultFont).
+
+    "Created: / 05-09-2012 / 19:34:29 / cg"
+!
+
 postBuildWith:aBuilder
     super postBuildWith:aBuilder.
     self updateListOfMatchingProjects.
@@ -2657,34 +2665,39 @@
 !ProjectBuilderAssistantApplication methodsFor:'update'!
 
 checkCompilerAvailability
-    |cmd suite warnMsg1 warnMsg2 sep|
+    |cmd suite warnMsg1 warnMsg2 sep usedCompiler|
 
     cmd := 'cc'.
     warnMsg1 := warnMsg2 := ''.
 
-    self usedCompilerHolder value = 'bcc' ifTrue:[
+    usedCompiler := self usedCompilerHolder value.
+    usedCompiler = 'bcc' ifTrue:[
         cmd := 'bcc32'.
     ].
-    self usedCompilerHolder value = 'vc' ifTrue:[
+    usedCompiler = 'vc' ifTrue:[
         cmd := 'cl'.
         warnMsg1 := 'Due to bugs in this C-compiler, some classes may not be compilable.'.
     ].
-    self usedCompilerHolder value = 'lcc' ifTrue:[
+    usedCompiler = 'lcc' ifTrue:[
         cmd := 'lcc'.
-        warnMsg1 := 'The LCC C-compiler suite is not yet supported (linkage).'.
+        warnMsg1 := 'The LCC C-compiler suite is not officially supported.'.
     ].
-    self usedCompilerHolder value = 'tcc' ifTrue:[
+    usedCompiler = 'tcc' ifTrue:[
         cmd := 'tcc'.
         OperatingSystem isMSWINDOWSlike ifTrue:[
-            warnMsg1 := 'The Tiny C-compiler suite is not yet supported on MSDOS systems.'.
+            warnMsg1 := 'The Tiny C-compiler suite is not yet supported (linkage).'.
         ].
     ].
-    self usedCompilerHolder value = 'gcc' ifTrue:[
+    usedCompiler = 'gcc' ifTrue:[
+        cmd := 'gcc'.
+    ].
+    usedCompiler = 'mingw' ifTrue:[
         cmd := 'gcc'.
         OperatingSystem isMSWINDOWSlike ifTrue:[
-            warnMsg1 := 'The GNU C-compiler suite is not yet supported on MSDOS systems.'.
+            warnMsg1 := 'The MINGW C-compiler suite is not officially supported.'.
         ].
     ].
+
     suite := self suiteNameOfCompiler:(self usedCompilerHolder value).
     self nameOfUsedCompilerSuiteHolder value:suite.
 
@@ -2708,7 +2721,7 @@
         self compilerWarnMessageVisibleHolder value:false
     ].
 
-    "Modified: / 04-09-2012 / 09:57:37 / cg"
+    "Modified: / 05-09-2012 / 19:14:00 / cg"
 !
 
 enterContentsSpecification
@@ -2815,6 +2828,9 @@
     usedCompiler = 'gcc' ifTrue:[
         ^ 'GNU C-Compiler'.
     ].
+    usedCompiler = 'mingw' ifTrue:[
+        ^ 'MINGW GNU C-Compiler'.
+    ].
 
     ^ 'C-Compiler'.