equal
deleted
inserted
replaced
168 my $sProjectArg = "-Dsf.project.repo=$sFbfProjectRepo"; |
168 my $sProjectArg = "-Dsf.project.repo=$sFbfProjectRepo"; |
169 $sProjectArg .= " -Dsf.project.rev=$sFbfProjectRev" if ($sFbfProjectRev); |
169 $sProjectArg .= " -Dsf.project.rev=$sFbfProjectRev" if ($sFbfProjectRev); |
170 $sProjectArg = "-Dsf.project.dir=$sFbfProjectDir" if ($sFbfProjectDir); |
170 $sProjectArg = "-Dsf.project.dir=$sFbfProjectDir" if ($sFbfProjectDir); |
171 my $sBootstrapCmd = "hlm -f bootstrap.xml $sConfigArg $sProjectArg -Dsf.target.dir=$sJobDir"; |
171 my $sBootstrapCmd = "hlm -f bootstrap.xml $sConfigArg $sProjectArg -Dsf.target.dir=$sJobDir"; |
172 print("$sBootstrapCmd\n"); |
172 print("$sBootstrapCmd\n"); |
173 open(LOG, ">console_bootstrap_$$.txt") |
173 open(LOG, ">console_bootstrap_$$.txt"); |
174 open(PIPE, "$sBootstrapCmd 2>&1 |"); |
174 open(PIPE, "$sBootstrapCmd 2>&1 |"); |
175 while(<PIPE>) |
175 while(<PIPE>) |
176 { |
176 { |
177 print LOG $_; |
177 print LOG $_; |
178 print $_; |
178 print $_; |
239 print("cd $sJobDir\\sf-config\n"); |
239 print("cd $sJobDir\\sf-config\n"); |
240 chdir("$sJobDir\\sf-config"); |
240 chdir("$sJobDir\\sf-config"); |
241 print "###### BUILD PREPARATION ######\n"; |
241 print "###### BUILD PREPARATION ######\n"; |
242 my $sPreparationCmd = "hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg"; |
242 my $sPreparationCmd = "hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg"; |
243 print("$sPreparationCmd\n"); |
243 print("$sPreparationCmd\n"); |
244 open(LOG, ">console_sfprep_$$.txt") |
244 open(LOG, ">console_sfprep_$$.txt"); |
245 open(PIPE, "$sPreparationCmd 2>&1 |"); |
245 open(PIPE, "$sPreparationCmd 2>&1 |"); |
246 while(<PIPE>) |
246 while(<PIPE>) |
247 { |
247 { |
248 print LOG $_; |
248 print LOG $_; |
249 print $_; |
249 print $_; |
252 close(LOG); |
252 close(LOG); |
253 |
253 |
254 print "###### EXECUTE BUILD ######\n"; |
254 print "###### EXECUTE BUILD ######\n"; |
255 my $sBuildallCmd = "hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg"; |
255 my $sBuildallCmd = "hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTestBuildOpt $sNoPublishOpt $sJobRootDirArg"; |
256 print("$sBuildallCmd\n"); |
256 print("$sBuildallCmd\n"); |
257 open(LOG, ">console_sfbuildall_$$.txt") |
257 open(LOG, ">console_sfbuildall_$$.txt"); |
258 open(PIPE, "$sBuildallCmd 2>&1 |"); |
258 open(PIPE, "$sBuildallCmd 2>&1 |"); |
259 while(<PIPE>) |
259 while(<PIPE>) |
260 { |
260 { |
261 print LOG $_; |
261 print LOG $_; |
262 print $_; |
262 print $_; |