Revision: 5768 http://jnode.svn.sourceforge.net/jnode/?rev=5768&view=rev Author: lsantha Date: 2011-01-03 20:59:09 +0000 (Mon, 03 Jan 2011)
Log Message: ----------- Fixed oj-compare target. Modified Paths: -------------- classlib6/all/build.xml classlib6/builder/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2011-01-03 20:57:35 UTC (rev 5767) +++ classlib6/all/build.xml 2011-01-03 20:59:09 UTC (rev 5768) @@ -344,6 +344,7 @@ <!-- Assemble all plugins --> <target name="assemble-plugins" depends="assemble-projects,openjdk-annotate"> <!-- Now assemble all plugins --> + <!-- <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/> <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}"> <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/> @@ -397,11 +398,13 @@ <exclude name="*plugin-list.xml"/> </descriptors> </plugin> + --> </target> <!-- Assemble all default initjars --> <target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars"> <!-- Build all default initjar's --> + <!-- <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> <initjars destdir="${initjars.dir}" pluginDir="${plugins.dir}" @@ -413,11 +416,13 @@ <include name="*plugin-list.xml"/> </fileset> </initjars> + --> </target> <!-- Assemble all custom initjars --> <target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir"> <!-- Build all custom initjar's --> + <!-- <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/> <initjars destdir="${initjars.dir}" pluginDir="${plugins.dir}" @@ -426,6 +431,7 @@ <include name="*plugin-list.xml"/> </fileset> </initjars> + --> </target> <!-- Assemble all subprojects, plugins and initjars --> @@ -766,9 +772,11 @@ </fileset> </vmsources> <vmspecificsources> + <!-- <fileset dir="${root.dir}/core/src/openjdk/vm"> <patternset refid="cp-includes-pattern"/> </fileset> + --> </vmspecificsources> <classpathsources> <fileset dir="${root.dir}/../openjdk/jdk/src/share/classes/"> @@ -779,11 +787,11 @@ <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> - <fileset dir="${root.dir}/../openjdk/jaxp/src/share/classes/"> + <fileset dir="${root.dir}/../openjdk/jaxp/src/"> <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> - <fileset dir="${root.dir}/../openjdk/jaxws/src/share/classes/"> + <fileset dir="${root.dir}/../openjdk/jaxws/src/"> <patternset refid="cp-includes-pattern"/> <patternset refid="cp-sources-pattern"/> </fileset> Modified: classlib6/builder/build.xml =================================================================== --- classlib6/builder/build.xml 2011-01-03 20:57:35 UTC (rev 5767) +++ classlib6/builder/build.xml 2011-01-03 20:59:09 UTC (rev 5768) @@ -55,7 +55,7 @@ <target name="compile" depends="prepare"> <jnode.compile> <src path="${my-src.dir}/builder"/> - <src path="${my-gen.dir}"/> + <!--src path="${my-gen.dir}"/--> <classpath refid="my-cp"/> </jnode.compile> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Jnode-svn-commits mailing list Jnode-svn-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jnode-svn-commits