[Htmlparser-cvs] htmlparser build.xml,1.29,1.30

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

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

Modified Files:
	build.xml 
Log Message:
Eliminate the build directory.



Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** build.xml	18 May 2003 09:41:50 -0000	1.29
--- build.xml	18 May 2003 11:23:39 -0000	1.30
***************
*** 12,16 ****
    <property name="versionQualifier" value="${versionMajor}_${versionMinor}"/>
    <property name="src" value="src"/>
-   <property name="build" value="build"/>
    <property name="docs" value="docs"/>
    <property name="resources" value="resources"/>
--- 12,15 ----
***************
*** 92,95 ****
--- 91,109 ----
      <!-- cvschangelog daysinpast="7" destfile="changelog.xml" / -->
      <!-- so we use cvs2cl instead -->
+     <!--
+       Note: This relies on being able to perform cvs operations to
+       cvs.htmlparser.sorceforge.net by default, so you need to have
+       environment variables CVSROOT and CVS_RSH set up and the ssh-agent
+       loaded and primed.
+       $ ssh-agent
+       $ ssh-add
+       $ CVSROOT=:ext:der...@cv...:/cvsroot/htmlparser
+       $ export CVSROOT
+       $ CVS_RSH=ssh
+       $ export CVS_RSH
+       At this point you should be able to ssh to sourceforge without answering
+       password prompts:
+       $ ssh -l derrickoswald shell.sourceforge.net
+     -->
      <echo message="**********************************"/>
      <echo message="*  Creating change log           *"/>
***************
*** 108,120 ****
      <echo message="**********************************"/>
  
!     <!-- Create the build directory structure used by compile -->
!     <mkdir dir="${build}"/>
!     <!-- Compile the java code from ${src} into ${build} -->
!     <javac srcdir="${src}" destdir="${build}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java" debug="on" />
!     <!--  Copy images from ${src} into ${build} -->
!     <mkdir dir="${build}/org/htmlparser/beans/images"/>
!     <copy todir="${build}/org/htmlparser/beans/images">
!         <fileset dir="${src}/org/htmlparser/beans/images" includes="Chain16.gif Chain32.gif Knot16.gif Knot32.gif"/>
!     </copy>
    </target>
  
--- 122,127 ----
      <echo message="**********************************"/>
  
!     <!-- Compile the java code in ${src} -->
!     <javac srcdir="${src}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**,org/htmlparser/util/Generate.java" debug="on" />
    </target>
  
***************
*** 128,133 ****
      <mkdir dir="${dist}/lib"/>
  
!     <!-- Put everything in ${build} into the htmlparser.jar file -->
!     <jar jarfile="${dist}/lib/htmlparser.jar" basedir="${build}" manifest="${resources}/Manifest.mf">
        <manifest>
          <section name="org/htmlparser/Parser.class">
--- 135,144 ----
      <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">
***************
*** 187,192 ****
             version="true"
             use="true"
!            windowtitle="HTML Parser ${version}">
!       <doctitle><![CDATA[<h1>HTML Parser ${version}</h1>]]></doctitle>
        <header><![CDATA[<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>]]></header>
        <bottom><![CDATA[HTML Parser is an open source library released under LGPL. <BR> If you want to be notified when a new release of HTML Parser is out, join the <A HREF="http://lists.sourceforge.net/lists/listinfo/htmlparser-announce">HTML Parser Announcement List</A>.<BR>
--- 198,203 ----
             version="true"
             use="true"
!            windowtitle="HTML Parser ${versionTag}">
!       <doctitle><![CDATA[<h1>HTML Parser ${versionTag}</h1>]]></doctitle>
        <header><![CDATA[<A HREF="http://htmlparser.sourceforge.net" target="_top">HTML Parser Home Page</A>]]></header>
        <bottom><![CDATA[HTML Parser is an open source library released under LGPL. <BR> If you want to be notified when a new release of HTML Parser is out, join the <A HREF="http://lists.sourceforge.net/lists/listinfo/htmlparser-announce">HTML Parser Announcement List</A>.<BR>
***************
*** 231,235 ****
    </target>
  
!   <!-- The release directory structuring finishes here -->  
    <target name="Release" depends="versionSource,jar,javadoc,CopyBatch" description="prepare the release files">
    </target>
--- 242,246 ----
    </target>
  
!   <!-- The release directory structuring finishes here -->
    <target name="Release" depends="versionSource,jar,javadoc,CopyBatch" description="prepare the release files">
    </target>
***************
*** 242,246 ****
  
      <mkdir dir="${finalLoc}"/>
!     <zip zipfile="${finalLoc}/htmlparser${version}.zip"
         basedir="${releaseDir}"/>
      <tar tarfile="${finalLoc}/docs.tar" basedir="${dist}/docs"/>
--- 253,257 ----
  
      <mkdir dir="${finalLoc}"/>
!     <zip zipfile="${finalLoc}/htmlparser${versionTag}.zip"
         basedir="${releaseDir}"/>
      <tar tarfile="${finalLoc}/docs.tar" basedir="${dist}/docs"/>
***************
*** 272,285 ****
    </target>
  
!   <!-- Clean up -->
!   <target name="htmlparser" depends="Package" description="vacuous, same as Package">
      <echo message="**********************************"/>
      <echo message="*  Cleaning up and finishing.... *"/>
      <echo message="**********************************"/>
  
!     <!-- Delete the ${build} and ${dist} directory trees --> 
!     <delete dir="${build}"/>
!     <!-- Delete the release directory also -->
      <delete dir="${releaseDir}"/> 
    </target>
  </project>
--- 283,298 ----
    </target>
  
!   <!-- Perform the htmlparser integration -->
!   <target name="htmlparser" depends="Package" description="same as Package plus cleanup">
      <echo message="**********************************"/>
      <echo message="*  Cleaning up and finishing.... *"/>
      <echo message="**********************************"/>
  
!     <!-- delete the release directory -->
      <delete dir="${releaseDir}"/> 
+     <!-- delete the classes -->
+     <delete>
+       <fileset dir="${src}" includes="**/*.class"/>
+     </delete>
    </target>
  </project>