[Htmlparser-cvs] htmlparser build.xml,1.41,1.42

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv23027

Modified Files:
	build.xml 
Log Message:
Fifth drop for new i/o subsystem.
There is now a mainline for the lexer.
Try:
    java -jar lexer.jar http://whatever
or the integration build has a new lexer execution script:
    bin/lexer http://whatever




Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** build.xml	11 Aug 2003 03:53:31 -0000	1.41
--- build.xml	23 Aug 2003 01:33:06 -0000	1.42
***************
*** 2,6 ****
  Build Procedure
  - cd htmlparser
! - 'ant jar' generates new htmlparser.jar in htmlparser/release/htmlparser1_4/lib
  
  Release Procedure
--- 2,6 ----
  Build Procedure
  - cd htmlparser
! - 'ant jars' generates new htmlparser.jar and htmllexer.jar in htmlparser/release/htmlparser1_4/lib
  
  Release Procedure
***************
*** 197,219 ****
  
      <!-- Compile the java code in ${src} -->
!     <javac srcdir="${src}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java,org/htmlparser/lexer/**" debug="on" classpath="src:${commons-logging.jar}" />
    </target>
  
!   <!-- Create the distribution of htmlparser.jar -->
!   <target name="jar" depends="compile" description="create htmlparser.jar">
      <echo message="**********************************"/>
      <echo message="*  Creating htmlparser.jar....   *"/>
      <echo message="**********************************"/>
  
-     <!-- Create the distribution directory -->
-     <mkdir dir="${dist}/lib"/>
- 
      <!-- Put classes and images into the htmlparser.jar file -->
      <jar jarfile="${dist}/lib/htmlparser.jar"
        basedir="${src}"
        includes="**/*.class **/*.gif"
!       excludes="org/htmlparser/tests/**/*.class,org/htmlparser/util/Generate.class"
!       manifest="${resources}/Manifest.mf">
        <manifest>
          <section name="org/htmlparser/Parser.class">
            <attribute name="Java-Bean" value="True"/>
--- 197,219 ----
  
      <!-- Compile the java code in ${src} -->
!     <javac srcdir="${src}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java" debug="on" classpath="src:${commons-logging.jar}" />
    </target>
  
!   <!-- Create the distribution of htmlparser.jar and htmllexer.jar -->
!   <target name="jars" depends="compile" description="create htmlparser.jar and htmllexer.jar">
!     <!-- Create the distribution directory -->
!     <mkdir dir="${dist}/lib"/>
! 
      <echo message="**********************************"/>
      <echo message="*  Creating htmlparser.jar....   *"/>
      <echo message="**********************************"/>
  
      <!-- Put classes and images into the htmlparser.jar file -->
      <jar jarfile="${dist}/lib/htmlparser.jar"
        basedir="${src}"
        includes="**/*.class **/*.gif"
!       excludes="org/htmlparser/tests/**/*.class,org/htmlparser/util/Generate.class">
        <manifest>
+         <attribute name="Main-Class" value="org.htmlparser.Parser"/>
          <section name="org/htmlparser/Parser.class">
            <attribute name="Java-Bean" value="True"/>
***************
*** 233,240 ****
        </manifest>
      </jar>
    </target>
  
    <!-- Run the unit tests -->
!   <target name="test" depends="jar" description="run the JUnit tests">
      <echo message="**********************************"/>
      <echo message="*  Running unit tests....        *"/>
--- 233,261 ----
        </manifest>
      </jar>
+ 
+     <echo message="**********************************"/>
+     <echo message="*  Creating htmllexer.jar....   *"/>
+     <echo message="**********************************"/>
+ 
+     <!-- Put classes and images into the htmllexer.jar file -->
+     <jar jarfile="${dist}/lib/htmllexer.jar"
+       basedir="${src}">
+       <include name="org/htmlparser/lexer/**/*.class"/>
+       <include name="org/htmlparser/AbstractNode.class"/>
+       <include name="org/htmlparser/Node.class"/>
+       <include name="org/htmlparser/util/ParserException.class"/>
+       <include name="org/htmlparser/util/ChainedException.class"/>
+       <include name="org/htmlparser/util/sort/**/*.class"/>
+       <!-- to be removed -->
+       <include name="org/htmlparser/parserHelper/SpecialHashtable.class"/>
+       <manifest>
+         <attribute name="Main-Class" value="org.htmlparser.lexer.Lexer"/>
+       </manifest>
+     </jar>
+ 
    </target>
  
    <!-- Run the unit tests -->
!   <target name="test" depends="jars" description="run the JUnit tests">
      <echo message="**********************************"/>
      <echo message="*  Running unit tests....        *"/>
***************
*** 331,335 ****
  
    <!-- The release directory structuring finishes here -->
!   <target name="Release" depends="versionSource,jar,javadoc,CopyBatch" description="prepare the release files">
    </target>
  
--- 352,356 ----
  
    <!-- The release directory structuring finishes here -->
!   <target name="Release" depends="versionSource,jars,javadoc,CopyBatch" description="prepare the release files">
    </target>