# HG changeset patch
# User Daniel Jacobs <daniel.jacobs@nokia.com>
# Date 1273755183 -3600
# Node ID 0d12d79bd42d251a884b39b887c5aa27f46f9197
# Parent  a0f5dc257779780e91e2e042471ce1fa3fedb13c# Parent  b41ce675e7b23049d573ddfc8356de2ec72a1f64
Merge from fix.

diff -r b41ce675e7b2 -r 0d12d79bd42d .hgtags
--- a/.hgtags	Tue May 11 21:10:52 2010 +0100
+++ b/.hgtags	Thu May 13 13:53:03 2010 +0100
@@ -7,3 +7,10 @@
 7006bcce52990f33d0c20c51bebc2b58ed36db60 stable
 7006bcce52990f33d0c20c51bebc2b58ed36db60 stable
 679d97112f986e16e9dbed3f7a016388d42e04f8 stable
+679d97112f986e16e9dbed3f7a016388d42e04f8 2.13.0
+7006bcce52990f33d0c20c51bebc2b58ed36db60 2.12.5
+976aca38ffe5ce30d7753ea77a8de44e5cbd0dc8 2.12.4
+4e477ddf2eed2b478793a7c7ff22320e5ee6ce21 2.12.1
+2bc875af320017a5952adb544e78306e7807865c 2.12.0
+007900c31eef0363e705cf15d131740d4eeb6208 2.12.3
+1e23e973ab856a45d9e3e2dcd9a72a9e466c03c7 2.12.2
diff -r b41ce675e7b2 -r 0d12d79bd42d bintools/elftools/group/elftran.mmp
--- a/bintools/elftools/group/elftran.mmp	Tue May 11 21:10:52 2010 +0100
+++ b/bintools/elftools/group/elftran.mmp	Thu May 13 13:53:03 2010 +0100
@@ -45,5 +45,5 @@
 source          byte_pair.cpp pagedCompress.cpp
 
 systeminclude   ../inc /epoc32/include ../../../imgtools/imglib/compress /epoc32/include/tools/
-
+OS_LAYER_SYSTEMINCLUDE
 VENDORID        0x70000001
diff -r b41ce675e7b2 -r 0d12d79bd42d bintools/evalid/EvalidCompare.pm
--- a/bintools/evalid/EvalidCompare.pm	Tue May 11 21:10:52 2010 +0100
+++ b/bintools/evalid/EvalidCompare.pm	Thu May 13 13:53:03 2010 +0100
@@ -27,6 +27,29 @@
 use File::Path;
 use File::Basename;
 use File::Copy;
+use Config;
+
+# Search for tools with Raptor...
+sub FindTool($)
+{
+  my $tool = shift;
+  my $location = $tool;
+  if ($Config{osname} =~ m/MSWin32/i && $ENV{SBS_HOME} && -e $ENV{SBS_HOME}."/win32/mingw/bin/".$tool.".exe")
+  {
+    $location = $ENV{SBS_HOME}."/win32/mingw/bin/".$tool.".exe"; 
+  }
+  elsif(-e $ENV{EPOCROOT}."epoc32/gcc_mingw/bin/".$tool.".exe")
+  {
+    $location = $ENV{EPOCROOT}."epoc32/gcc_mingw/bin/".$tool.".exe";
+  }
+  elsif(-e $FindBin::Bin."/".$tool.".exe")
+  {
+    $location = $FindBin::Bin."/".$tool.".exe"; 
+  }
+  return $location;
+}
+
+
 
 #
 # Constants.
