--- a/bootstrap.xml	Fri Jun 26 12:21:52 2009 +0100
+++ b/bootstrap.xml	Fri Jun 26 17:08:28 2009 +0100
@@ -47,10 +47,10 @@
         <echo message="Getting FBF configuration from repository ${sf.config.repo}"/>
         <hlm:scm verbose="true" scmUrl="scm:hg:${sf.config.repo}">
           <hlm:checkout basedir="${sf.target.dir}/sf-config"/>
-          <hlm:tags basedir="${sf.target.dir}/sf-config" reference="hg.tags.id${refid}"/>
+          <hlm:tags basedir="${sf.target.dir}/sf-config" reference="hg.tags.id1"/>
           <hlm:update basedir="${sf.target.dir}/sf-config">
             <hlm:latestTag pattern="${sf.config.rev}">
-              <hlm:tagSet refid="hg.tags.id${refid}"/> 
+              <hlm:tagSet refid="hg.tags.id1"/> 
             </hlm:latestTag>
           </hlm:update>
         </hlm:scm>
@@ -71,10 +71,10 @@
         <echo message="Getting FBF project from repository ${sf.project.repo}"/>
         <hlm:scm verbose="true" scmUrl="scm:hg:${sf.project.repo}">
           <hlm:checkout basedir="${sf.target.dir}/build/config"/>
-          <hlm:tags basedir="${sf.target.dir}/build/config" reference="hg.tags.id${refid}"/>
+          <hlm:tags basedir="${sf.target.dir}/build/config" reference="hg.tags.id2"/>
           <hlm:update basedir="${sf.target.dir}/build/config">
             <hlm:latestTag pattern="${sf.project.rev}">
-              <hlm:tagSet refid="hg.tags.id${refid}"/>
+              <hlm:tagSet refid="hg.tags.id2"/>
             </hlm:latestTag>
           </hlm:update>
         </hlm:scm>

--- a/build_package.pl	Fri Jun 26 12:21:52 2009 +0100
+++ b/build_package.pl	Fri Jun 26 17:08:28 2009 +0100
@@ -22,13 +22,13 @@
 my $sJOB_BASE_DIR="D:\\fbf_project";
 my $nMAX_JOBDIR_AGE_SECONDS = 86400; # max number of seconds after which the letter is forcibly released
 my $nLOCK_FILE_MAX_ATTEMPTS = 5;
-my $sNUMBERS_FILE="\\\\v800008.ad-sfpd.intra\\g\$\\numbers.txt";
+my $sNUMBERS_FILE="\\\\bishare\\SF_builds\\numbers.txt";
 my $sLETTERS_FILE="D:\\letters.txt";
 my $nMAX_LETTER_AGE_SECONDS = 86400; # max number of seconds after which the letter is forcibly released
 
 my $sFbfProjectRepo = '';
 my $sFbfProjectDir = '';
-my $sFbfConfigRepo="\\\\v800008.ad-sfpd.intra\\g\$\\mercurial_internal\\fbf\\configs\\pkgbuild";
+my $sFbfConfigRepo="\\\\bishare\\mercurial_internal\\fbf\\configs\\pkgbuild";
 my $sFbfConfigDir = '';
 my $sJobLabel = '';
 my $nCmdLineNumber;
@@ -47,7 +47,7 @@
 {
 	print "Usage: build_package.pl --label=LABEL (--projectrepo=REPO | --projectdir=DIR) OPTIONS\n";
 	print "\tOPTIONS:\n";
-	print "\t--configrepo=REPO Use REPO location for the config instead of \\\\v800008\\g\$\\mercurial_development\\oss\\FCL\\interim\\fbf\\config\\pkgbuild\\n";
+	print "\t--configrepo=REPO Use REPO location for the config instead of \\\\bishare\\mercurial_internal\\fbf\\config\\pkgbuild\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--testbuild Use d:\\numbers_test.txt for numbers and d:\\SF_builds_test to publish results\n";
@@ -55,7 +55,7 @@
 }
 
 my $sTestBuildOpts = "";
-$sTestBuildOpts = "-Dsf.spec.publish.networkdrive=d:\\SF_builds_test" if ( $bTestBuild );
+$sTestBuildOpts = "-Dsf.spec.publish.networkdrive=d:\\SF_builds_test -Dsf.spec.publish.rootdir=d:\\SF_builds_test" if ( $bTestBuild );
 $sNUMBERS_FILE = "d:\\numbers_test.txt" if ( $bTestBuild );
 
 my $sJobDir = mkdir_unique("$sJOB_BASE_DIR\\$sJobLabel");