Update of /cvsroot/displaytag/display09
In directory sc8-pr-cvs1:/tmp/cvs-serv26549
Modified Files:
build.properties build.xml
Log Message:
added documentation - joined documentation and samples - refactored original
documentation pages to the new look - added build tasks for the doc/sample war -
removed example tree (new "site" tree contains both documentation and examples)
Index: build.properties
===================================================================
RCS file: /cvsroot/displaytag/display09/build.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build.properties 21 Jun 2003 13:42:23 -0000 1.3
--- build.properties 22 Jun 2003 20:33:04 -0000 1.4
***************
*** 32,47 ****
src.dir = src
tld.dir = tld
! examples.dir = examples
dist.dir = dist
build.dir = build
build.library = ${build.dir}/${taglib.name}
! build.doc = ${build.dir}/${taglib.name}-doc
! build.examples = ${build.dir}/${taglib.name}-examples
- dist.library = ${dist.dir}
- dist.examples = ${dist.dir}/${taglib.name}-examples.war
- dist.doc = ${dist.dir}/${taglib.name}-doc.war
- taglibs.doc = ${dist.dir}/${taglib.name}-doc
--- 32,46 ----
src.dir = src
tld.dir = tld
! site.dir = site
dist.dir = dist
build.dir = build
build.library = ${build.dir}/${taglib.name}
! build.web = ${build.dir}/${taglib.name}-web
! build.javadoc = ${build.web}/javadoc
!
! dist.library = ${dist.dir}/${taglib.name}.jar
! dist.site = ${dist.dir}/${taglib.name}.war
Index: build.xml
===================================================================
RCS file: /cvsroot/displaytag/display09/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** build.xml 21 Jun 2003 13:42:23 -0000 1.4
--- build.xml 22 Jun 2003 20:33:04 -0000 1.5
***************
*** 3,7 ****
<!-- Display taglibrary build file $Revision$ ($Author$) -->
! <project name="displaytag" default="jar">
<property file="build.properties"/>
<property file="${user.home}/build.properties"/>
--- 3,8 ----
<!-- Display taglibrary build file $Revision$ ($Author$) -->
! <project name="displaytag" default="all">
!
<property file="build.properties"/>
<property file="${user.home}/build.properties"/>
***************
*** 17,21 ****
<mkdir dir="${build.dir}"/>
! <mkdir dir="${build.doc}/javadoc" />
</target>
--- 18,24 ----
<mkdir dir="${build.dir}"/>
! <mkdir dir="${build.library}"/>
! <mkdir dir="${build.web}"/>
! <mkdir dir="${build.javadoc}" />
</target>
***************
*** 24,37 ****
<target name="compile" depends="prepare">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| C O M P I L I N G S O U R C E S |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
!
! <mkdir dir="${build.dir}/classes"/>
<javac
! destdir="${build.dir}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
--- 27,34 ----
<target name="compile" depends="prepare">
! <echo>Compiling sources</echo>
<javac
! destdir="${build.library}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
***************
*** 45,71 ****
</classpath>
<src path="${src.dir}"/>
-
</javac>
- </target>
! <target name="jar" depends="compile">
! <echo>+---------------------------------------------------+</echo>
! <echo>| |</echo>
! <echo>| P A C K A G I N G J A R |</echo>
! <echo>| |</echo>
! <echo>+---------------------------------------------------+</echo>
! <mkdir dir="${build.dir}/classes/META-INF"/>
! <copy file="${tld.dir}/display.tld"
tofile="${build.dir}/classes/META-INF/taglib.tld"/>
! <jar destfile="${dist.dir}/${taglib-name}.jar">
! <fileset dir="${build.dir}/classes"/>
! <fileset dir="${src.dir}">
! <include name="**/*.properties"/>
! </fileset>
</jar>
</target>
<target name="clean">
<delete dir="${build.dir}"/>
--- 42,67 ----
</classpath>
<src path="${src.dir}"/>
</javac>
! <copy todir="${build.library}">
! <fileset dir="${src.dir}">
! <include name="**/*.properties"/>
! </fileset>
! </copy>
! </target>
!
! <target name="jar-library" depends="compile">
! <echo>Packaging library jar</echo>
+ <mkdir dir="${build.library}/META-INF"/>
+ <copy file="${tld.dir}/${taglib.name}.tld"
tofile="${build.library}/META-INF/${taglib.name}.tld"/>
! <jar destfile="${dist.library}">
! <fileset dir="${build.library}"/>
</jar>
</target>
+
<target name="clean">
<delete dir="${build.dir}"/>
***************
*** 74,83 ****
! <target name="documentation" depends="prepare" description="Assemble the
documentation application">
<javadoc
packagenames="org.displaytag.*"
sourcepath="${src.dir}"
! destdir="${build.doc}/javadoc"
author="true"
version="true"
--- 70,79 ----
! <target name="javadoc" depends="prepare">
<javadoc
packagenames="org.displaytag.*"
sourcepath="${src.dir}"
! destdir="${build.javadoc}"
author="true"
version="true"
***************
*** 95,113 ****
</target>
! <target name="examples.pre" depends="prepare">
! <copy todir="${build.examples}/WEB-INF/lib"
file="${lib.dir}/commons-beanutils.jar" />
! <copy todir="${build.examples}/WEB-INF/lib"
file="${lib.dir}/commons-collections.jar" />
! <copy todir="${build.examples}/WEB-INF/lib"
file="${lib.dir}/commons-lang.jar" />
! <copy todir="${build.examples}/WEB-INF/lib"
file="${lib.dir}/commons-logging.jar" />
</target>
! <target name="examples-compile" depends="compile">
<echo>Compiling examples sources</echo>
! <mkdir dir="${build.examples}/WEB-INF/classes"/>
<javac
! destdir="${build.examples}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
--- 91,113 ----
</target>
!
! <!-- start site targets -->
!
!
! <target name="site-pre" depends="prepare">
! <copy todir="${build.web}/WEB-INF/lib"
file="${lib.dir}/commons-beanutils.jar" />
! <copy todir="${build.web}/WEB-INF/lib"
file="${lib.dir}/commons-collections.jar" />
! <copy todir="${build.web}/WEB-INF/lib"
file="${lib.dir}/commons-lang.jar" />
! <copy todir="${build.web}/WEB-INF/lib"
file="${lib.dir}/commons-logging.jar" />
</target>
! <target name="site-compile" depends="compile">
<echo>Compiling examples sources</echo>
! <mkdir dir="${build.web}/WEB-INF/classes"/>
<javac
! destdir="${build.web}/WEB-INF/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
***************
*** 119,153 ****
<include name="**/*.jar"/>
</fileset>
! <pathelement path="${build.dir}/classes"/>
</classpath>
! <src path="${examples.dir}/src"/>
</javac>
</target>
- <target name="examples" depends="examples-compile, examples.pre">
- <tstamp>
- <format property="timestamp" pattern="MM/dd/yyyy hh:mm:ss aa"
/>
- </tstamp>
- <tstamp>
- <format property="versiondate" pattern="MM/dd/yyyy" />
- </tstamp>
! <filter token="version" value="${version}" />
! <filter token="versiondate" value="${versiondate}" />
! <filter token="buildtime" value="${timestamp}" />
- <copy toDir="${build.examples}" filtering="true" overwrite="true">
- <fileset dir="${examples.dir}/web" />
- </copy>
- <!--
- this has yet to be fixed
- <copy file="${dist.library}/${taglib.name}.jar"
toFile="${build.examples}/WEB-INF/lib/${taglib.name}.jar" />
- -->
- <copy file="${tld.dir}/display.tld"
toFile="${build.examples}/WEB-INF/display.jar" />
- </target>
</project>
--- 119,181 ----
<include name="**/*.jar"/>
</fileset>
! <pathelement path="${build.library}"/>
</classpath>
! <src path="${site.dir}/src"/>
</javac>
</target>
! <target name="site-copy" depends="site-compile, site-pre, jar-library">
+ <tstamp>
+ <format property="timestamp" pattern="MM/dd/yyyy hh:mm:ss aa" />
+ </tstamp>
+ <tstamp>
+ <format property="versiondate" pattern="MM/dd/yyyy" />
+ </tstamp>
+
+ <filter token="version" value="${version}" />
+ <filter token="versiondate" value="${versiondate}" />
+ <filter token="buildtime" value="${timestamp}" />
+
+
+ <copy toDir="${build.web}" filtering="true" overwrite="true">
+ <fileset dir="${site.dir}/web">
+ <include name="**/*.*"/>
+ <exclude name="WEB-INF/classes/**/*.*"/>
+ <exclude name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <copy toDir="${build.web}" filtering="false" overwrite="true">
+ <fileset dir="${site.dir}/web">
+ <include name="**/*.png"/>
+ </fileset>
+ </copy>
+
+ <copy file="${dist.library}"
toFile="${build.web}/WEB-INF/lib/${taglib.name}.jar" />
+ <copy file="${tld.dir}/${taglib.name}.tld"
toFile="${build.web}/WEB-INF/${taglib.name}.tld" />
+ </target>
+
+
+ <target name="site-dist" depends="site-copy">
+ <jar destfile="${dist.dir}/${taglib.name}.war">
+ <fileset dir="${build.web}"/>
+ </jar>
+ </target>
+
+ <target name="site">
+ <antcall target="site-dist" />
+ </target>
+
+ <target name="all" description="compile, create documentation and prepare
distribution">
+ <antcall target="jar-library" />
+ <antcall target="javadoc" />
+ <antcall target="site" />
+ </target>
</project>
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
displaytag-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/displaytag-devel