@@ -71,11 +94,11 @@
 # they also enabled an order of expandor arguments where the filename is not last
 my %typeHandler = (
       e32 => {reader => 'elf2e32 --dump --e32input=', filter => \&Elf2E32Filter},
-      arm => {reader => 'nm --no-sort', filter => \&NmFilter, retry => 1, relative_paths => 1},
+      arm => {reader => FindTool("nm").' --no-sort', filter => \&NmFilter, retry => 1, relative_paths => 1},
       elf => {reader => 'elfdump -i', filter => \&ElfDumpFilter, rawretry => 1},
-      intel => {reader => '%EPOCROOT%epoc32\gcc_mingw\bin\nm --no-sort', filter => \&NmFilter, rawretry => 1, relative_paths => 1, skipstderr => 1},
+      intel => {reader => FindTool("nm").' --no-sort', filter => \&NmFilter, rawretry => 1, relative_paths => 1, skipstderr => 1},
       intel_pe => {reader => 'pe_dump', filter => \&FilterNone, rawretry => 1},
-	  zip => {reader => '"'.$FindBin::Bin.'/unzip" -l -v', filter => \&UnzipFilter, rawretry => 1},
+	  zip => {reader => FindTool("unzip").' -l -v', filter => \&UnzipFilter, rawretry => 1},
       map => {filter => \&MapFilter, skipblanks => 1},
       sgml => {filter => \&SgmlFilter},
       preprocessed_text => {filter => \&PreprocessedTextFilter},
@@ -231,7 +254,7 @@
     }
   }
 
-  if ($typeBuf =~ /^!<arch>\x0A(.{48}([0-9 ]{10})\x60\x0A(......))/s) {
+  if ($typeBuf =~ /^!<arch>\x0A(.{48}([0-9 ]{9}).\x60\x0A(......))/s) {
     # library - could be MARM or WINS
 
     $typeBuf = $1;
@@ -240,7 +263,7 @@
     open (FILE, $file) or die "Error: Couldn't open \"$file\" for reading: $!\n";
     binmode (FILE);
     
-    while ($typeBuf =~ /^.{48}([0-9 ]{10})\x60\x0A(......)/s) {
+    while ($typeBuf =~ /^.{48}([0-9 ]{9}).\x60\x0A(......)/s) {
       # $1 is the size of the archive member, $2 is first 6 bytes of the file
       # There may be several different sorts of file in the archive, and we
       # need to scan through until we find a type we recognize:
diff -r b41ce675e7b2 -r 0d12d79bd42d e32tools/e32lib/group/seclib.mmp
--- a/e32tools/e32lib/group/seclib.mmp	Tue May 11 21:10:52 2010 +0100
+++ b/e32tools/e32lib/group/seclib.mmp	Thu May 13 13:53:03 2010 +0100
@@ -45,7 +45,7 @@
 userinclude     ../setcap 
 userinclude     ../../e32lib/e32image/inc
 systeminclude   /epoc32/include
-
+OS_LAYER_SYSTEMINCLUDE
 OPTION          GCC -w
 
 //macro __PLACEMENT_NEW_INLINE
diff -r b41ce675e7b2 -r 0d12d79bd42d e32tools/elf2e32/group/elf2e32.mmp
--- a/e32tools/elf2e32/group/elf2e32.mmp	Tue May 11 21:10:52 2010 +0100
+++ b/e32tools/elf2e32/group/elf2e32.mmp	Thu May 13 13:53:03 2010 +0100
@@ -27,6 +27,7 @@
 source	 	pl_elfrelocation.cpp  pl_elfrelocations.cpp  pl_symbol.cpp  polydll_fb_target.cpp  polydll_rebuild_target.cpp  usecasebase.cpp 
 source	 	byte_pair.cpp  pagedcompress.cpp checksum.cpp stdexe_target.cpp
 
+OS_LAYER_SYSTEMINCLUDE
 systeminclude    /epoc32/include  /epoc32/include/tools  
 userinclude		../source ../include
 
diff -r b41ce675e7b2 -r 0d12d79bd42d imgtools/imaker/src/imaker.pm
--- a/imgtools/imaker/src/imaker.pm	Tue May 11 21:10:52 2010 +0100
+++ b/imgtools/imaker/src/imaker.pm	Thu May 13 13:53:03 2010 +0100
@@ -351,7 +351,7 @@
 {
     (my $dir = shift()) =~ s/^>>?(?!>)//;
     my $absdir = "";
-    eval { local $SIG{__DIE__}; $absdir = Cwd::abs_path($dir) };
+    if (-e $dir) {$absdir = Cwd::abs_path($dir) };
     return(PathConv($absdir || File::Spec->rel2abs($dir,
         $dir !~ /^$gWorkdrive/i && $dir =~ /^([a-z]:)/i ? "$1/" : ""), shift(), shift()));
 }