equal
deleted
inserted
replaced
279 use Cwd; |
279 use Cwd; |
280 my $whence = Cwd::cwd(); |
280 my $whence = Cwd::cwd(); |
281 |
281 |
282 chdir "$output_dir" or$util->error("chdir $output_dir failed"); |
282 chdir "$output_dir" or$util->error("chdir $output_dir failed"); |
283 |
283 |
284 if ($BuildSystemVersion == "2") |
284 my $RVCTVersion = $ENV{'ARMV5VER'}; |
285 { |
285 if((index($RVCTVersion, "RVCT4.0") != -1) && ($platform eq "armv5")) |
286 my $platformConfig = "$platform"."_"."$variant"; |
286 { |
287 $util->invoke("sbs -c $platformConfig"); |
287 my $platformConfig = "arm."."v5."."$variant".".rvct4_0"; |
288 } |
288 $util->info($platformConfig); |
289 else |
289 $util->invoke("sbs -b bld.inf -c $platformConfig"); |
290 { |
290 } |
291 $util->invoke("bldmake bldfiles"); |
291 else |
292 $util->invoke("abld build $platform $variant"); |
292 { |
293 $util->invoke("abld -check build $platform $variant"); |
293 if ($BuildSystemVersion == "2") |
294 } |
294 { |
|
295 my $platformConfig = "$platform"."_"."$variant"; |
|
296 $util->invoke("sbs -c $platformConfig"); |
|
297 } |
|
298 else |
|
299 { |
|
300 $util->invoke("bldmake bldfiles"); |
|
301 $util->invoke("abld build $platform $variant"); |
|
302 $util->invoke("abld -check build $platform $variant"); |
|
303 } |
|
304 } |
295 |
305 |
296 |
306 |
297 chdir "$whence" or $util->error("chdir $whence failed"); |
307 chdir "$whence" or $util->error("chdir $whence failed"); |
298 |
308 |
299 if ($self->{GENERATE_SISFILE}) |
309 if ($self->{GENERATE_SISFILE}) |