svn commit: r158460 - in lenya/trunk/src/targets: docs-build.xml properties-build.xml

Author: jwkaltz
Date: Mon Mar 21 07:22:16 2005
New Revision: 158460

URL: http://svn.apache.org/viewcvs?view=rev&rev=158460
Log:
fixed javadocs target (src no longer in build; declare resource variable
after the variable it depends on)

Modified:
    lenya/trunk/src/targets/docs-build.xml
    lenya/trunk/src/targets/properties-build.xml

Modified: lenya/trunk/src/targets/docs-build.xml
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/targets/docs-build.xml?view=diff&r1=158459&r2=158460
==============================================================================
--- lenya/trunk/src/targets/docs-build.xml (original)
+++ lenya/trunk/src/targets/docs-build.xml Mon Mar 21 07:22:16 2005
@@ -26,7 +26,7 @@
   <!-- Set a variable if javadoc is already up-to-date -->
   <target name="javadocs_check">
     <uptodate property="javadocs.notrequired" 
targetfile="${dist.bin.javadocs}/packages.html" >
-      <srcfiles dir="${build.src}" includes="**/*.java"/>
+      <srcfiles dir="${src.java.dir}" includes="**/*.java"/>
     </uptodate>
   </target>
 
@@ -35,7 +35,7 @@
     <echo 
message="-------------------------------------------------------------"/>
     <echo message="  Not rebuilding Javadocs, as they are up-to-date:"/>
     <echo message="  ${dist.bin.javadocs}/packages.html is more recent than"/>
-    <echo message="  ${build.src}/**/*.java"/>
+    <echo message="  ${src.java.dir}/**/*.java"/>
     <echo 
message="-------------------------------------------------------------"/>
   </target>
 
@@ -43,7 +43,7 @@
   <target name="javadocs" depends="prepare-src, javadocs_check, javadocs_done" 
unless="javadocs.notrequired" description="Generates the API documentation">
     <mkdir dir="${dist.bin.javadocs}"/>
     <javadoc packagenames="${packages}"
-             sourcepath="${build.src}"
+             sourcepath="${src.java.dir}"
              destdir="${dist.bin.javadocs}"
              author="true"
              version="true"

Modified: lenya/trunk/src/targets/properties-build.xml
URL: 
http://svn.apache.org/viewcvs/lenya/trunk/src/targets/properties-build.xml?view=diff&r1=158459&r2=158460
==============================================================================
--- lenya/trunk/src/targets/properties-build.xml (original)
+++ lenya/trunk/src/targets/properties-build.xml Mon Mar 21 07:22:16 2005
@@ -51,7 +51,6 @@
   <property name="target.vm"      value="1.4"/>
 
   <property name="packages"      value="*.*"/>
-  <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
 
   <property name="today"         value="${TODAY}"/>
 
@@ -104,6 +103,7 @@
   -->
   <property name="src.webapp.dir" value="src/webapp"/>
   <property name="tools.tasks.dest" value="tools/anttasks"/>
+  <property name="resource.dir"  value="${src.webapp.dir}/resources/css"/>
   <!-- cocoon build properties directory -->
   <property name="src.cocoon.properties.dir" value="src/cocoon"/>
   <!-- hsqldb database config files directory -->
@@ -115,6 +115,7 @@
   <taskdef name="copyPubs"        classpath="${tools.tasks.dest}" 
classname="org.apache.lenya.cms.ant.CopyTask"/>
   <taskdef name="xpatch"          classpath="${tools.tasks.dest}" 
classname="XConfToolTask"/>
 
+
   <!-- Set up classpath -->
   <path id="classpath">
     <fileset dir="${lib.dir}">