ProjectBuilder.st
changeset 3072 117522ff72bc
parent 3043 457d1202c86b
child 3127 f28722d20fbb
equal deleted inserted replaced
3071:e69992cb4b24 3072:117522ff72bc
   940 
   940 
   941     "Created: / 03-09-2012 / 19:46:07 / cg"
   941     "Created: / 03-09-2012 / 19:46:07 / cg"
   942 !
   942 !
   943 
   943 
   944 makeWithOutputTo:stdOut errorTo:stdErr
   944 makeWithOutputTo:stdOut errorTo:stdErr
   945     |module directory makeCommand|
   945     |module directory makeCommand forceArg|
   946 
   946 
   947     module := package module.
   947     module := package module.
   948     directory := package directory.
   948     directory := package directory.
   949 
   949 
   950     makeCommand := ParserFlags makeCommand.
   950     makeCommand := ParserFlags makeCommand.
   951     usedCompiler isNil ifTrue:[
   951     usedCompiler isNil ifTrue:[
   952         usedCompiler := ParserFlags usedCompiler.
   952         usedCompiler := ParserFlags usedCompiler.
   953     ].
   953     ].
   954     makeCommand := self makeCommandOfCompiler:usedCompiler.
   954     makeCommand := self makeCommandOfCompiler:usedCompiler.
   955 
   955     forceArg := ''.
       
   956     
   956     "/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
   957     "/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
   957 
   958 
   958     OperatingSystem isUNIXlike ifTrue:[
   959     OperatingSystem isUNIXlike ifTrue:[
       
   960         forceArg := ' FORCE='.
       
   961 
   959         "/ generate the makefile first
   962         "/ generate the makefile first
   960         self activityNotification:('sh %1/rules/stmkmf (in %2)' 
   963         self activityNotification:('sh %1/rules/stmkmf (in %2)' 
   961                     bindWith:mySTXTopDirectory pathName    
   964                     bindWith:mySTXTopDirectory pathName    
   962                     with:(buildDirectory / module / directory)).
   965                     with:(buildDirectory / module / directory)).
   963         OperatingSystem
   966         OperatingSystem
   971 
   974 
   972     projectDefinitionClass isLibraryDefinition ifTrue:[
   975     projectDefinitionClass isLibraryDefinition ifTrue:[
   973         "/ generate the library
   976         "/ generate the library
   974         self activityNotification:(makeCommand,' classLibRule').
   977         self activityNotification:(makeCommand,' classLibRule').
   975         OperatingSystem
   978         OperatingSystem
   976             executeCommand:(makeCommand,' classLibRule FORCE=')
   979             executeCommand:(makeCommand,' classLibRule',forceArg)
   977             inputFrom:nil
   980             inputFrom:nil
   978             outputTo:stdOut
   981             outputTo:stdOut
   979             errorTo:stdErr
   982             errorTo:stdErr
   980             inDirectory:(buildDirectory / module / directory)
   983             inDirectory:(buildDirectory / module / directory)
   981             onError:[:status | self error:'make failed'].
   984             onError:[:status | self error:'make failed'].
   982     ] ifFalse:[
   985     ] ifFalse:[
   983         (self makeExeOnly) ifTrue:[
   986         (self makeExeOnly) ifTrue:[
   984             self activityNotification:(makeCommand,' exe').
   987             self activityNotification:(makeCommand,' exe').
   985             OperatingSystem
   988             OperatingSystem
   986                 "/ generate the executable
   989                 "/ generate the executable
   987                 executeCommand:(makeCommand,' exe FORCE=')
   990                 executeCommand:(makeCommand,' exe',forceArg)
   988                 inputFrom:nil
   991                 inputFrom:nil
   989                 outputTo:stdOut
   992                 outputTo:stdOut
   990                 errorTo:stdErr
   993                 errorTo:stdErr
   991                 inDirectory:(buildDirectory / module / directory)
   994                 inDirectory:(buildDirectory / module / directory)
   992                 onError:[:status | self error:'make failed'].
   995                 onError:[:status | self error:'make failed'].
  1002                 inDirectory:(buildDirectory / module / directory)
  1005                 inDirectory:(buildDirectory / module / directory)
  1003                 onError:[:status | self error:'make failed'].
  1006                 onError:[:status | self error:'make failed'].
  1004         ]
  1007         ]
  1005     ]
  1008     ]
  1006 
  1009 
  1007     "Modified: / 03-09-2012 / 19:47:15 / cg"
  1010     "Modified: / 28-01-2014 / 21:48:07 / cg"
  1008     "Modified (comment): / 06-09-2012 / 16:22:38 / cg"
       
  1009 !
  1011 !
  1010 
  1012 
  1011 objDirForUsedCompiler
  1013 objDirForUsedCompiler
  1012     ^ self objDirForUsedCompiler:usedCompiler
  1014     ^ self objDirForUsedCompiler:usedCompiler
  1013 
  1015