# HG changeset patch # User Claus Gittinger # Date 1255220425 -7200 # Node ID 2e735008a4d858046d814680eef4a79697fbfa40 # Parent 706991dee2981ddf6c8c0fb55335a966a7334d87 changed: #buildWithOutputTo:errorTo: #makeWithOutputTo:errorTo: diff -r 706991dee298 -r 2e735008a4d8 ProjectBuilder.st --- a/ProjectBuilder.st Sun Oct 11 01:09:42 2009 +0200 +++ b/ProjectBuilder.st Sun Oct 11 02:20:25 2009 +0200 @@ -119,7 +119,7 @@ ]. myTopDirectory := myTopDirectory asFilename. mySTXTopDirectory := myTopDirectory / 'stx'. - +self halt. self setupBuildDirectory. self copySTCDirectoryForBuild. self generateSourceFiles. @@ -478,21 +478,31 @@ module := package module. directory := package directory. - OperatingSystem - executeCommand:(ParserFlags makeCommand,' exe') - inputFrom:nil - outputTo:stdOut - errorTo:stdErr - inDirectory:(buildDirectory / module / directory) - onError:[:status| self error:'make failed']. + projectDefinitionClass isLibraryDefinition ifTrue:[ + OperatingSystem + executeCommand:(ParserFlags makeCommand,' classLibRule') + inputFrom:nil + outputTo:stdOut + errorTo:stdErr + inDirectory:(buildDirectory / module / directory) + onError:[:status| self error:'make failed']. + ] ifFalse:[ + OperatingSystem + executeCommand:(ParserFlags makeCommand,' exe') + inputFrom:nil + outputTo:stdOut + errorTo:stdErr + inDirectory:(buildDirectory / module / directory) + onError:[:status| self error:'make failed']. - OperatingSystem - executeCommand:(ParserFlags makeCommand,' setup') - inputFrom:nil - outputTo:stdOut - errorTo:stdErr - inDirectory:(buildDirectory / module / directory) - onError:[:status| self error:'make failed']. + OperatingSystem + executeCommand:(ParserFlags makeCommand,' setup') + inputFrom:nil + outputTo:stdOut + errorTo:stdErr + inDirectory:(buildDirectory / module / directory) + onError:[:status| self error:'make failed']. + ] ! setupBuildDirectory