velocity-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r527210 - in /velocity/texen/trunk/build: build.properties build.xml download.xml
Date Tue, 10 Apr 2007 17:22:51 GMT
Author: henning
Date: Tue Apr 10 10:22:50 2007
New Revision: 527210

URL: http://svn.apache.org/viewvc?view=rev&rev=527210
Log:
remove unneeded downloads, separate out downloads only needed for
Anakia transforming the docs so that they do not end up in the
distribution archive.


Modified:
    velocity/texen/trunk/build/build.properties
    velocity/texen/trunk/build/build.xml
    velocity/texen/trunk/build/download.xml

Modified: velocity/texen/trunk/build/build.properties
URL: http://svn.apache.org/viewvc/velocity/texen/trunk/build/build.properties?view=diff&rev=527210&r1=527209&r2=527210
==============================================================================
--- velocity/texen/trunk/build/build.properties (original)
+++ velocity/texen/trunk/build/build.properties Tue Apr 10 10:22:50 2007
@@ -45,6 +45,7 @@
 build.javadoc=   ${build.dir}/apidocs
 build.test=      ${build.dir}/test
 build.docs=      ${build.dir}/docs
+build.docs.lib=  ${build.dir}/docs-lib
 
 # Various local pathes in the distribution
 src.java.dir=  ${app.dir}/src/java
@@ -105,12 +106,9 @@
 #
 # Jars to be downloaded
 jar.antlr.version= 2.7.5
-jar.avalon-logkit.version= 2.1
 jar.commons-collections.version= 3.1
 jar.commons-lang.version= 2.1
 jar.jdom.version= 1.0
-jar.log4j.version= 1.2.12
-jar.werken-xpath.version= 0.9.4
 jar.junit.version= 3.8.1
 jar.velocity.version= 1.5
-
+jar.werken-xpath.version= 0.9.4

Modified: velocity/texen/trunk/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/texen/trunk/build/build.xml?view=diff&rev=527210&r1=527209&r2=527210
==============================================================================
--- velocity/texen/trunk/build/build.xml (original)
+++ velocity/texen/trunk/build/build.xml Tue Apr 10 10:22:50 2007
@@ -117,6 +117,14 @@
         <pathelement location="${build.test.dest}" />
     </path>
 
+    <!-- Docs classpath, needed for building the docs with anakia -->
+    <path id="docs.classpath">
+      <path refid="build.classpath"/>
+      <fileset dir="${build.docs.lib}">
+        <include name="**/*.jar"/>
+      </fileset>
+    </path>
+
     <path id="run.classpath">
       <path refid="build.classpath"/>
       <pathelement location="${build.dir}/${final.name}.jar"/>
@@ -443,7 +451,7 @@
 
     <taskdef name="anakia"
              classname="org.apache.velocity.anakia.AnakiaTask"
-             classpathref="run.classpath"/>
+             classpathref="docs.classpath"/>
 
     <echo>
   #######################################################

Modified: velocity/texen/trunk/build/download.xml
URL: http://svn.apache.org/viewvc/velocity/texen/trunk/build/download.xml?view=diff&rev=527210&r1=527209&r2=527210
==============================================================================
--- velocity/texen/trunk/build/download.xml (original)
+++ velocity/texen/trunk/build/download.xml Tue Apr 10 10:22:50 2007
@@ -30,17 +30,17 @@
 <project name="${name}" basedir="..">
   <target name="build-download" description="Download all the project dependencies from
the central repository">
    <mkdir dir="${build.lib}" />
-   <antcall target="antlr-download" />
-   <antcall target="avalon-logkit-download" />
    <antcall target="commons-collections-download" />
    <antcall target="commons-lang-download" />
-   <antcall target="jdom-download" />
-   <antcall target="log4j-download" />
-   <antcall target="werken-xpath-download" />
    <antcall target="velocity-download" />
 
    <mkdir dir="${build.test.lib}" />
    <antcall target="junit-download" />
+
+   <mkdir dir="${build.docs.lib}" />
+   <antcall target="antlr-download" />
+   <antcall target="jdom-download" />
+   <antcall target="werken-xpath-download" />
   </target>
 
   <target name="http-download">
@@ -87,16 +87,26 @@
          ignoreerrors="false" />
   </target>
 
-  <target name="antlr-download">
-   <property name="download.jarname" value="antlr" />
-   <property name="download.jarversion" value="${jar.antlr.version}" />
-   <antcall target="http-download"/>
+  <target name="http-docs-download">
+    <condition property="skip-download">
+      <or>
+        <istrue value="${skip.jar.loading}"/>
+        <and>
+          <isfalse value="${force.jar.loading}"/>
+          <available file="${build.docs.lib}/${download.jarname}-${download.jarversion}.jar"/>
+        </and>
+      </or>
+    </condition>
+    <antcall target="do-http-docs-download"/>
   </target>
 
-  <target name="avalon-logkit-download">
-   <property name="download.jarname" value="avalon-logkit" />
-   <property name="download.jarversion" value="${jar.avalon-logkit.version}" />
-   <antcall target="http-download"/>
+  <target name="do-http-docs-download" unless="skip-download">
+    <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"/>
+    <get src="${repo.url}/${download.jarname}/jars/${download.jarname}-${download.jarversion}.jar"
+         dest="${build.docs.lib}/${download.jarname}-${download.jarversion}.jar"
+         usetimestamp="true"
+         verbose="false"
+         ignoreerrors="false" />
   </target>
 
   <target name="commons-collections-download">
@@ -111,28 +121,30 @@
    <antcall target="http-download"/>
   </target>
 
-  <target name="jdom-download">
-   <property name="download.jarname" value="jdom" />
-   <property name="download.jarversion" value="${jar.jdom.version}" />
+  <target name="velocity-download">
+   <property name="download.jarname" value="velocity" />
+   <property name="download.jarversion" value="${jar.velocity.version}" />
    <antcall target="http-download"/>
   </target>
 
-  <target name="log4j-download">
-   <property name="download.jarname" value="log4j" />
-   <property name="download.jarversion" value="${jar.log4j.version}" />
-   <antcall target="http-download"/>
+<!-- Doc building Dependencies -->
+
+  <target name="antlr-download">
+   <property name="download.jarname" value="antlr" />
+   <property name="download.jarversion" value="${jar.antlr.version}" />
+   <antcall target="http-docs-download"/>
+  </target>
+
+  <target name="jdom-download">
+   <property name="download.jarname" value="jdom" />
+   <property name="download.jarversion" value="${jar.jdom.version}" />
+   <antcall target="http-docs-download"/>
   </target>
 
   <target name="werken-xpath-download">
    <property name="download.jarname" value="werken-xpath" />
    <property name="download.jarversion" value="${jar.werken-xpath.version}" />
-   <antcall target="http-download"/>
-  </target>
-
-  <target name="velocity-download">
-   <property name="download.jarname" value="velocity" />
-   <property name="download.jarversion" value="${jar.velocity.version}" />
-   <antcall target="http-download"/>
+   <antcall target="http-docs-download"/>
   </target>
 
 <!-- Test Dependencies -->



Mime
View raw message