[Htmlparser-cvs] htmlparser build.xml,1.75,1.76
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser build.xml,1.75,1.76
|
From: Derrick O. <der...@us...> - 2005-03-12 20:27:56
|
Update of /cvsroot/htmlparser/htmlparser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1521 Modified Files: build.xml Log Message: Bug #1018884 'compile' ant task from build.xml messes up ./src directory Added optional "classes" property to build.xml. This directory is where class files are put. It defaults to src. To use: build -Dclasses=classdir <target> where classdir is a peer directory to src. Removed unused commons-logging.jar while I was in there. Index: build.xml =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** build.xml 13 Feb 2005 22:45:45 -0000 1.75 --- build.xml 12 Mar 2005 20:27:45 -0000 1.76 *************** *** 113,116 **** --- 113,117 ---- <property name="versionQualifier" value="${versionMajor}_${versionMinor}"/> <property name="src" value="src"/> + <property name="classes" value="${src}"/> <property name="docs" value="docs"/> <property name="wiki" value="${docs}/wiki"/> *************** *** 120,124 **** <property name="distribution" value="distribution"/> <property name="junit.jar" value="${lib}/junit.jar"/> - <property name="commons-logging.jar" value="${lib}/commons-logging.jar"/> <property name="sax2.jar" value="${lib}/sax2.jar"/> --- 121,124 ---- *************** *** 223,231 **** <target name="compile" description="compile all java files"> ! <javac srcdir="${src}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="src:${commons-logging.jar}" source="1.3"/> </target> <target name="compilelexer" description="compile lexer java files"> ! <javac srcdir="${src}" debug="on" classpath="src:${commons-logging.jar}" target="1.1" source="1.3"> <include name="org/htmlparser/lexer/*.java"/> <include name="org/htmlparser/nodes/*.java"/> --- 223,233 ---- <target name="compile" description="compile all java files"> ! <mkdir dir="${classes}"/> ! <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" source="1.3"/> </target> <target name="compilelexer" description="compile lexer java files"> ! <mkdir dir="${classes}"/> ! <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}" target="1.1" source="1.3"> <include name="org/htmlparser/lexer/*.java"/> <include name="org/htmlparser/nodes/*.java"/> *************** *** 250,254 **** <target name="compileparser" depends="compilelexer" description="compile parser java files"> ! <javac srcdir="${src}" debug="on" classpath="src:${commons-logging.jar}:${sax2.jar}" source="1.3"> <include name="org/htmlparser/**/*.java"/> <exclude name="org/htmlparser/tests/**"/> --- 252,257 ---- <target name="compileparser" depends="compilelexer" description="compile parser java files"> ! <mkdir dir="${classes}"/> ! <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}:${sax2.jar}" source="1.3"> <include name="org/htmlparser/**/*.java"/> <exclude name="org/htmlparser/tests/**"/> *************** *** 264,268 **** <mkdir dir="${lib}"/> <jar jarfile="${lib}/htmllexer.jar" ! basedir="${src}"> <include name="org/htmlparser/lexer/*.class"/> <include name="org/htmlparser/nodes/*.class"/> --- 267,271 ---- <mkdir dir="${lib}"/> <jar jarfile="${lib}/htmllexer.jar" ! basedir="${classes}"> <include name="org/htmlparser/lexer/*.class"/> <include name="org/htmlparser/nodes/*.class"/> *************** *** 297,304 **** <target name="jarparser" depends="compileparser" description="create htmlparser.jar"> <mkdir dir="${lib}"/> ! <jar jarfile="${lib}/htmlparser.jar" ! basedir="${src}" ! includes="**/*.class **/*.gif" ! excludes="org/htmlparser/tests/**/*.class"> <manifest> <attribute name="Main-Class" value="org.htmlparser.Parser"/> --- 300,311 ---- <target name="jarparser" depends="compileparser" description="create htmlparser.jar"> <mkdir dir="${lib}"/> ! <jar jarfile="${lib}/htmlparser.jar"> ! <fileset ! dir="${classes}" ! includes="**/*.class" ! excludes="org/htmlparser/tests/**/*.class"/> ! <fileset ! dir="${src}" ! includes="**/*.gif"/> <manifest> <attribute name="Main-Class" value="org.htmlparser.Parser"/> *************** *** 326,334 **** <!-- Create the lib directory --> <mkdir dir="${lib}"/> ! <javac compiler="javac1.4" srcdir="${src}" debug="on" classpath="src:${lib}/htmllexer.jar" source="1.3"> <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/> </javac> <jar jarfile="${lib}/thumbelina.jar" ! basedir="${src}" defaultexcludes="no" update="true"> --- 333,342 ---- <!-- Create the lib directory --> <mkdir dir="${lib}"/> ! <mkdir dir="${classes}"/> ! <javac compiler="javac1.4" srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.3"> <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/> </javac> <jar jarfile="${lib}/thumbelina.jar" ! basedir="${classes}" defaultexcludes="no" update="true"> *************** *** 344,356 **** <!-- Create the lib directory --> <mkdir dir="${lib}"/> ! <javac compiler="javac1.4" srcdir="${src}" debug="on" classpath="src:${lib}/htmlparser.jar" source="1.3"> <include name="org/htmlparser/parserapplications/filterbuilder/**/*.java"/> </javac> <jar jarfile="${lib}/filterbuilder.jar" ! basedir="${src}" ! defaultexcludes="no" ! update="true"> ! <include name="org/htmlparser/parserapplications/filterbuilder/**/*.class"/> ! <include name="org/htmlparser/parserapplications/filterbuilder/**/*.gif"/> <manifest> <attribute name="Main-Class" value="org.htmlparser.parserapplications.filterbuilder.FilterBuilder"/> --- 352,371 ---- <!-- Create the lib directory --> <mkdir dir="${lib}"/> ! <mkdir dir="${classes}"/> ! <javac compiler="javac1.4" srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.3"> <include name="org/htmlparser/parserapplications/filterbuilder/**/*.java"/> </javac> <jar jarfile="${lib}/filterbuilder.jar" ! update="true"> ! <fileset ! dir="${classes}" ! defaultexcludes="no"> ! <include name="org/htmlparser/parserapplications/filterbuilder/**/*.class"/> ! </fileset> ! <fileset ! dir="${src}" ! defaultexcludes="no"> ! <include name="org/htmlparser/parserapplications/filterbuilder/**/*.gif"/> ! </fileset> <manifest> <attribute name="Main-Class" value="org.htmlparser.parserapplications.filterbuilder.FilterBuilder"/> *************** *** 361,369 **** <!-- Run the unit tests --> <target name="test" depends="jar" description="run the JUnit tests"> ! <javac srcdir="${src}" includes="org/htmlparser/tests/**" debug="on" source="1.3"> <classpath> ! <pathelement location="src"/> <pathelement location="${junit.jar}"/> - <pathelement location="${commons-logging.jar}"/> <pathelement location="${sax2.jar}"/> <pathelement location="${java.home}/../lib/tools.jar"/> --- 376,384 ---- <!-- Run the unit tests --> <target name="test" depends="jar" description="run the JUnit tests"> ! <mkdir dir="${classes}"/> ! <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/tests/**" debug="on" source="1.3"> <classpath> ! <pathelement location="${classes}"/> <pathelement location="${junit.jar}"/> <pathelement location="${sax2.jar}"/> <pathelement location="${java.home}/../lib/tools.jar"/> *************** *** 373,379 **** <classpath> <pathelement location="${lib}/htmlparser.jar"/> ! <pathelement location="${src}"/> <pathelement location="${junit.jar}"/> - <pathelement location="${commons-logging.jar}"/> <pathelement location="${sax2.jar}"/> <pathelement location="${java.home}/../lib/tools.jar"/> --- 388,393 ---- <classpath> <pathelement location="${lib}/htmlparser.jar"/> ! <pathelement location="${classes}"/> <pathelement location="${junit.jar}"/> <pathelement location="${sax2.jar}"/> <pathelement location="${java.home}/../lib/tools.jar"/> *************** *** 411,415 **** <!-- Create the javadoc for the project --> <target name="javadoc" depends="JDK1.4,JDK_Warning,init" description="create JavaDoc (API) documentation"> ! <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${src}"/> <mkdir dir="${docs}/javadoc"/> <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/> --- 425,430 ---- <!-- Create the javadoc for the project --> <target name="javadoc" depends="JDK1.4,JDK_Warning,init" description="create JavaDoc (API) documentation"> ! <mkdir dir="${classes}"/> ! <javac srcdir="${resources}" includes="HtmlTaglet.java" classpath="${classes}"/> <mkdir dir="${docs}/javadoc"/> <property name="javadoc.doctitle" value="HTML Parser ${versionNumber}"/> *************** *** 422,426 **** <javadoc packagenames="org.htmlparser.*" sourcepath="${src}" ! classpath="src:${commons-logging.jar}" defaultexcludes="yes" excludepackagenames="org.htmlparser.tests.*" --- 437,441 ---- <javadoc packagenames="org.htmlparser.*" sourcepath="${src}" ! classpath="${classes}" defaultexcludes="yes" excludepackagenames="org.htmlparser.tests.*" *************** *** 436,442 **** <bottom>${javadoc.bottom}</bottom> <footer>${javadoc.footer}</footer> ! <taglet name="HtmlTaglet" path="${resources}:${src}"/> <group title="Main Package" packages="org.htmlparser"/> ! <group title="Example Applications" packages="org.htmlparser.parserapplications,org.htmlparser.lexerapplications.tabby,org.htmlparser.lexerapplications.thumbelina"/> <group title="Tags" packages="org.htmlparser.tags,org.htmlparser.tags.data"/> <group title="Lexer" packages="org.htmlparser.lexer"/> --- 451,457 ---- <bottom>${javadoc.bottom}</bottom> <footer>${javadoc.footer}</footer> ! <taglet name="HtmlTaglet" path="${resources}:${classes}"/> <group title="Main Package" packages="org.htmlparser"/> ! <group title="Example Applications" packages="org.htmlparser.parserapplications,org.htmlparser.lexerapplications.tabby,org.htmlparser.lexerapplications.thumbelina,org.htmlparser.parserapplications.filterbuilder"/> <group title="Tags" packages="org.htmlparser.tags,org.htmlparser.tags.data"/> <group title="Lexer" packages="org.htmlparser.lexer"/> *************** *** 489,493 **** <delete> <fileset dir="." includes="src.zip"/> ! <fileset dir="${src}" includes="**/*.class"/> </delete> <delete dir="${docs}/javadoc/"/> --- 504,508 ---- <delete> <fileset dir="." includes="src.zip"/> ! <fileset dir="${classes}" includes="**/*.class"/> </delete> <delete dir="${docs}/javadoc/"/> |
