|
From: Michael R. <mr...@us...> - 2004-08-09 10:04:44
|
Update of /cvsroot/openorb/OpenORB/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31428/src Modified Files: build.xml Log Message: Include the XML document in the test jar Index: build.xml =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v retrieving revision 1.182 retrieving revision 1.183 diff -u -d -r1.182 -r1.183 --- build.xml 29 Jul 2004 08:01:03 -0000 1.182 +++ build.xml 9 Aug 2004 10:04:36 -0000 1.183 @@ -991,8 +991,8 @@ <!-- examples requiring POA --> <echo message="Building POA examples"/> <idl2java cachefile="${build.dir}/idl2java.cache" - includepath="${idl.dir}" - destdir="${gensrc.dir}/examples" + includepath="${idl.dir}" + destdir="${gensrc.dir}/examples" srcdir="${examples.dir}" includeorbidl="false"> <include name="org/openorb/orb/examples/dsi/poa/Sample.idl" /> @@ -1029,7 +1029,7 @@ </java2idl> <!-- - <idl2java cachefile="${build.dir}/idl2java.cache" + <idl2java cachefile="${build.dir}/idl2java.cache" includepath="${idl.dir}" destdir="${gensrc.dir}/examples" srcdir="${gensrc.dir}/examples" includeorbidl="false"> <include name="org/openorb/orb/examples/rmi/hello/RemoteHello.idl" /> @@ -1139,6 +1139,9 @@ </target> <target name="create-test-jar"> + <copy todir="${build.dir}/test"> + <fileset dir="${test.dir}" includes="**/*.xml" /> + </copy> <delete file="${lib.dir}/${test-jar}" /> <antcall target="create-test-manifest-file" /> <jar jarfile="${lib.dir}/${test-jar}" manifest="${build.dir}/test-manifest.mf" basedir="${build.dir}/test" /> @@ -1152,7 +1155,7 @@ <delete file="${build.dir}/examples-manifest.mf" /> </target> - <target name="create-separate-main-jars" + <target name="create-separate-main-jars" description="Creates the main jar as two separate jars containing classes and config" > <delete failonerror="false" file="${lib.dir}/${main-classes-jar}" /> <delete failonerror="false" file="${lib.dir}/${main-config-jar}" /> @@ -1252,7 +1255,7 @@ <replace file="${dist.doc.dir}/rmi.xml" token="@docbook-dtd@" value="${tools.dir}/docbook/xml/docbookx.dtd"/> <replace file="${dist.doc.dir}/rmi.xml" token="@intro@" value="${tools.dir}/src/doc/intro.xml"/> <!-- looks better but there are still xml parser classpath issues with jdk1.4 - <xslt in="${dist.doc.dir}/${NAME_SHORT}.xml" + <xslt in="${dist.doc.dir}/${NAME_SHORT}.xml" out="${dist.doc.dir}/${NAME_SHORT}.html" style="${tools.dir}/docbook/tcoo_html.xsl" classpathref="build.class.path"/>--> |