You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ni...@apache.org on 2002/12/26 19:42:52 UTC
cvs commit: xml-cocoon2 build.xml changes.xml
nicolaken 2002/12/26 10:42:52
Modified: . build.xml changes.xml
Log:
<action dev="NKB" type="update">
Moved all classes marked @deprecated to the src/deprecated directory.
Since Many classes are still a dependency for the core, while this is fixed
the build process still copies them with the core during compilation.
To compile with the deprecation separation, do "build -Ddeprecate=true".
</action>
Revision Changes Path
1.297 +16 -10 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -r1.296 -r1.297
--- build.xml 24 Dec 2002 05:55:10 -0000 1.296
+++ build.xml 26 Dec 2002 18:42:52 -0000 1.297
@@ -849,16 +849,10 @@
<!-- =================================================================== -->
<!-- Prepares the source code -->
<!-- =================================================================== -->
- <target name="prepare-src-main" depends="prepare,generate-java-code">
+ <target name="prepare-src-main" depends="prepare, generate-java-code, -copy-deprecated-stuff2core">
<mkdir dir="${build.src}"/>
<mkdir dir="${build.dest}"/>
<copy todir="${build.src}" filtering="on">
-
-<!-- INCLUDE DEPRECATED CLASSES TILL DEPENDENCIES ON THEM ARE FIXED -->
- <fileset dir="${deprecated.src}">
- <include name="**/*.java"/>
- </fileset>
-
<fileset dir="${java.dir}">
@@ -892,10 +886,10 @@
<exclude name="**/HTMLGenerator.java" unless="tidy.present"/>
<exclude name="**/tidy.*" unless="tidy.present"/>
-->
-
+<!-- moved to block
<exclude name="**/VelocityGenerator.java" unless="velocity.present"/>
<exclude name="**/velocity.*" unless="velocity.present"/>
-
+-->
<!-- moved to block
<exclude name="**/SVG*.java" unless="svg.present"/>
<exclude name="**/svg.*" unless="svg.present"/>
@@ -1018,9 +1012,21 @@
<include name="**/*.java"/>
</fileset>
</copy>
+
+ </target>
+
+
+ <!-- INCLUDE DEPRECATED CLASSES TILL DEPENDENCIES ON THEM ARE FIXED -->
+ <target name="-copy-deprecated-stuff2core" depends="init" unless="deprecate">
+
+ <copy todir="${build.src}" filtering="on">
+ <fileset dir="${deprecated.src}">
+ <include name="**/*.java"/>
+ </fileset>
+ </copy>
</target>
-
+
<!-- =================================================================== -->
<!-- Set a variable if the generated java code is already up-to-date. -->
<!-- =================================================================== -->
1.324 +7 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- changes.xml 26 Dec 2002 14:23:28 -0000 1.323
+++ changes.xml 26 Dec 2002 18:42:52 -0000 1.324
@@ -41,6 +41,12 @@
<release version="@version@" date="@date@">
<action dev="NKB" type="update">
+ Moved all classes marked @deprecated to the src/deprecated directory.
+ Since Many classes are still a dependency for the core, while this is fixed
+ the build process still copies them with the core during compilation.
+ To compile with the deprecation separation, do "build -Ddeprecate=true".
+ </action>
+ <action dev="NKB" type="update">
Moved code to new blocks: profiler, velocity.
</action>
<action dev="BH" type="update">
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org