# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1465221436 -7200
# Node ID 5cbec72e27fa92e718ba75a99396cbf5534dc521
# Parent  58f20c91f623cb81d58db8b2091c6974185bc748
#BUGFIX by cg
class: Tools::ProjectBuilder
changed:
	#buildWithOutputTo:errorTo:
	#makeCommandOfCompiler:
	#makeWithOutputTo:errorTo:

diff -r 58f20c91f623 -r 5cbec72e27fa ProjectBuilder.st
--- a/ProjectBuilder.st	Mon Jun 06 14:45:52 2016 +0200
+++ b/ProjectBuilder.st	Mon Jun 06 15:57:16 2016 +0200
@@ -273,6 +273,7 @@
 
     usedCompiler isNil ifTrue:[
         usedCompiler := ParserFlags usedCompiler.
+        usedCompiler isNil ifTrue:[ self error:'no compiler defined (settings)'. ].
     ].
 
     projectDefinitionClass := ProjectDefinition definitionClassForPackage:package.
@@ -327,7 +328,7 @@
     ].
     self activityNotification:'Generating source files...'.
     self generateSourceFiles.
-    self makeQuick ifFalse:[
+    false "self makeQuick" ifFalse:[
         self activityNotification:'Copying dlls for linkage...'.
         self copyDLLsForLinkage.
         self activityNotification:'Copying support files for compilation and linkage...'.
@@ -335,10 +336,9 @@
         self copySupportFilesForLinkage.
         self copyStartupFilesFromSmalltalk.
     ].
-    self activityNotification:'Executing make...'.
     self makeWithOutputTo:stdOut errorTo:stdErr.
 
-    "Modified: / 06-06-2016 / 12:13:01 / cg"
+    "Modified: / 06-06-2016 / 15:16:28 / cg"
 ! !
 
 !ProjectBuilder methodsFor:'building/private'!
@@ -934,27 +934,30 @@
 !
 
 makeCommandOfCompiler:usedCompiler
-    usedCompiler = 'bcc' ifTrue:[ 
-        ^ 'bmake'.
-    ].
-    usedCompiler = 'vc' ifTrue:[ 
-        ^ 'vcmake'. "/ compilerFlag := '-DUSEVC' 
-    ].
-    usedCompiler = 'lcc' ifTrue:[ 
-        ^ 'lccmake'. "/ compilerFlag := '-DUSELCC' 
-    ].
-    usedCompiler = 'tcc' ifTrue:[ 
-        ^ 'tccmake'. "/ compilerFlag := '-DUSELCC' 
-    ].
-    usedCompiler = 'mingw' ifTrue:[ 
-        ^ 'mingwmake'.  "/ compilerFlag := '-DUSEMINGW' 
-    ].
-    true "usedCompiler = 'gcc'" ifTrue:[ 
-        ^ 'make'.       "/ compilerFlag := '-DUSEGCC' 
+    usedCompiler notNil ifTrue:[
+        usedCompiler = 'bcc' ifTrue:[ 
+            ^ 'bmake'.
+        ].
+        usedCompiler = 'vc' ifTrue:[ 
+            ^ 'vcmake'. "/ compilerFlag := '-DUSEVC' 
+        ].
+        usedCompiler = 'lcc' ifTrue:[ 
+            ^ 'lccmake'. "/ compilerFlag := '-DUSELCC' 
+        ].
+        usedCompiler = 'tcc' ifTrue:[ 
+            ^ 'tccmake'. "/ compilerFlag := '-DUSELCC' 
+        ].
+        usedCompiler = 'mingw' ifTrue:[ 
+            ^ 'mingwmake'.  "/ compilerFlag := '-DUSEMINGW' 
+        ].
+        true "usedCompiler = 'gcc'" ifTrue:[ 
+            ^ 'make'.       "/ compilerFlag := '-DUSEGCC' 
+        ].
     ].
     self error:'unknown compiler specified'.
 
     "Created: / 03-09-2012 / 19:46:07 / cg"
+    "Modified: / 06-06-2016 / 15:11:54 / cg"
 !
 
 makeWithOutputTo:stdOut errorTo:stdErr
@@ -963,11 +966,13 @@
     module := package module.
     directory := package directory.
 
-    makeCommand := ParserFlags makeCommand.
+    "/ makeCommand := ParserFlags makeCommand.
     usedCompiler isNil ifTrue:[
         usedCompiler := ParserFlags usedCompiler.
+        usedCompiler isNil ifTrue:[ self error:'no compiler defined (settings)'. ].
     ].
     makeCommand := self makeCommandOfCompiler:usedCompiler.
+    self activityNotification:'Executing make... (',makeCommand,')'.
     forceArg := ''.
     
     "/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
@@ -1019,7 +1024,7 @@
         ]
     ]
 
-    "Modified: / 28-01-2014 / 21:48:07 / cg"
+    "Modified: / 06-06-2016 / 15:17:00 / cg"
 !
 
 objDirForUsedCompiler