# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1269267905 0
# Node ID 8b364fe9ff75626497f0387253fcd1054a95f54b
# Parent  d01f6a730008f7fdafd5e840760cfcf609026012# Parent  e6a0e92cf215ebf8403d8a0ba507522ad9b5af90
Merge

diff -r e6a0e92cf215 -r 8b364fe9ff75 common/build.postbuild.xml
--- a/common/build.postbuild.xml	Fri Mar 19 11:20:24 2010 +0000
+++ b/common/build.postbuild.xml	Mon Mar 22 14:25:05 2010 +0000
@@ -325,6 +325,7 @@
                 <arg value="-t${sf.spec.package.zip.format}"/>
                 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
                 <arg value="-xr!*.sym"/>
+                <arg value="-ir!epoc32/release/armv5/_*.bin"/> <!-- include bootloaders in common lib zipfile -->
                 <arg value="${build.drive}/output/zips/release/binaries_armv5_lib.zip"/>
                 <arg value="epoc32\release\armv5\lib"/>
             </exec>
diff -r e6a0e92cf215 -r 8b364fe9ff75 common/tools/envinfo.pl
--- a/common/tools/envinfo.pl	Fri Mar 19 11:20:24 2010 +0000
+++ b/common/tools/envinfo.pl	Mon Mar 22 14:25:05 2010 +0000
@@ -151,8 +151,8 @@
 
 # java
 my $java_ver = 'N.A.';
-my $java_out = `java -version`;
-$java_ver = $1 if ($zip_out =~ /^java version (.*)/m);
+my $java_out = `java -version 2>&1`;
+$java_ver = $1 if ($java_out =~ /^java version (.*)/m);
 push @environment_info, {name=>'java', version=>$java_ver};
 
 for my $tool_info (@environment_info)
diff -r e6a0e92cf215 -r 8b364fe9ff75 sf-package/CompilerCompatibility_props.ant.xml
--- a/sf-package/CompilerCompatibility_props.ant.xml	Fri Mar 19 11:20:24 2010 +0000
+++ b/sf-package/CompilerCompatibility_props.ant.xml	Mon Mar 22 14:25:05 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="COMPILERCOMPATIBILITY-PROPS">
-  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.g"/>
+  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.h"/>
 </project>
 
diff -r e6a0e92cf215 -r 8b364fe9ff75 sf-package/symbian3_props.ant.xml
--- a/sf-package/symbian3_props.ant.xml	Fri Mar 19 11:20:24 2010 +0000
+++ b/sf-package/symbian3_props.ant.xml	Mon Mar 22 14:25:05 2010 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
 <project name="SYMBIAN3-PROPS">
-  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.g"/>
+  <property name="sf.spec.baseline.location" value="\\v800020\releases\PDK_3.0.h"/>
 </project>