# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1283763444 -3600
# Node ID 0e65f93be3cb5a40714c9ca97f69ad3e64a7bbf3
# Parent  024a31e39848aa6fe3ae82018d832f85c3bf357f
Joinsysdef schema calculation handles missing files. rootsystef generation does not modify embedded metatdata.

diff -r 024a31e39848 -r 0e65f93be3cb metatools/sysdeftools/group/contents.xml
--- a/metatools/sysdeftools/group/contents.xml	Fri Aug 27 14:50:55 2010 +0100
+++ b/metatools/sysdeftools/group/contents.xml	Mon Sep 06 09:57:24 2010 +0100
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ProductsDefinition schema="3.0.0">
 	<product name="BuildEnvironment" long-name="Build Environment">
-		<tool name="sysdeftools" long-name="System Definition Tools" default-src="metatools/sysdeftools" default-dst="/" version="1.0.1">
+		<tool name="sysdeftools" long-name="System Definition Tools" default-src="metatools/sysdeftools" default-dst="/" version="1.0.2">
 
 			<!-- core functionality -->
 			<file filename="*.pl"/> 
diff -r 024a31e39848 -r 0e65f93be3cb metatools/sysdeftools/lib/joinsysdef-module.xsl
--- a/metatools/sysdeftools/lib/joinsysdef-module.xsl	Fri Aug 27 14:50:55 2010 +0100
+++ b/metatools/sysdeftools/lib/joinsysdef-module.xsl	Mon Sep 06 09:57:24 2010 +0100
@@ -215,7 +215,8 @@
 
 <xsl:template name="compare-versions"><xsl:param name="v1"/><xsl:param name="v2"/>
 			<xsl:choose>
-				<xsl:when test="$v1=$v2"><xsl:value-of select="$v1"/></xsl:when>
+				<xsl:when test="$v1=''"><xsl:value-of select="$v2"/></xsl:when>
+				<xsl:when test="$v1=$v2 or $v2=''"><xsl:value-of select="$v1"/></xsl:when>
 				<xsl:when test="substring-before($v1,'.') &gt; substring-before($v2,'.')"><xsl:value-of select="$v1"/></xsl:when>
 				<xsl:when test="substring-before($v1,'.') &lt; substring-before($v2,'.')"><xsl:value-of select="$v2"/></xsl:when>
 				<xsl:when test="substring-before(substring-after($v1,'.'),'.') &gt; substring-before(substring-after($v2,'.'),'.')"><xsl:value-of select="$v1"/></xsl:when>
diff -r 024a31e39848 -r 0e65f93be3cb metatools/sysdeftools/rootsysdef.pl
--- a/metatools/sysdeftools/rootsysdef.pl	Fri Aug 27 14:50:55 2010 +0100
+++ b/metatools/sysdeftools/rootsysdef.pl	Mon Sep 06 09:57:24 2010 +0100
@@ -414,7 +414,7 @@
 				}
 			}
 		}
-	elsif($tag eq 'meta')
+	elsif($tag eq 'meta' && $node->getAttribute('href'))
 		{
 		&fixHref($node,$file);
 		foreach my $child (@{$node->getChildNodes}) {$node->removeChild($child)} # can't have children