1.1 --- a/Tools__ProjectBuilderAssistantApplication.st Wed Sep 05 20:22:28 2012 +0200
1.2 +++ b/Tools__ProjectBuilderAssistantApplication.st Wed Sep 05 20:24:52 2012 +0200
1.3 @@ -31,7 +31,7 @@
1.4 newProjectsNameListExtendedComboBox productNameHolder
1.5 companyNameHolder compilerWarnMessageHolder
1.6 compilerWarnMessageVisibleHolder listOfPrerequisitesInProject
1.7 - nameOfUsedCompilerSuiteHolder'
1.8 + nameOfUsedCompilerSuiteHolder usedCompilerIndexHolder'
1.9 classVariableNames:'LastUsedCompiler'
1.10 poolDictionaries:''
1.11 category:'System-Support-Projects'
1.12 @@ -1216,16 +1216,18 @@
1.13
1.14 )
1.15 )
1.16 - (LabelSpec
1.17 - label: 'Compiler Warn-Label'
1.18 - name: 'Label1'
1.19 + (TextEditorSpec
1.20 + name: 'TextEditor1'
1.21 layout: (LayoutFrame 2 0.0 158 0 -2 1.0 303 0)
1.22 level: -1
1.23 visibilityChannel: compilerWarnMessageVisibleHolder
1.24 + model: compilerWarnMessageHolder
1.25 + hasHorizontalScrollBar: true
1.26 + hasVerticalScrollBar: true
1.27 + miniScrollerHorizontal: true
1.28 backgroundColor: (Color 100.0 49.9992370489052 49.9992370489052)
1.29 - translateLabel: true
1.30 - labelChannel: compilerWarnMessageHolder
1.31 - adjust: left
1.32 + hasKeyboardFocusInitially: false
1.33 + postBuildCallback: postBuildWarnMessageView:
1.34 )
1.35 )
1.36
1.37 @@ -2094,7 +2096,7 @@
1.38 listOfPossibleCompilers
1.39 ^ Tools::ProjectBuilder listOfPossibleCompilers
1.40
1.41 - "Modified: / 21-01-2012 / 14:05:52 / cg"
1.42 + "Modified: / 05-09-2012 / 19:10:24 / cg"
1.43 !
1.44
1.45 listOfPrerequisitesInProject
1.46 @@ -2417,6 +2419,12 @@
1.47 newProjectsNameListExtendedComboBox := anExtendedComboBox.
1.48 !
1.49
1.50 +postBuildWarnMessageView:aView
1.51 + aView font:(Label defaultFont).
1.52 +
1.53 + "Created: / 05-09-2012 / 19:34:29 / cg"
1.54 +!
1.55 +
1.56 postBuildWith:aBuilder
1.57 super postBuildWith:aBuilder.
1.58 self updateListOfMatchingProjects.
1.59 @@ -2657,34 +2665,39 @@
1.60 !ProjectBuilderAssistantApplication methodsFor:'update'!
1.61
1.62 checkCompilerAvailability
1.63 - |cmd suite warnMsg1 warnMsg2 sep|
1.64 + |cmd suite warnMsg1 warnMsg2 sep usedCompiler|
1.65
1.66 cmd := 'cc'.
1.67 warnMsg1 := warnMsg2 := ''.
1.68
1.69 - self usedCompilerHolder value = 'bcc' ifTrue:[
1.70 + usedCompiler := self usedCompilerHolder value.
1.71 + usedCompiler = 'bcc' ifTrue:[
1.72 cmd := 'bcc32'.
1.73 ].
1.74 - self usedCompilerHolder value = 'vc' ifTrue:[
1.75 + usedCompiler = 'vc' ifTrue:[
1.76 cmd := 'cl'.
1.77 warnMsg1 := 'Due to bugs in this C-compiler, some classes may not be compilable.'.
1.78 ].
1.79 - self usedCompilerHolder value = 'lcc' ifTrue:[
1.80 + usedCompiler = 'lcc' ifTrue:[
1.81 cmd := 'lcc'.
1.82 - warnMsg1 := 'The LCC C-compiler suite is not yet supported (linkage).'.
1.83 + warnMsg1 := 'The LCC C-compiler suite is not officially supported.'.
1.84 ].
1.85 - self usedCompilerHolder value = 'tcc' ifTrue:[
1.86 + usedCompiler = 'tcc' ifTrue:[
1.87 cmd := 'tcc'.
1.88 OperatingSystem isMSWINDOWSlike ifTrue:[
1.89 - warnMsg1 := 'The Tiny C-compiler suite is not yet supported on MSDOS systems.'.
1.90 + warnMsg1 := 'The Tiny C-compiler suite is not yet supported (linkage).'.
1.91 ].
1.92 ].
1.93 - self usedCompilerHolder value = 'gcc' ifTrue:[
1.94 + usedCompiler = 'gcc' ifTrue:[
1.95 + cmd := 'gcc'.
1.96 + ].
1.97 + usedCompiler = 'mingw' ifTrue:[
1.98 cmd := 'gcc'.
1.99 OperatingSystem isMSWINDOWSlike ifTrue:[
1.100 - warnMsg1 := 'The GNU C-compiler suite is not yet supported on MSDOS systems.'.
1.101 + warnMsg1 := 'The MINGW C-compiler suite is not officially supported.'.
1.102 ].
1.103 ].
1.104 +
1.105 suite := self suiteNameOfCompiler:(self usedCompilerHolder value).
1.106 self nameOfUsedCompilerSuiteHolder value:suite.
1.107
1.108 @@ -2708,7 +2721,7 @@
1.109 self compilerWarnMessageVisibleHolder value:false
1.110 ].
1.111
1.112 - "Modified: / 04-09-2012 / 09:57:37 / cg"
1.113 + "Modified: / 05-09-2012 / 19:14:00 / cg"
1.114 !
1.115
1.116 enterContentsSpecification
1.117 @@ -2815,6 +2828,9 @@
1.118 usedCompiler = 'gcc' ifTrue:[
1.119 ^ 'GNU C-Compiler'.
1.120 ].
1.121 + usedCompiler = 'mingw' ifTrue:[
1.122 + ^ 'MINGW GNU C-Compiler'.
1.123 + ].
1.124
1.125 ^ 'C-Compiler'.
1.126