--- a/build_package.pl	Mon Oct 19 14:36:08 2009 +0100
+++ b/build_package.pl	Mon Oct 19 14:45:15 2009 +0100
@@ -34,7 +34,6 @@
 my $sFbfConfigRepo="\\\\bishare\\mercurial_development\\oss\\FCL\\interim\\fbf\\configs\\default";
 my $sFbfConfigDir = '';
 my $nCmdLineNumber;
-my $bProduction = 0;
 my $sDiamondsTag = '';
 my $bHudson = 0;
 my $bPublish = 1;
@@ -49,7 +48,6 @@
 	#'sources=s' => \$sSourcesFile,
 	#'model=s' => \$sModelFile,
 	'number=s' => \$nCmdLineNumber,
-	'production!' => \$bProduction,
 	'tag=s' => \$sDiamondsTag,
 	'hudson!' => \$bHudson,
 	'publish!' => \$bPublish,
@@ -70,8 +68,7 @@
 	print "\t--configrepo=REPO[#REV] Use repository REPO at revision REV for the config (instead of \\\\bishare\\mercurial_internal\\fbf\\config\\default)\n";
 	print "\t--configdir=DIR Use DIR location for the config (exclusive with --configrepo).\n";
 	print "\t--number=N Force build number to N\n";
-	print "\t--production Tag this build as 'production' (default: 'test') and use nnn numbering (default: Tnnn)\n";
-	print "\t--tag=TAG Apply Diamonds tag TAG to this build (exclusive with --production)\n";
+	print "\t--tag=TAG Apply Diamonds tag TAG to this build\n";
 	print "\t--hudson Checks that there is at least NUMBER_OF_PROCESSORS X 10 GB available on the working drive\n";
 	print "\t--nopublish Use \\numbers_test.txt for numbers and disable publishing\n";
 	print "\t--define ATTRIBUTE=VALUE Pass -D statements to the Helium Framework\n";
@@ -84,12 +81,6 @@
 	exit(0);
 }
 
-if ($bProduction and $sDiamondsTag)
-{
-	print "ERROR: Options --production and --tag are mutually exclusive.\n";
-	exit(0);
-}
-
 #if (!$sFbfProjectRepo and !$sFbfProjectDir and (!$sSourcesFile or !$sModelFile))
 #{
 #	print "Error: If you don't provide --projectrepo or --projectdir then you have to provide both --sources and --model\n";
@@ -134,7 +125,6 @@
 }
 
 my $sTestBuildOpt = "";
-$sTestBuildOpt = "-Dsf.spec.publish.diamonds.tag=production" if ( $bProduction );
 $sTestBuildOpt = "-Dsf.spec.publish.diamonds.tag=$sDiamondsTag" if ( $sDiamondsTag );
 my $sNoPublishOpt = "";
 $sNoPublishOpt = "-Dsf.spec.publish.enable=false" if ( !$bPublish );
@@ -212,11 +202,9 @@
 		my $sRevZeroHash = get_rev_zero_hash($sFbfProjectRepo);
 		$sJobNumberKey = $sRevZeroHash;
 	}
-	$sJobNumberKey .= ".T" if (!$bProduction);
 	$nUnformattedNumber = get_job_number($sJobNumberKey);
 }
 my $nJobNumber = sprintf("%.3d", $nUnformattedNumber);
-$nJobNumber = "T$nJobNumber" if (!$bProduction);
 print "For build key $sJobNumberKey got assigned number \"$nJobNumber\"\n";
 
 # check that $sLETTERS_FILE exists, otherwise create it