You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/03/17 02:24:27 UTC
svn commit: r157847 - in lenya/trunk/src/targets: compile-build.xml
dist-build.xml export-build.xml init-build.xml webapp-build.xml
Author: gregor
Date: Wed Mar 16 17:24:26 2005
New Revision: 157847
URL: http://svn.apache.org/viewcvs?view=rev&rev=157847
Log:
Removed info messages from build and put it into comments in the build file instead.
Modified:
lenya/trunk/src/targets/compile-build.xml
lenya/trunk/src/targets/dist-build.xml
lenya/trunk/src/targets/export-build.xml
lenya/trunk/src/targets/init-build.xml
lenya/trunk/src/targets/webapp-build.xml
Modified: lenya/trunk/src/targets/compile-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/compile-build.xml?view=diff&r1=157846&r2=157847
==============================================================================
--- lenya/trunk/src/targets/compile-build.xml (original)
+++ lenya/trunk/src/targets/compile-build.xml Wed Mar 16 17:24:26 2005
@@ -85,9 +85,7 @@
</target>
<target name="clean" depends="init" description="Cleans the build directories">
- <echo>INFO: Delete ${build.root}</echo>
<delete dir="${build.root}"/>
- <echo>INFO: Delete ${dist.root}</echo>
<delete dir="${dist.root}"/>
</target>
</project>
Modified: lenya/trunk/src/targets/dist-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/dist-build.xml?view=diff&r1=157846&r2=157847
==============================================================================
--- lenya/trunk/src/targets/dist-build.xml (original)
+++ lenya/trunk/src/targets/dist-build.xml Wed Mar 16 17:24:26 2005
@@ -75,7 +75,6 @@
like the cocoon logfiles from ending up in the distribution tarball.
-->
<target name="snapshot-bin" depends="prepare-dist-bin" description="Build a snapshot binary distribution tar ball (the same as 'dist' except for the filename)">
-
<copy todir="${snapshot.bin.dir}">
<fileset dir="${dist.root}/${distname}-bin"/>
</copy>
@@ -84,19 +83,14 @@
<gzip zipfile="${snapshot.bin.dir}.tar.gz" src="${snapshot.bin.dir}.tar"/>
<delete file="${snapshot.bin.dir}.tar"/>
-
<zip zipfile="${snapshot.bin.dir}.zip" basedir="${dist.root}/${snapshot.bin.name}"/>
-
</target>
-
-
<!--
The dist-src target prepares the source distribution tarball for
developers. It also depends on the clean target to remove all build stuff.
-->
<target name="prepare-dist-src" depends="clean">
-
<mkdir dir="${dist.src.dir}"/>
<copy todir="${dist.src.dir}">
@@ -107,11 +101,9 @@
<exclude name="dist/**"/>
</fileset>
</copy>
-
</target>
<target name="dist-src" depends="prepare-dist-src" description="Builds a regular tar ball containing the sources for developers">
-
<tar tarfile="${dist.src.dir}.tar" basedir="${dist.root}" includes="${distname}-src/**"/>
<gzip zipfile="${dist.src.dir}.tar.gz" src="${dist.src.dir}.tar"/>
@@ -122,7 +114,6 @@
<checksum file="${dist.src.dir}.zip" fileext=".md5"/>
</target>
-
<!--
This target prepares the source distribution tarball for
end users. It forces a complete rebuild of everything through its
@@ -130,22 +121,16 @@
like the cocoon logfiles from ending up in the distribution tarball.
-->
<target name="snapshot-src" depends="prepare-dist-src" description="Builds a snapshot tar ball containing the sources for developers (the same as 'dist-src' except for the filename)">
-
<copy todir="${snapshot.src.dir}">
<fileset dir="${dist.src.dir}"/>
</copy>
<tar tarfile="${snapshot.src.dir}.tar" basedir="${dist.root}" includes="${snapshot.src.name}/**"/>
-
<gzip zipfile="${snapshot.src.dir}.tar.gz" src="${snapshot.src.dir}.tar"/>
<delete file="${snapshot.src.dir}.tar"/>
-
</target>
-
<target name="zip-webapp" depends="init" description="Zips the webapp in order to deploy within another servlet container">
- <echo>Create ./${build.dir}/${snapshot.bin.name}.tar.gz</echo>
-
<tar tarfile="./${build.dir}/${snapshot.bin.name}.tar" basedir="${build.webapp}"/>
<gzip zipfile="./${build.dir}/${snapshot.bin.name}.tar.gz" src="./${build.dir}/${snapshot.bin.name}.tar"/>
<delete file="./${build.dir}/${snapshot.bin.name}.tar"/>
Modified: lenya/trunk/src/targets/export-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/export-build.xml?view=diff&r1=157846&r2=157847
==============================================================================
--- lenya/trunk/src/targets/export-build.xml (original)
+++ lenya/trunk/src/targets/export-build.xml Wed Mar 16 17:24:26 2005
@@ -35,7 +35,7 @@
<property name="project.debuglevel" value="DEBUG"/>
- <echo>INFO: Copying source files from authoring to live</echo>
+ <!-- Copying source files from authoring to live -->
<copy todir="${publication.dir}/content/live">
<fileset dir="${publication.dir}/content/authoring"/>
</copy>
Modified: lenya/trunk/src/targets/init-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/init-build.xml?view=diff&r1=157846&r2=157847
==============================================================================
--- lenya/trunk/src/targets/init-build.xml (original)
+++ lenya/trunk/src/targets/init-build.xml Wed Mar 16 17:24:26 2005
@@ -57,8 +57,6 @@
</target>
<target name="build-custom-tasks" depends="init">
- <echo>INFO: Building Custom Tasks</echo>
-
<mkdir dir="${build.dir}/tools/anttasks"/>
<javac srcdir="src/java"
destdir="${build.dir}/tools/anttasks"
@@ -88,7 +86,7 @@
</target>
<target name="build-cocoon" depends="init" unless="cocoon.build.webapp.dir.exists">
- <echo>Building Cocoon with our properties</echo>
+ <!-- Building Cocoon with our properties -->
<copy todir="${cocoon.src.dir}" filtering="off">
<fileset dir="${src.cocoon.properties.dir}"/>
</copy>
@@ -98,10 +96,6 @@
<!-- Prepare cocoon unless this is a gump build -->
<target name="prepare-cocoon" depends="check-cocoon" unless="gump.skipcocoonbuild">
<taskdef name="xpatch" classname="XConfToolTask" classpath="${tools.tasks.dest}"/>
- <echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
- <echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
- <echo>INFO: exclude: WEB-INF/web.xml</echo>
- <echo>INFO: exclude: **/javac.jar</echo>
<copy todir="${build.webapp}" filtering="off">
<fileset dir="${cocoon.webapp.dir}">
<exclude name="*.xml"/>
@@ -119,7 +113,6 @@
includes="src/confpatch/*.xmap"/>
<!-- patch cocoon.xconf -->
- <echo>INFO: patching cocoon.xconf with XSLT stylesheet</echo>
<xslt
in="${cocoon.webapp.dir}/WEB-INF/cocoon.xconf"
out="${build.webapp}/WEB-INF/cocoon.xconf"
@@ -130,7 +123,6 @@
</xslt>
<!-- patch logkit.xconf -->
- <echo>INFO: patching logkit.xconf with XSLT stylesheet</echo>
<xslt
in="${cocoon.webapp.dir}/WEB-INF/logkit.xconf"
out="${build.webapp}/WEB-INF/logkit.xconf"
@@ -140,7 +132,6 @@
</xslt>
<!-- patch web.xml -->
- <echo>INFO: patching web.xml with XSLT stylesheet</echo>
<xslt
in="${cocoon.webapp.dir}/WEB-INF/web.xml"
out="${build.webapp}/WEB-INF/web.xml"
@@ -159,7 +150,6 @@
<!-- patch sitemap.xmap -->
<!-- Copy Entities
- <echo>INFO: Copy publication-specific entities to Cocoon catalog</echo>
<copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="${src.entities.dir}" builddir="${build.webapp}/${build.entities.dir}" />
-->
</target>
@@ -176,8 +166,7 @@
<!-- Prepares the source code -->
<!-- ============================================================ -->
<target name="prepare-src" depends="prepare, build-custom-tasks">
-
- <echo>INFO: Copy java source files from ${java.dir} to ${build.src}</echo>
+ <!-- Copy java source files from ${java.dir} to ${build.src} -->
<copy todir="${build.src}" filtering="on">
<fileset dir="${java.dir}">
<exclude name="log4j-properties.xsl"/>
@@ -185,10 +174,10 @@
</copy>
<!-- FIXME: Use bulkCopy task in the future; needs regexp mapper which is part of ant optional package. -->
- <echo>INFO: Copy java source files from ${pubs.root.dirs} to ${build.src}</echo>
+ <!-- Copy java source files from ${pubs.root.dirs} to ${build.src} -->
<copyJavaSources pubsrootdirs="${pubs.root.dirs}" javadir="java/src" builddir="${build.src}" />
- <echo>INFO: Copy publication specific libraries from ${pubs.root.dirs} (java/lib) to ${build.webapp}/WEB-INF/lib</echo>
+ <!-- Copy publication specific libraries from ${pubs.root.dirs} (java/lib) to ${build.webapp}/WEB-INF/lib -->
<bulkCopy
sourcedirs="${pubs.root.dirs}"
todir="${build.webapp}/WEB-INF/lib"
Modified: lenya/trunk/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/targets/webapp-build.xml?view=diff&r1=157846&r2=157847
==============================================================================
--- lenya/trunk/src/targets/webapp-build.xml (original)
+++ lenya/trunk/src/targets/webapp-build.xml Wed Mar 16 17:24:26 2005
@@ -41,7 +41,6 @@
<!--
Copy CMS files and overwrite some parts of the previously unpacked cocoon webapp package with our customized files
-->
- <echo>INFO: Copy files from ${src.webapp.dir} to ${build.webapp}</echo>
<copy todir="${build.webapp}">
<fileset dir="${src.webapp.dir}">
<exclude name="lenya/pubs/**"/>
@@ -52,12 +51,10 @@
</copy>
<!-- Copy publications -->
- <echo>INFO: Copy publications from ${src.webapp.dir}/lenya/pubs to ${build.webapp}/lenya/pubs</echo>
<copyPubs todir="${build.webapp}/lenya/pubs" pubsrootdirs="${pubs.root.dirs}" excludes="CVS,.svn">
</copyPubs>
<!-- Patch cocoon.xconf -->
- <echo>INFO: Patch cocoon.xconf with publication-specific changes</echo>
<copy file="${build.webapp}/WEB-INF/cocoon.xconf"
toFile="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"/>
<xpatch file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"
@@ -80,7 +77,6 @@
<!-- Patch web.xml -->
<!--
- <echo>INFO: Patch web.xml</echo>
<xpatch file="${build.webapp}/WEB-INF/web.xml"
srcdir="${build.webapp}/lenya/pubs"
includes="*/config/web.xml"
@@ -88,7 +84,6 @@
-->
<!-- Patch publication tests -->
- <echo>INFO: Patch publication tests</echo>
<copy file="./src/targets/publication-test-build-template.xml"
tofile="./src/targets/publication-test-build.xml"
overwrite="true"/>
@@ -101,7 +96,6 @@
<mkdir dir="${build.webapp}/WEB-INF/classes"/>
<!-- now copy our compiled classes -->
- <echo>INFO: Copy classes from ${build.dest} to ${build.webapp}/WEB-INF/classes</echo>
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.dest}">
<include name="**/*.class"/>
@@ -109,7 +103,6 @@
</copy>
<!-- now copy our logicsheets -->
- <echo>INFO: Copy logicsheets from ${build.src} to ${build.webapp}/WEB-INF/classes</echo>
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.src}">
<include name="**/*.xsl"/>
@@ -117,7 +110,6 @@
</copy>
<!-- now copy our properties -->
- <echo>INFO: Copy properties from ${build.src} to ${build.webapp}/WEB-INF/classes</echo>
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.src}">
<include name="**/*.properties"/>
@@ -125,7 +117,6 @@
</copy>
<!-- now copy our xml configuration files -->
- <echo>INFO: Copy xml configuration files from ${build.src} to ${build.webapp}/WEB-INF/classes</echo>
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.src}">
<include name="**/*.xml"/>
@@ -133,7 +124,6 @@
</copy>
<!-- now copy our roles -->
- <echo>INFO: Copy properties from ${build.src} to ${build.webapp}/WEB-INF/classes</echo>
<copy todir="${build.webapp}/WEB-INF/classes">
<fileset dir="${build.src}">
<include name="**/*.roles"/>
@@ -141,13 +131,12 @@
</copy>
<!-- now create logs directory, where log4j can write to -->
- <echo>INFO: Create logs directory ${build.webapp}/WEB-INF/logs</echo>
<mkdir dir="${build.webapp}/WEB-INF/logs"/>
<!-- now copy any additional libraries in ./lib -->
<mkdir dir="${build.webapp}/WEB-INF/lib"/>
- <echo>INFO: Copy libraries from ${lib.dir} and ${tools.lib.dir} to ${build.webapp}/WEB-INF/lib</echo>
+ <!-- Copy libraries from ${lib.dir} and ${tools.lib.dir} to ${build.webapp}/WEB-INF/lib -->
<copy todir="${build.webapp}/WEB-INF/lib">
<fileset dir="${lib.dir}">
<include name="**/*"/>
@@ -171,7 +160,6 @@
<!-- Copy cocoon.xconf -->
<target name="copy-cocoon.xconf" if="cocoon.xconf.copy">
- <echo>INFO: Apply new cocoon.xconf.</echo>
<copy
file="${build.webapp}/WEB-INF/cocoon.xconf.ant_patch"
toFile="${build.webapp}/WEB-INF/cocoon.xconf"/>
@@ -181,7 +169,7 @@
The war target just packs up what was created in the webapp target
(and triggers the javadoc target with the dependency)
-->
- <target name="war" depends="webapp, javadocs" description="Builds the deployable war file">
+ <target name="war" depends="webapp" description="Builds the deployable war file">
<mkdir dir="${dist.bin.dir}"/>
<jar jarfile="${dist.bin.warfile}" basedir="${build.webapp}" excludes="META-INF/MANIFEST.MF"/>
</target>
@@ -192,28 +180,23 @@
<target name="reset" depends="clean" description="Resets the deployment by also cleaning the servlet engine context">
<!-- Empty server cache - this directory is set in the "local.build.properties" file -->
- <echo>INFO: Delete Tomcat Cache Dir: ${tomcat.cache.dir}</echo>
<delete dir="${tomcat.cache.dir}"/>
<mkdir dir="${tomcat.webapps.dir}" />
- <echo>INFO: Delete Tomcat Lenya Webapp Dir: ${tomcat.webapps.dir}</echo>
<delete includeEmptyDirs="true">
<fileset dir="${tomcat.webapps.dir}" excludes="${target.reset.excludes}" />
</delete>
</target>
-
-
<!-- ============================================================ -->
<!-- Install webapp -->
<!-- ============================================================ -->
<target name="install" depends="webapp" description="Install the webapp into servlet engine context">
- <echo>INFO: Copy webapp to Tomcat</echo>
- <echo>INFO: Copy From build.webapp=${build.webapp} To tomcat.webapps.dir=${tomcat.webapps.dir}</echo>
+ <!-- Copy From build.webapp=${build.webapp} To tomcat.webapps.dir=${tomcat.webapps.dir} -->
<copy todir="${tomcat.webapps.dir}" filtering="off">
<fileset dir="${build.webapp}" excludes="${target.install.excludes}"/>
</copy>
- <echo>INFO: Copy endorsed libraries</echo>
+ <!-- Copy endorsed libraries -->
<copy todir="${tomcat.endorsed.dir}">
<fileset dir="${build.webapp}/WEB-INF/lib/">
<include name="xercesImpl-*.jar"/>
@@ -229,14 +212,11 @@
<!-- Install publication -->
<!-- ============================================================ -->
<target name="install-pub" depends="webapp" description="Install a publication into servlet engine context. Usage: -Dpub.prefix=blog">
- <echo>INFO: Copy publication ${pub.prefix} to Tomcat</echo>
- <echo>INFO: Copy From build.webapp=${build.webapp}/lenya/pubs/${pub.prefix} To tomcat.webapps.dir=${tomcat.webapps.dir}/lenya/pubs/${pub.prefix}</echo>
+ <!-- Copy From build.webapp=${build.webapp}/lenya/pubs/${pub.prefix} To tomcat.webapps.dir=${tomcat.webapps.dir}/lenya/pubs/${pub.prefix} -->
<copy todir="${tomcat.webapps.dir}/lenya/pubs/${pub.prefix}" filtering="off">
<fileset dir="${build.webapp}/lenya/pubs/${pub.prefix}" excludes="${target.install.excludes}"/>
</copy>
</target>
-
-
<!-- ============================================================ -->
<!-- Reload Tomcat -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org