--- a/build_package.pl	Wed Oct 28 13:41:24 2009 +0000
+++ b/build_package.pl	Thu Oct 29 11:35:36 2009 +0000
@@ -30,7 +30,7 @@
 my $sFbfProjectDir = '';
 my $sSubProject = '';
 my $sSubprojVariant = '';
-my $bRVCT4 = 0;
+my $sSBSConfig = '';
 #my $sSourcesFile = '';
 #my $sModelFile = '';
 my $sFbfConfigRepo="\\\\bishare\\mercurial_development\\oss\\FCL\\interim\\fbf\\configs\\default";
@@ -48,7 +48,7 @@
 	'projectdir=s' => \$sFbfProjectDir,
 	'subproj=s' => \$sSubProject,
 	'variant=s' => \$sSubprojVariant,
-	'rvct4!' => \$bRVCT4,
+	'sbsconfig!' => \$sSBSConfig,
 	#'sources=s' => \$sSourcesFile,
 	#'model=s' => \$sModelFile,
 	'number=s' => \$nCmdLineNumber,
@@ -66,7 +66,7 @@
 	print "where OPTIONS are:\n";
 	print "\t--subproj=RELPATH Select subproject located at RELPATH (relative to the root of the project repository)\n";
 	print "\t--variant=VARIANT If specified use sources_VARIANT.csv instead of sources.csv and add \"VARIANT\" as tag for this build\n";
-	print "\t--rvct4 Enable build with RVCT4 on top of the other targets\n";
+	print "\t--sbsconfig=CONFIG Pass on CONFIG as configuration to SBS (can also be a comma separated list, e.g. 'armv5,winscw')\n";
 	print "\t--projectrepo=REPO[#REV] Use repository REPO at revision REV for the project (instead of \\\\bishare\\mercurial_internal\\fbf\\projects\\packages)\n";
 	print "\t--projectdir=DIR Use DIR location for the project (exclusive with --projectrepo).\n";
 	#print "\t--sources=FILE ...\n";
@@ -230,8 +230,8 @@
 $sSubProjArg = "-Dsf.subproject.path=$sSubProject" if ($sSubProject);
 my $sVariantArg = '';
 $sVariantArg = "-Dsf.spec.sourcesync.sourcespecfile=sources_$sSubprojVariant.csv" if ($sSubprojVariant);
-my $sRVCT4Arg = '';
-$sRVCT4Arg = "-Dsf.spec.sbs.config=\"tools2_rel.whatlog,tools2_rel.whatlog.rvct4_0,winscw.whatlog,winscw.whatlog.rvct4_0,armv5.whatlog,armv5.whatlog.rvct4_0\"" if ($bRVCT4);
+my $sSBSConfigArg = '';
+$sSBSConfigArg = "-Dsf.spec.sbs.config=\"$sSBSConfig\"" if ($sSBSConfig);
 my $sAllTags = '';
 $sAllTags = $sDiamondsTag if ($sDiamondsTag);
 $sAllTags .= ',' if ($sAllTags and $sSubprojVariant);
@@ -241,12 +241,12 @@
 print("cd $sJobDir\\sf-config\n");
 chdir("$sJobDir\\sf-config");
 print "###### BUILD PREPARATION ######\n";
-my $sPreparationCmd = "hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTagsArg $sNoPublishOpt $sJobRootDirArg $sHlmDefineOpt $sVariantArg $sRVCT4Arg";
+my $sPreparationCmd = "hlm sf-prep -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTagsArg $sNoPublishOpt $sJobRootDirArg $sHlmDefineOpt $sVariantArg $sSBSConfigArg";
 print("$sPreparationCmd\n");
 system($sPreparationCmd);
 
 print "###### EXECUTE BUILD ######\n";
-my $sBuildallCmd = "hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTagsArg $sNoPublishOpt $sJobRootDirArg $sHlmDefineOpt $sVariantArg $sRVCT4Arg";
+my $sBuildallCmd = "hlm sf-build-all -Dsf.project.type=package $sSubProjArg -Dsf.spec.job.number=$nJobNumber -Dsf.spec.job.drive=$sDriveLetter: $sTagsArg $sNoPublishOpt $sJobRootDirArg $sHlmDefineOpt $sVariantArg $sSBSConfigArg";
 print("$sBuildallCmd\n");
 system($sBuildallCmd);