stefano 2003/03/14 12:46:59
Modified: . build.xml
Log:
fixed the gump build by making it depend on 'compile' and not 'package' that depends
on 'blocks' and therefore is against the principle of the separation of the various
gump runs for each block
removed the initial warning as the new build system is solid
removed dependency on deprecation classes (yes!!! good job everyone!!1)
Revision Changes Path
1.9 +6 -16 cocoon-2.1/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 13 Mar 2003 13:24:28 -0000 1.8
+++ build.xml 14 Mar 2003 20:46:59 -0000 1.9
@@ -14,12 +14,6 @@
<target name="init">
- <echo>----------------------------- WARNING!!!
-------------------------------</echo>
- <echo>The build system is undergoing major redesign. Parts of the system
might</echo>
- <echo>not work as expected. We apologize for the inconvenience but we are
</echo>
- <echo>working to make things easier for you. Thank you for your patience.
</echo>
-
<echo>------------------------------------------------------------------------</echo>
-
<!-- Set the timestamps -->
<tstamp/>
@@ -218,20 +212,16 @@
classpathref="classpath"/>
<!-- compile core source files -->
- <javac destdir="${build.dest}"
+ <javac srcdir="${java}"
+ destdir="${build.dest}"
debug="${compiler.debug}"
optimize="${compiler.optimize}"
deprecation="${compiler.deprecation}"
target="${target.vm}"
nowarn="${compiler.nowarn}"
compiler="${compiler}"
- classpathref="classpath">
- <src>
- <!-- [FIXME] THE DEPENDENCY ON DEPRECATED SHOULD GO AWAY!!!! -->
- <path location="${deprecated.src}"/>
- <path location="${java}"/>
- </src>
- </javac>
+ classpathref="classpath"/>
+
</target>
<!-- compiles the scratchpad -->
@@ -1059,7 +1049,7 @@
<!-- Gump targets ========================================================== -->
<!-- Builds Core -->
- <target name="gump-core" depends="package"/>
+ <target name="gump-core" depends="compile"/>
<!-- Builds Blocks -->
<target name="gump-blocks" depends="blocks"/>
