--- a/common/build.postbuild.xml	Mon Nov 23 15:01:01 2009 +0000
+++ b/common/build.postbuild.xml	Thu Nov 26 16:02:05 2009 +0000
@@ -360,13 +360,6 @@
           <include name="*_compile_preprocessed.log"/>
         </fileset>
       </apply>
-      
-      <echo message="Summarizing Raptor data"/>
-      <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" output="${build.log.dir}/analysis/${build.id}_raptorparse.log" append="true">
-        <arg value="${sf.common.config.dir}/tools/raptor/summarize.pl"/>
-        <arg value="--raptorbitsdir=${build.log.dir}/raptorbits"/>
-        <arg value="--outputdir=${build.log.dir}"/>
-      </exec>
           
       <!-- Now iterate through the generated TSVs to sort them and remove duplicates -->
       <for param="tsv">

--- a/common/tools/raptor/releaseables.pl	Mon Nov 23 15:01:01 2009 +0000
+++ b/common/tools/raptor/releaseables.pl	Thu Nov 26 16:02:05 2009 +0000
@@ -39,6 +39,11 @@
 	exit(0);
 }
 
+my $releaseablesdir = "$::basedir/releaseables";
+$releaseablesdir =~ s,/,\\,g; # this is because rmdir doens't cope correctly with the forward slashes
+system("rmdir /S /Q $releaseablesdir") if (-d "$releaseablesdir");
+mkdir("$releaseablesdir");
+
 my $saxhandler = RaptorSAXHandler->new();
 $saxhandler->add_observer('releaseables', $releaseables::reset_status);
 

--- a/common/tools/raptor/releaseables.pm	Mon Nov 23 15:01:01 2009 +0000
+++ b/common/tools/raptor/releaseables.pm	Thu Nov 26 16:02:05 2009 +0000
@@ -90,8 +90,7 @@
 
 sub on_start_buildlog
 {
-	system("rmdir /S /Q $::raptorbitsdir/releaseables") if (-d "$::basedir/releaseables");
-	mkdir("$::raptorbitsdir/releaseables");
+	
 }
 
 sub on_start_whatlog
@@ -229,10 +228,10 @@
 			my $layer = $1;
 			my $package = $2;
 			
-			mkdir("$::raptorbitsdir/releaseables/$layer");
-			mkdir("$::raptorbitsdir/releaseables/$layer/$package");
+			mkdir("$::basedir/releaseables/$layer");
+			mkdir("$::basedir/releaseables/$layer/$package");
 			
-			my $filename = "$::raptorbitsdir/releaseables/$layer/$package/info.tsv";
+			my $filename = "$::basedir/releaseables/$layer/$package/info.tsv";
 			
 			print "Writing info file $filename\n" if (!-f$filename);
 			open(FILE, ">>$filename");

--- a/common/tools/raptor/uh.pl	Mon Nov 23 15:01:01 2009 +0000
+++ b/common/tools/raptor/uh.pl	Thu Nov 26 16:02:05 2009 +0000
@@ -55,6 +55,8 @@
 }
 mkdir($basedir) if (!-d$basedir);
 
+$raptorbitsdir =~ s,/,\\,g; # this is because rmdir doens't cope correctly with the forward slashes
+
 system("rmdir /S /Q $raptorbitsdir") if (-d $raptorbitsdir);
 mkdir($raptorbitsdir);
 #print "Created dir $raptorbitsdir.\n";