catchup merge
authorMattD <mattd@symbian.org>
Mon, 24 Aug 2009 17:51:03 +0100
changeset 379 1d777b8357df
parent 378 71d64162329a (current diff)
parent 373 cc469b3fe547 (diff)
child 380 d4dac57985d9
catchup merge
--- a/common/build.postbuild.xml	Mon Aug 24 14:37:08 2009 +0100
+++ b/common/build.postbuild.xml	Mon Aug 24 17:51:03 2009 +0100
@@ -301,7 +301,7 @@
           </fileset>
         </path>
         <sequential>
-          <propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\|\/].*\.T?\d+_+(.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
+		<propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\/](.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
 	        <echo message="Preprocessing @{logfile}..."/>
           <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" input="@{logfile}" output="${build.log.dir}/analysis/${preprocessedlogfile}" error="${build.log.dir}/analysis/${build.id}_preprocess.log" append="true">
             <arg value="${sf.common.config.dir}/tools/raptor/preprocess_log.pl"/>