r29 - tools/devel/trunk/xsl

[Dennis Gregorovic <dgregoro@xxxxxxxxxxxxxxxxxxxxxxxxx>]

Author: dgregoro
Date: 2004-09-23 23:19:22 +0200 (Thu, 23 Sep 2004)
New Revision: 29

Modified:
   tools/devel/trunk/xsl/build-template.xsl
Log:
add external dependencies to *.run.classpath paths.  also, create named paths 
to keep build.xml shorter

Modified: tools/devel/trunk/xsl/build-template.xsl
===================================================================
--- tools/devel/trunk/xsl/build-template.xsl    2004-09-23 17:35:53 UTC (rev 
28)
+++ tools/devel/trunk/xsl/build-template.xsl    2004-09-23 21:19:22 UTC (rev 
29)
@@ -12,6 +12,7 @@
     indent="yes"
     xalan:indent-amount="4"/>
 
+  <xsl:key name="key-alldependency" match="ccm:dependencies//@name" use="."/>
   <xsl:key name="key-rundependency" 
match="ccm:dependencies/ccm:requires/@name |
                                            
ccm:dependencies/ccm:runRequires/@name" use="."/>
   <xsl:key name="key-builddependency" 
match="ccm:dependencies/ccm:requires/@name |
@@ -180,6 +181,27 @@
   </xsl:template>
 
   <xsl:template name="AppProperties">
+    <xsl:variable name="dependencies" 
select="/ccm:project/ccm:appxmls/ccm:application/ccm:dependencies/*"/>
+    <xsl:for-each 
select="$dependencies/@name[generate-id()=generate-id(key('key-alldependency',.))]">
+      <xsl:variable name="req_name" select="."/>
+      <xsl:if 
test="not(/ccm:project/ccm:appxmls/ccm:application[@name=$req_name])">
+        <xsl:variable name="req_version" 
select="$dependencies[@name=$req_name]/@version"/>
+        <path id="external.{$req_name}.classpath">
+          <fileset dir="${{ccm.config.lib.dir}}">
+            <xsl:choose>
+              <xsl:when test="$req_version">
+                <include name="{$req_name}-{$req_version}.jar"/>
+                <include name="{$req_name}-{$req_version}/**.jar"/>
+              </xsl:when>
+              <xsl:otherwise>
+                <include name="{$req_name}.jar"/>
+                <include name="{$req_name}/**.jar"/>
+              </xsl:otherwise>
+            </xsl:choose>
+          </fileset>
+        </path>
+      </xsl:if>
+    </xsl:for-each>
     <xsl:for-each select="/ccm:project/ccm:build/ccm:application">
       <xsl:variable name="name" select="@name"/>
       <xsl:variable name="app" 
select="/ccm:project/ccm:appxmls[@name=$name]/ccm:application"/>
@@ -345,6 +367,12 @@
             <pathelement path="./{$target}/build/classes/"/>
             <pathelement path="./{$target}/build/sql/"/>
             <pathelement path="./{$target}/pdl"/>
+            <xsl:for-each select="$requires">
+              <xsl:variable name="req_name" select="@name"/>
+              <xsl:if 
test="count(/ccm:project/ccm:appxmls/ccm:application[@name = $req_name]) = 0">
+                <path refid="external.{$req_name}.classpath"/>
+              </xsl:if>
+            </xsl:for-each>
           </xsl:when>
           <xsl:when test="$type = 'build'">
             <fileset dir="./{$target}">
@@ -353,22 +381,8 @@
             </fileset>
             <xsl:for-each select="$requires">
               <xsl:variable name="req_name" select="@name"/>
-              <xsl:variable name="req_version" select="@version"/>
               <xsl:if 
test="count(/ccm:project/ccm:appxmls/ccm:application[@name = $req_name]) = 0">
-                <xsl:choose>
-                  <xsl:when test="$req_version">
-                    <fileset dir="${{ccm.config.lib.dir}}">
-                      <include name="{$req_name}-{$req_version}.jar"/>
-                      <include name="{$req_name}-{$req_version}/**.jar"/>
-                    </fileset>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <fileset dir="${{ccm.config.lib.dir}}">
-                      <include name="{$req_name}.jar"/>
-                      <include name="{$req_name}/**.jar"/>
-                    </fileset>
-                  </xsl:otherwise>
-                </xsl:choose>
+                <path refid="external.{$req_name}.classpath"/>
               </xsl:if>
             </xsl:for-each>
             <path refid="{$target}.run.classpath.internal"/>