Author: jeremias
Date: Wed Jan 30 12:59:31 2008
New Revision: 616900
URL: http://svn.apache.org/viewvc?rev=616900&view=rev
Log:
Generate event model XMLs in to the build directory: build/gensrc and
build/test-gensrc (the latter is new and needs to be setup as source folder in
your IDE!)
Removed:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/java/org/apache/fop/events/event-model.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/events/test-event-model.xml
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml?rev=616900&r1=616899&r2=616900&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/build.xml Wed Jan 30
12:59:31 2008
@@ -448,16 +448,11 @@
</classpath>
</taskdef>
- <eventResourceGenerator
modelfile="${src.java.dir}/org/apache/fop/events/event-model.xml">
+ <eventResourceGenerator
modelfile="${build.gensrc.dir}/org/apache/fop/events/event-model.xml">
<fileset dir="${src.java.dir}">
<include name="**/*.java"/>
</fileset>
</eventResourceGenerator>
- <eventResourceGenerator
modelfile="${basedir}/test/java/org/apache/fop/events/test-event-model.xml">
- <fileset dir="${basedir}/test/java">
- <include name="**/*.java"/>
- </fileset>
- </eventResourceGenerator>
</target>
<target name="compile-copy-resources" depends="resourcegen">
@@ -468,6 +463,9 @@
<include name="**/*.xml"/>
<include name="**/*.LICENSE.txt"/>
</fileset>
+ <fileset dir="${build.gensrc.dir}">
+ <include name="**/*.xml"/>
+ </fileset>
</copy>
<mkdir dir="${build.viewer.resources.dir}"/>
<copy todir="${build.viewer.resources.dir}">
@@ -772,6 +770,7 @@
</target>
<target name="junit-compile" depends="package, transcoder-pkg,
junit-with-xmlunit, junit-without-xmlunit" description="Runs FOP's JUnit tests"
if="junit.present">
<mkdir dir="${build.dir}/test-classes"/>
+ <mkdir dir="${build.dir}/test-gensrc"/>
<mkdir dir="${junit.reports.dir}"/>
<javac destdir="${build.dir}/test-classes" fork="${javac.fork}"
debug="${javac.debug}" deprecation="${javac.deprecation}"
@@ -786,8 +785,16 @@
</fileset>
</classpath>
</javac>
+ <eventResourceGenerator
modelfile="${build.dir}/test-gensrc/org/apache/fop/events/test-event-model.xml">
+ <fileset dir="${basedir}/test/java">
+ <include name="**/*.java"/>
+ </fileset>
+ </eventResourceGenerator>
<copy todir="${build.dir}/test-classes">
<fileset dir="${basedir}/test/java">
+ <include name="**/*.xml"/>
+ </fileset>
+ <fileset dir="${build.dir}/test-gensrc">
<include name="**/*.xml"/>
</fileset>
</copy>
Modified:
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java?rev=616900&r1=616899&r2=616900&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
(original)
+++
xmlgraphics/fop/branches/Temp_ProcessingFeedback/src/codegen/java/org/apache/fop/tools/EventProducerCollectorTask.java
Wed Jan 30 12:59:31 2008
@@ -41,6 +41,7 @@
try {
EventProducerCollector collector = new EventProducerCollector();
processFileSets(collector);
+ getModelFile().getParentFile().mkdirs();
collector.saveModelToXML(getModelFile());
log("Event model written to " + getModelFile());
} catch (ClassNotFoundException e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
