Update of /cvsroot/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv12979
Modified Files:
.classpath .cvsignore build.xml
Log Message:
No need to use two different compile directories in the ant and eclipse, so now it uses build in all modules. That ment making a xml directory for the jaxb generated persistence files when compiling and copying them to build before compiling the rest of the document, and including the xml directory in the eclipse .classpath
Index: .cvsignore
===================================================================
RCS file: /cvsroot/bprocessor/model/.cvsignore,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** .cvsignore 27 Jun 2005 09:31:13 -0000 1.1.1.1
--- .cvsignore 10 Aug 2006 15:37:27 -0000 1.2
***************
*** 4,5 ****
--- 4,6 ----
*.zip
*.tar.bz2
+ xml
Index: .classpath
===================================================================
RCS file: /cvsroot/bprocessor/model/.classpath,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .classpath 12 Jul 2006 12:07:37 -0000 1.9
--- .classpath 10 Aug 2006 15:37:27 -0000 1.10
***************
*** 5,11 ****
<classpathentry exported="true" kind="lib" path="/tools/log4j/log4j.jar"/>
<classpathentry exported="true" kind="lib" path="/tools/jaxb/jaxb.jar"/>
- <classpathentry kind="lib" path="build"/>
<classpathentry exported="true" kind="lib" path="/tools/antlr/antlr.jar"/>
<classpathentry kind="lib" path="/tools/junit/junit.jar"/>
! <classpathentry kind="output" path="bin"/>
</classpath>
--- 5,11 ----
<classpathentry exported="true" kind="lib" path="/tools/log4j/log4j.jar"/>
<classpathentry exported="true" kind="lib" path="/tools/jaxb/jaxb.jar"/>
<classpathentry exported="true" kind="lib" path="/tools/antlr/antlr.jar"/>
<classpathentry kind="lib" path="/tools/junit/junit.jar"/>
! <classpathentry exported="true" kind="lib" path="xml"/>
! <classpathentry kind="output" path="build"/>
</classpath>
Index: build.xml
===================================================================
RCS file: /cvsroot/bprocessor/model/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** build.xml 12 Jul 2006 12:19:49 -0000 1.14
--- build.xml 10 Aug 2006 15:37:27 -0000 1.15
***************
*** 7,11 ****
<property name="kernel.dir" value="${basedir}/../kernel"/>
! <property name="build.dir" value="${basedir}/build"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="conf.dir" value="${src.dir}/etc"/>
--- 7,12 ----
<property name="kernel.dir" value="${basedir}/../kernel"/>
! <property name="build.dir" value="${basedir}/build"/>
! <property name="xml.dir" value="${basedir}/xml"/>
<property name="src.dir" value="${basedir}/src"/>
<property name="conf.dir" value="${src.dir}/etc"/>
***************
*** 23,26 ****
--- 24,28 ----
<target name="clean" depends="init">
<delete dir="${build.dir}"/>
+ <delete dir="${xml.dir}"/>
<delete dir="${dist.dir}"/>
<delete dir="${doc.api.dir}"/>
***************
*** 77,87 ****
<target name="compile-grammar" depends="init">
! <mkdir dir="${build.dir}/net/sourceforge/bprocessor/model/parser"/>
<antlr target="${conf.dir}/expression.g"
! outputdirectory="${build.dir}/net/sourceforge/bprocessor/model/parser">
<classpath>
<pathelement location="${lib.dir}/antlr.jar"/>
</classpath>
! </antlr>
</target>
--- 79,89 ----
<target name="compile-grammar" depends="init">
! <mkdir dir="${xml.dir}/net/sourceforge/bprocessor/model/parser"/>
<antlr target="${conf.dir}/expression.g"
! outputdirectory="${xml.dir}/net/sourceforge/bprocessor/model/parser">
<classpath>
<pathelement location="${lib.dir}/antlr.jar"/>
</classpath>
! </antlr>
</target>
***************
*** 95,103 ****
</taskdef>
<xjc schema="${conf.dir}/bprocessor.xsd"
! target="${build.dir}"
package="net.sourceforge.bprocessor.model.xml">
<arg value="-nv"/>
</xjc>
! <javac srcdir="${build.dir}" destdir="${build.dir}" deprecation="yes"
debug="yes" target="1.2" source="1.3"
includes="net/**">
--- 97,105 ----
</taskdef>
<xjc schema="${conf.dir}/bprocessor.xsd"
! target="${xml.dir}"
package="net.sourceforge.bprocessor.model.xml">
<arg value="-nv"/>
</xjc>
! <javac srcdir="${xml.dir}" destdir="${xml.dir}" deprecation="yes"
debug="yes" target="1.2" source="1.3"
includes="net/**">
***************
*** 108,115 ****
</javac>
<delete>
! <fileset dir="${build.dir}">
<include name="**/*.java"/>
</fileset>
</delete>
</target>
--- 110,120 ----
</javac>
<delete>
! <fileset dir="${xml.dir}">
<include name="**/*.java"/>
</fileset>
</delete>
+ <copy todir="${build.dir}">
+ <fileset dir="${xml.dir}"/>
+ </copy>
</target>
***************
*** 132,136 ****
</target>
! <target name="fastcompile" depends="prepare,copylib,compile-xml">
<ant dir="src" target="compile"/>
</target>
--- 137,141 ----
</target>
! <target name="fastcompile" depends="prepare,copylib,compile-grammar,compile-xml">
<ant dir="src" target="compile"/>
</target>
|
