[Htmlparser-cvs] htmlparser build.xml,1.48,1.49 cvs2cl.pl,1.1,NONE htmlparser_checks.xml,1.1,NONE ja
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser build.xml,1.48,1.49 cvs2cl.pl,1.1,NONE htmlparser_checks.xml,1.1,NONE java.header,1.5,NONE
|
From: <der...@us...> - 2003-09-23 03:41:41
|
Update of /cvsroot/htmlparser/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv11902
Modified Files:
build.xml
Removed Files:
cvs2cl.pl htmlparser_checks.xml java.header
Log Message:
Distribution cleanup.
- Removed duplicate documentation files from src.zip.
- Jars are now built in lib, and stay there, rather than being deleting in the clean task.
*** NOTE *** No more release directory.
- Added checkstyle-all-3.1.jar to the lib directory, so others can run it too.
- Moved executable scripts from resources to a new bin directory
so they can be executed in a development environment.
- Moved fit.jar from resources to the lib directory.
This left the resources directory empty, but...
- Moved cvs2cl and checkstyle files into the resources directory.
- Eliminated staging of source files and release files just to construct a
zip. These are now aggregated by their respective zip tasks.
- Changed name of changeLog task to changelog.
- Fixed a few javadoc warnings.
- Removed the spurious 'run' from the front of all the names of the DOS batch files.
The only files that aren't shipped now are the results, specs and .ssh directory,
(whatever they are), and the development environment is identical to the unpacked
zips except for maybe the built directories (distribution, javadocs).
Index: build.xml
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** build.xml 22 Sep 2003 00:44:03 -0000 1.48
--- build.xml 23 Sep 2003 03:41:33 -0000 1.49
***************
*** 2,11 ****
Build Procedure
- cd htmlparser
! - 'ant jar' generates new htmlparser.jar and htmllexer.jar in htmlparser/release/htmlparser1_4/lib
Release Procedure
- cd htmlparser
! - set environment variables CVSROOT and CVS_RSH (see changeLog task)
! - 'ant changeLog' generates htmlparser/ChangeLog
- edit the ChangeLog to exclude changes already incorporated and the previous
release's "update of version headers" drop - the CVS date spec is only accurate
--- 2,11 ----
Build Procedure
- cd htmlparser
! - 'ant jar' generates new htmlparser.jar and htmllexer.jar in htmlparser/lib
Release Procedure
- cd htmlparser
! - set environment variables CVSROOT and CVS_RSH (see changelog task)
! - 'ant changelog' generates htmlparser/ChangeLog
- edit the ChangeLog to exclude changes already incorporated and the previous
release's "update of version headers" drop - the CVS date spec is only accurate
***************
*** 84,99 ****
<property name="src" value="src"/>
<property name="docs" value="docs"/>
<property name="resources" value="resources"/>
! <property name="dist" value="release/htmlparser${versionQualifier}"/>
! <property name="releaseDir" value="release"/>
! <property name="finalLoc" value="distribution"/>
! <property name="junit.jar" value="lib/junit.jar"/>
! <property name="commons-logging.jar" value="lib/commons-logging.jar"/>
<taskdef resource="checkstyletask.properties"
! classpath="lib/checkstyle-all-3.1.jar"/>
<target name="checkstyle" description="check source code adheres to coding standards">
! <checkstyle config="./htmlparser_checks.xml">
<fileset dir="src" includes="**/*.java"/>
</checkstyle>
--- 84,99 ----
<property name="src" value="src"/>
<property name="docs" value="docs"/>
+ <property name="bin" value="bin"/>
+ <property name="lib" value="lib"/>
<property name="resources" value="resources"/>
! <property name="distribution" value="distribution"/>
! <property name="junit.jar" value="${lib}/junit.jar"/>
! <property name="commons-logging.jar" value="${lib}/commons-logging.jar"/>
<taskdef resource="checkstyletask.properties"
! classpath="${lib}/checkstyle-all-3.1.jar"/>
<target name="checkstyle" description="check source code adheres to coding standards">
! <checkstyle config="${resources}/htmlparser_checks.xml">
<fileset dir="src" includes="**/*.java"/>
</checkstyle>
***************
*** 175,179 ****
</target>
! <target name="changeLog" depends="init" description="create the change log from CVS logs">
<!-- ant has a changelog task already, but it outputs XML and doesn't unify dates or spit them out in chronological order -->
<!-- cvschangelog daysinpast="7" destfile="changelog.xml" / -->
--- 175,179 ----
</target>
! <target name="changelog" depends="init" description="create the change log from CVS logs">
<!-- ant has a changelog task already, but it outputs XML and doesn't unify dates or spit them out in chronological order -->
<!-- cvschangelog daysinpast="7" destfile="changelog.xml" / -->
***************
*** 197,202 ****
<echo message="* Creating change log *"/>
<echo message="**********************************"/>
! <echo message="./cvs2cl.pl --no-wrap --separate-header -l "-d'>${VERSION_DATE}'""/>
! <exec executable="./cvs2cl.pl">
<arg value="--no-wrap"/>
<arg value="--separate-header"/>
--- 197,202 ----
<echo message="* Creating change log *"/>
<echo message="**********************************"/>
! <echo message="${resources}/cvs2cl.pl --no-wrap --separate-header -l "-d'>${VERSION_DATE}'""/>
! <exec executable="${resources}/cvs2cl.pl">
<arg value="--no-wrap"/>
<arg value="--separate-header"/>
***************
*** 250,254 ****
<target name="jarlexer" depends="compilelexer" description="create htmllexer.jar">
<!-- Create the distribution directory -->
! <mkdir dir="${dist}/lib"/>
<echo message="**********************************"/>
--- 250,254 ----
<target name="jarlexer" depends="compilelexer" description="create htmllexer.jar">
<!-- Create the distribution directory -->
! <mkdir dir="${lib}"/>
<echo message="**********************************"/>
***************
*** 257,261 ****
<!-- Put classes and images into the htmllexer.jar file -->
! <jar jarfile="${dist}/lib/htmllexer.jar"
basedir="${src}">
<include name="org/htmlparser/lexer/**/*.class"/>
--- 257,261 ----
<!-- Put classes and images into the htmllexer.jar file -->
! <jar jarfile="${lib}/htmllexer.jar"
basedir="${src}">
<include name="org/htmlparser/lexer/**/*.class"/>
***************
*** 279,283 ****
<target name="jarparser" depends="compileparser" description="create htmlparser.jar">
<!-- Create the distribution directory -->
! <mkdir dir="${dist}/lib"/>
<echo message="**********************************"/>
--- 279,283 ----
<target name="jarparser" depends="compileparser" description="create htmlparser.jar">
<!-- Create the distribution directory -->
! <mkdir dir="${lib}"/>
<echo message="**********************************"/>
***************
*** 286,290 ****
<!-- Put classes and images into the htmlparser.jar file -->
! <jar jarfile="${dist}/lib/htmlparser.jar"
basedir="${src}"
includes="**/*.class **/*.gif"
--- 286,290 ----
<!-- Put classes and images into the htmlparser.jar file -->
! <jar jarfile="${lib}/htmlparser.jar"
basedir="${src}"
includes="**/*.class **/*.gif"
***************
*** 314,318 ****
<target name="thumbelina" depends="JDK1.4,jarlexer" description="create thumbelina.jar" if="JDK1.4">
<!-- Create the distribution directory -->
! <mkdir dir="${dist}/lib"/>
<echo message="**********************************"/>
--- 314,318 ----
<target name="thumbelina" depends="JDK1.4,jarlexer" description="create thumbelina.jar" if="JDK1.4">
<!-- Create the distribution directory -->
! <mkdir dir="${lib}"/>
<echo message="**********************************"/>
***************
*** 320,332 ****
<echo message="**********************************"/>
! <javac compiler="javac1.4" srcdir="${src}" debug="on" classpath="src:${dist}/lib/htmllexer.jar">
<include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
</javac>
! <jar jarfile="${dist}/lib/thumbelina.jar"
basedir="${src}"
defaultexcludes="no"
update="true">
<include name="org/htmlparser/lexerapplications/thumbelina/**/*.class"/>
! <zipfileset src="${dist}/lib/htmllexer.jar" includes="**/*.class"/>
<manifest>
<attribute name="Main-Class" value="org.htmlparser.lexerapplications.thumbelina.Thumbelina"/>
--- 320,332 ----
<echo message="**********************************"/>
! <javac compiler="javac1.4" srcdir="${src}" debug="on" classpath="src:${lib}/htmllexer.jar">
<include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
</javac>
! <jar jarfile="${lib}/thumbelina.jar"
basedir="${src}"
defaultexcludes="no"
update="true">
<include name="org/htmlparser/lexerapplications/thumbelina/**/*.class"/>
! <zipfileset src="${lib}/htmllexer.jar" includes="**/*.class"/>
<manifest>
<attribute name="Main-Class" value="org.htmlparser.lexerapplications.thumbelina.Thumbelina"/>
***************
*** 349,353 ****
<java classname="org.htmlparser.tests.AllTests" fork="yes" failonerror="yes">
<classpath>
! <pathelement location="${dist}/lib/htmlparser.jar"/>
<pathelement location="${src}"/>
<pathelement location="${junit.jar}"/>
--- 349,353 ----
<java classname="org.htmlparser.tests.AllTests" fork="yes" failonerror="yes">
<classpath>
! <pathelement location="${lib}/htmlparser.jar"/>
<pathelement location="${src}"/>
<pathelement location="${junit.jar}"/>
***************
*** 359,363 ****
<!-- Create the javadoc for the project -->
! <target name="javadoc" depends="init,CopyDoc" description="create JavaDoc (API) documentation">
<echo message="**********************************"/>
<echo message="* Generating Javadoc.... *"/>
--- 359,363 ----
<!-- Create the javadoc for the project -->
! <target name="javadoc" depends="init" description="create JavaDoc (API) documentation">
<echo message="**********************************"/>
<echo message="* Generating Javadoc.... *"/>
***************
*** 365,369 ****
<!-- Create the javadoc directory -->
! <mkdir dir="${dist}/docs/javadoc"/>
<property name="javadoc.doctitle" value="<h1>HTML Parser ${versionNumber}</h1>"/>
--- 365,369 ----
<!-- Create the javadoc directory -->
! <mkdir dir="${docs}/javadoc"/>
<property name="javadoc.doctitle" value="<h1>HTML Parser ${versionNumber}</h1>"/>
***************
*** 385,389 ****
defaultexcludes="yes"
excludepackagenames="org.htmlparser.tests.*"
! destdir="${dist}/docs/javadoc"
author="true"
version="true"
--- 385,389 ----
defaultexcludes="yes"
excludepackagenames="org.htmlparser.tests.*"
! destdir="${docs}/javadoc"
author="true"
version="true"
***************
*** 405,451 ****
</target>
! <!-- Copy the design documentation and release notes into the doc director -->
! <target name="CopyDoc" description="copy documentation to distribution directory">
! <echo message="**********************************"/>
! <echo message="* Copying Documentation.... *"/>
! <echo message="**********************************"/>
!
! <copy todir="${dist}/docs">
! <fileset dir="${docs}"/>
! </copy>
! <!-- Copy the release notes as readme.txt in the base release directory -->
! <copy file="${docs}/release.txt" tofile="${dist}/readme.txt"/>
!
! </target>
!
! <!-- Copy the batch files into the htmlparser release directory -->
! <target name="CopyBatch" description="copy batch files to distribution directory">
! <echo message="**********************************"/>
! <echo message="* Copying Batch Files.... *"/>
! <echo message="**********************************"/>
!
! <mkdir dir="${dist}/bin"/>
! <copy todir="${dist}/bin" >
! <fileset dir="${resources}" includes="*.bat"/>
! <fileset dir="${resources}" includes="lexer"/>
! <fileset dir="${resources}" includes="thumbelina"/>
! </copy>
! </target>
!
! <!-- The release directory structuring finishes here -->
! <target name="Release" depends="versionSource,jar,thumbelina,javadoc,CopyBatch" description="prepare the release files">
</target>
<!-- Package the release -->
! <target name="Package" depends="Release,sources" description="glom the release and source files into the distribution zip file">
<echo message="**********************************"/>
<echo message="* Packaging.... *"/>
<echo message="**********************************"/>
! <copy file="lib/commons-logging.jar" todir="${dist}/lib"/>
! <copy file="lib/junit.jar" todir="${dist}/lib"/>
! <mkdir dir="${finalLoc}"/>
! <zip zipfile="${finalLoc}/htmlparser${versionTag}.zip"
! basedir="${releaseDir}"/>
</target>
--- 405,427 ----
</target>
! <target name="Release" depends="versionSource,jar,thumbelina,javadoc" description="prepare the release files">
</target>
<!-- Package the release -->
! <target name="Package" depends="Release,sources"
! description="glom the release and source files into the distribution zip file">
<echo message="**********************************"/>
<echo message="* Packaging.... *"/>
<echo message="**********************************"/>
! <mkdir dir="${distribution}"/>
! <zip zipfile="${distribution}/htmlparser${versionTag}.zip">
! <zipfileset dir="${bin}" prefix="htmlparser${versionQualifier}/${bin}"/>
! <zipfileset dir="${docs}" prefix="htmlparser${versionQualifier}/${docs}"/>
! <zipfileset dir="${lib}" prefix="htmlparser${versionQualifier}/${lib}"/>
! <zipfileset dir="." prefix="htmlparser${versionQualifier}/" includes="src.zip"/>
! <!-- Copy the release notes as readme.txt in the base release directory -->
! <zipfileset dir="${docs}" includes="release.txt" fullpath="htmlparser${versionQualifier}/readme.txt"/>
! </zip>
</target>
***************
*** 456,489 ****
<echo message="**********************************"/>
! <mkdir dir="${dist}/sources/src"/>
! <copy todir="${dist}/sources/src">
! <fileset dir="${src}" includes="**/*.java **/*.html **/*.gif **/*.form **/*.properties"/>
! </copy>
! <copy file="build.xml" todir="${dist}/sources"/>
! <mkdir dir="${dist}/sources/resources"/>
! <copy todir="${dist}/sources/resources" >
! <fileset dir="${resources}"/>
! </copy>
! <mkdir dir="${dist}/sources/docs"/>
! <copy todir="${dist}/sources/docs">
! <fileset dir="${docs}"/>
! </copy>
! <zip zipfile="${dist}/src.zip"
! basedir="${dist}/sources"/>
! <delete dir="${dist}/sources"/>
</target>
! <target name="clean" description="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>
<!-- Perform the htmlparser integration -->
--- 432,455 ----
<echo message="**********************************"/>
! <zip destfile="src.zip" defaultexcludes="no">
! <zipfileset dir="${src}" prefix="${src}" includes="**/*.java **/*.html **/*.gif **/*.form **/*.properties"/>
! <zipfileset dir="." includes="build.xml"/>
! <zipfileset dir="${resources}" prefix="${resources}" excludes="cvs2cl.pl"/>
! <zipfileset dir="${resources}" prefix="${resources}" includes="cvs2cl.pl" filemode="755"/>
! </zip>
</target>
! <target name="clean" description="cleanup">
! <echo message="**********************************"/>
! <echo message="* Cleaning up.... *"/>
! <echo message="**********************************"/>
! <!-- delete the src.zip, classes and javadocs leave the jars -->
! <delete>
! <fileset dir="." includes="src.zip"/>
! <fileset dir="${src}" includes="**/*.class"/>
! </delete>
! <delete dir="${docs}/javadoc/"/>
! </target>
<!-- Perform the htmlparser integration -->
--- cvs2cl.pl DELETED ---
--- htmlparser_checks.xml DELETED ---
--- java.header DELETED ---
|
