vgritsenko 2004/01/23 13:31:03
Modified: . build.xml contributor.xml
Log:
Add config to src distr. Split publish target.
Revision Changes Path
1.71 +6 -6 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- build.xml 15 Jan 2004 13:32:18 -0000 1.70
+++ build.xml 23 Jan 2004 21:31:03 -0000 1.71
@@ -287,11 +287,11 @@
<delete
file="${dist.dir}/${project.filename}-${project.version}.jar"/>
</target>
<target name="war-release" depends="jar-release">
- <mkdir dir="${build.dir}/webapp"/>
+ <mkdir dir="${build.dir}/war-bin"/>
<copy file="${config.dir}/xindice.xml"
toFile="${dist.dir}/xindice-${project.version}.xml" filtering="on"/>
- <copy file="${bin.dir}/xindice.war.bat"
toFile="${build.dir}/webapp/xindice.bat" filtering="on"/>
- <copy file="${bin.dir}/xindice.war.sh"
toFile="${build.dir}/webapp/xindice.sh" filtering="on"/>
- <copy file="${bin.dir}/lcp.bat" toFile="${build.dir}/webapp/lcp.bat"
filtering="on"/>
+ <copy file="${bin.dir}/xindice.war.bat"
toFile="${build.dir}/war-bin/xindice.bat" filtering="on"/>
+ <copy file="${bin.dir}/xindice.war.sh"
toFile="${build.dir}/war-bin/xindice.sh" filtering="on"/>
+ <copy file="${bin.dir}/lcp.bat"
toFile="${build.dir}/war-bin/lcp.bat" filtering="on"/>
<war
destfile="${dist.dir}/${project.filename}-${project.version}.war"
update="false" webxml="config/web.xml">
<classes dir="${src.build.dir}"/>
<webinf dir="${config.dir}">
@@ -300,7 +300,7 @@
<webinf dir=".">
<include name="${config.dir}/commands.xml"/>
</webinf>
- <webinf dir="${build.dir}/webapp">
+ <webinf dir="${build.dir}/war-bin">
<include name="*"/>
</webinf>
<lib refid="core.jars"/>
1.13 +31 -8 xml-xindice/contributor.xml
Index: contributor.xml
===================================================================
RCS file: /home/cvs/xml-xindice/contributor.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- contributor.xml 22 Jan 2004 20:55:19 -0000 1.12
+++ contributor.xml 23 Jan 2004 21:31:03 -0000 1.13
@@ -20,19 +20,23 @@
<property file="build.properties" />
<property environment="ENVIRONMENT"/>
- <target name="all" depends="forrest, publish"/>
-
+ <!--
+ - Build Xindice Website
+ -->
<target name="forrest">
<ant antfile="${forrest.home}/forrest.antproxy.xml" target="site"/>
</target>
- <target name="publish">
- <!-- creates the jar zip release -->
+ <!--
+ - Build Jar Releases (zip, tar.gz)
+ -->
+ <target name="release-jar">
<zip destfile="${dist.dir}/xindice-${project.version}-jar.zip">
<zipfileset dir="." includes="LICENSE,README"
prefix="xindice-${project.version}"/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.jar" prefix="xindice-${project.version}"/>
<zipfileset dir="${bin.dir}" includes="lcp*,xindice*"
excludes="xindice.war*" prefix="xindice-${project.version}/${bin.dir}"/>
<zipfileset dir="${jar.dir}" includes="*.jar,*.LICENSE"
excludes="ant*.jar,junit*.jar" prefix="xindice-${project.version}/lib"/>
+ <zipfileset dir="${config.dir}"
excludes="CVS*,web.xml,xindice.xml,vm.cfg"
prefix="xindice-${project.version}/config"/>
<zipfileset dir="${build.dir}/site" excludes="api/index.html"
prefix="xindice-${project.version}/docs"/>
<zipfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"/>
@@ -58,6 +62,14 @@
<include name="lcp*"/>
<exclude name="xindice.war*"/>
</tarfileset>
+ <tarfileset dir="${config.dir}"
+ prefix="xindice-${project.version}/${config.dir}"
+ preserveLeadingSlashes="true">
+ <exclude name="CVS*"/>
+ <exclude name="web.xml"/>
+ <exclude name="xindice.xml"/>
+ <exclude name="vm.cfg"/>
+ </tarfileset>
<tarfileset dir="${jar.dir}"
prefix="xindice-${project.version}/lib"
preserveLeadingSlashes="true">
@@ -80,8 +92,12 @@
<gzip src="${build.dir}/xindice-${project.version}-jar.tar"
zipfile="${dist.dir}/xindice-${project.version}-jar.tar.gz"/>
+ </target>
- <!-- creates the war zip release -->
+ <!--
+ - Build War Releases (zip, tar.gz)
+ -->
+ <target name="release-war">
<zip destfile="${dist.dir}/xindice-${project.version}-war.zip">
<zipfileset dir="." includes="LICENSE,README"
prefix="xindice-${project.version}"/>
<zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.xml,xindice-${project.version}.war"
prefix="xindice-${project.version}"/>
@@ -118,8 +134,12 @@
<gzip src="${build.dir}/xindice-${project.version}-war.tar"
zipfile="${dist.dir}/xindice-${project.version}-war.tar.gz"/>
+ </target>
- <!-- creates the src zip release -->
+ <!--
+ - Build Src Releases (zip, tar.gz)
+ -->
+ <target name="release-src">
<zip destfile="${dist.dir}/xindice-${project.version}-src.zip">
<zipfileset dir="." includes="LICENSE,README,build.*"
prefix="xindice-${project.version}"/>
<zipfileset dir="${bin.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${bin.dir}"/>
@@ -187,9 +207,10 @@
<gzip src="${build.dir}/xindice-${project.version}-src.tar"
zipfile="${dist.dir}/xindice-${project.version}-src.tar.gz"/>
-
</target>
+ <target name="publish" depends="release-jar, release-war, release-src"/>
+
<!--
- PMD is a tool that checks for various code mistakes, like unused
- variables. To ensure a good code quality, please executes this task
@@ -310,4 +331,6 @@
<delete file="${eclipse.temp}/classpath-temp.xml"/>
</target>
+
+ <target name="all" depends="forrest, publish"/>
</project>
