# HG changeset patch # User Maciej Seroka # Date 1278670592 -3600 # Node ID 60b4235c5481b62046e70ffc314c7b8dadc94623 # Parent 1bd0e92dbd45032e731a3893e0f969f2ca289e75# Parent 08f7282dae54d1141b4b43337c4ee7af6b275808 Merge diff -r 08f7282dae54 -r 60b4235c5481 common/tools/ats/hlm_prep_package.pl --- a/common/tools/ats/hlm_prep_package.pl Tue Jul 06 17:02:03 2010 +0100 +++ b/common/tools/ats/hlm_prep_package.pl Fri Jul 09 11:16:32 2010 +0100 @@ -41,17 +41,28 @@ tie (@lines, 'Tie::File', $file, recsep => "\n") or die ("Cannot tie file \"$file\". $!\n"); $n = 0; $file_fixed = 0; + print @lines[49] . "\n"; foreach (@lines) { if (lc(@lines[$n]) =~ m/epoc32\\release\\armv5\\urel\\/) { @lines[$n] = lc(@lines[$n]); @lines[$n] =~ s/\\armv5\\urel\\/\\\$(platform)\\\$(target)\\/; $file_fixed = 1; } + if (lc(@lines[$n]) =~ m/epoc32\/release\/armv5\/urel\//) { + @lines[$n] = lc(@lines[$n]); + @lines[$n] =~ s/\/armv5\/urel\//\/\$(platform)\/\$(target)\//; + $file_fixed = 1; + } if (lc(@lines[$n]) =~ m/epoc32\\release\\armv5\\udeb\\/) { @lines[$n] = lc(@lines[$n]); @lines[$n] =~ s/\\armv5\\udeb\\/\\\$(platform)\\\$(target)\\/; $file_fixed = 1; } +# if (lc(@lines[$n]) =~ m/e:\\/) { # Replace e: with c: +# @lines[$n] = lc(@lines[$n]); +# @lines[$n] =~ s/e:\\/c:\\/; +# $file_fixed = 1; +# } $n++; } if ($file_fixed) { print $file . " fixed.\n"; } @@ -61,7 +72,7 @@ find(\&Parse_ini, $package_path); foreach $file (@ini_files) { - if ($file =~ m/\/init\//) { # Only operate on files from /init/ directories + if ((lc($file) =~ m/\/init\//) || (lc($file) =~ m/\/group\//)) { # Only operate on files from /init/ directories copy($file,$file . ".orig") or die ("Cannot copy file \"$file\". $!\n"); tie (@lines, 'Tie::File', $file, recsep => "\n") or die ("Cannot tie file \"$file\". $!\n"); $n = 0;