# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1283426224 -3600
# Node ID 776ca456c2219fe7e6274694fc89e598041541e4
# Parent  63e3c25b6e2c484edca4c5339cfdf87f55f7c440
Allow for a layer called "adapt" as an alternative to "adaptation"

diff -r 63e3c25b6e2c -r 776ca456c221 common/tools/split_sysdef.pl
--- a/common/tools/split_sysdef.pl	Thu Sep 02 09:22:38 2010 +0100
+++ b/common/tools/split_sysdef.pl	Thu Sep 02 12:17:04 2010 +0100
@@ -56,7 +56,7 @@
 		$bldfile =~ s,\\,/,g;
 		$bldfile = "/$bldfile" if ( $bldfile !~ m,^/, );
 		$bldfile = "/sf$bldfile" if ( $bldfile !~ m,^/sf, );
-		if ($bldfile =~ m,^/sf/(os|mw|app|tools|ostools|adaptation)/,)
+		if ($bldfile =~ m,^/sf/(os|mw|app|tools|ostools|adaptation|adapt)/,)
 		{
 			$unit->setAttribute("bldFile", $bldfile);
 		}
@@ -72,7 +72,7 @@
 		$mrp =~ s,\\,/,g;
 		$mrp = "/$mrp" if ( $mrp !~ m,^/, );
 		$mrp = "/sf$mrp" if ( $mrp !~ m,^/sf, );
-		if ($mrp =~ m,^/sf/(os|mw|app|tools|ostools|adaptation)/,)
+		if ($mrp =~ m,^/sf/(os|mw|app|tools|ostools|adaptation|adapt)/,)
 		{
 			$unit->setAttribute("mrp", $mrp);
 		}
diff -r 63e3c25b6e2c -r 776ca456c221 sf-platform/build.xml
--- a/sf-platform/build.xml	Thu Sep 02 09:22:38 2010 +0100
+++ b/sf-platform/build.xml	Thu Sep 02 12:17:04 2010 +0100
@@ -129,8 +129,8 @@
         <replaceregex pattern="mrp=&quot;app" replace="mrp=&quot;/sf/app" flags="gi"/>
         <replaceregex pattern="bldFile=&quot;tools" replace="bldFile=&quot;/sf/tools" flags="gi"/>
         <replaceregex pattern="mrp=&quot;tools" replace="mrp=&quot;/sf/tools" flags="gi"/>
-        <replaceregex pattern="bldFile=&quot;adaptation" replace="bldFile=&quot;/sf/adaptation" flags="gi"/>
-        <replaceregex pattern="mrp=&quot;adaptation" replace="mrp=&quot;/sf/adaptation" flags="gi"/>
+        <replaceregex pattern="bldFile=&quot;adapt" replace="bldFile=&quot;/sf/adapt" flags="gi"/>
+        <replaceregex pattern="mrp=&quot;adapt" replace="mrp=&quot;/sf/adapt" flags="gi"/>
         <expandproperties/>
       </filterchain>
     </copy>