vgritsenko 2003/12/25 13:09:12
Modified: . build.bat build.properties build.sh build.xml
contributor.xml
Log:
fix contributor.xml
do not copy xerces/xalan to tools/lib - not needed anymore; build/endorsed
used instead.
Revision Changes Path
1.8 +2 -7 xml-xindice/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-xindice/build.bat,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.bat 23 Dec 2003 12:05:07 -0000 1.7
+++ build.bat 25 Dec 2003 21:09:12 -0000 1.8
@@ -5,12 +5,7 @@
rem $Id$
rem
----------------------------------------------------------------------------
-rem ----- Copy Xalan and Xerces for the build system
------------------------
-if not exist "tools\lib\xerces*.jar" copy java\lib\xerces*.jar tools\lib
-if not exist "tools\lib\xalan*.jar" copy java\lib\xalan*.jar tools\lib
-if not exist "tools\lib\xml-api*.jar" copy java\lib\xml-api*.jar tools\lib
-
-rem ----- Create endorsed lib for the Java
------------------------
+rem ----- Create endorsed lib for the Java
-------------------------------------
if not exist "build" mkdir build
if not exist "build\endorsed" mkdir build\endorsed
if not exist "build\endorsed\xerces*.jar" copy java\lib\xerces*.jar
build\endorsed
1.6 +4 -4 xml-xindice/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/xml-xindice/build.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.properties 22 Dec 2003 02:15:38 -0000 1.5
+++ build.properties 25 Dec 2003 21:09:12 -0000 1.6
@@ -80,9 +80,9 @@
project.year=1999-2003
# Source directories
-documentation.dir=${basedir}/src/documentation
-config.dir=${basedir}/config
-tools.dir=${basedir}/tools/lib
+documentation.dir=src/documentation
+config.dir=config
+tools.dir=tools
bin.dir=bin
root.dir=java
jar.dir=${root.dir}/lib
1.7 +3 -7 xml-xindice/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-xindice/build.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.sh 12 Dec 2003 15:39:40 -0000 1.6
+++ build.sh 25 Dec 2003 21:09:12 -0000 1.7
@@ -5,15 +5,11 @@
echo "Apache Xindice Build System"
echo "--------------------------"
-cp java/lib/xalan*.jar tools/lib
-cp java/lib/xerces*.jar tools/lib
-cp java/lib/xml-api*.jar tools/lib
-
-if [ -f build ]
+if [ ! -d build ]
then
mkdir build
fi
-if [ -f build/endorsed ]
+if [ ! -d build/endorsed ]
then
mkdir build/endorsed
fi
1.66 +6 -4 xml-xindice/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-xindice/build.xml,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- build.xml 23 Dec 2003 12:05:56 -0000 1.65
+++ build.xml 25 Dec 2003 21:09:12 -0000 1.66
@@ -25,6 +25,7 @@
-->
<project name="xml-xindice" default="release" basedir=".">
+
<!--
- Give the chance to overwrite the definitions by setting the
- build.properties file.
@@ -44,7 +45,7 @@
<fileset dir="${jar.dir}" id="servlet.jars">
<include name="servlet*.jar"/>
</fileset>
- <fileset dir="${tools.dir}" id="endorsed.jars">
+ <fileset dir="${tools.dir}/lib" id="tools.jars">
<include name="*.jar"/>
</fileset>
@@ -54,7 +55,7 @@
<pathelement location="${src.build.dir}"/>
<fileset refid="core.jars"/>
<fileset refid="servlet.jars"/>
- <fileset refid="endorsed.jars"/>
+ <fileset refid="tools.jars"/>
</path>
<target name="init" description="Initializes the build">
@@ -359,7 +360,8 @@
</sourcepath>
<classpath>
<fileset refid="core.jars"/>
- <fileset refid="endorsed.jars"/>
+ <fileset refid="servlet.jars"/>
+ <fileset refid="tools.jars"/>
</classpath>
</javadoc>
</target>
1.11 +17 -16 xml-xindice/contributor.xml
Index: contributor.xml
===================================================================
RCS file: /home/cvs/xml-xindice/contributor.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- contributor.xml 10 Sep 2003 02:17:55 -0000 1.10
+++ contributor.xml 25 Dec 2003 21:09:12 -0000 1.11
@@ -83,11 +83,11 @@
<!-- creates the war zip release -->
<zip destfile="${dist.dir}/xindice-${project.version}-war.zip">
- <zipfileset dir="." includes="LICENSE,README" prefix=""/>
- <zipfileset dir="${dist.dir}"
includes="xindice-${project.version}.xml,xindice-${project.version}.war"
prefix=""/>
+ <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}"/>
- <zipfileset dir="${build.dir}/site" excludes="api/index.html"
prefix="docs"/>
- <zipfileset dir="${api.dir}" prefix="docs/api"/>
+ <zipfileset dir="${build.dir}/site" excludes="api/index.html"
prefix="xindice-${project.version}/docs"/>
+ <zipfileset dir="${api.dir}"
prefix="xindice-${project.version}/docs/api"/>
</zip>
<tar destfile="${build.dir}/xindice-${project.version}-war.tar">
@@ -98,8 +98,9 @@
<include name="README"/>
</tarfileset>
<tarfileset dir="${dist.dir}"
- prefix="xindice-${project.version}/${dist.dir}"
+ prefix="xindice-${project.version}"
preserveLeadingSlashes="true">
+ <include name="xindice-${project.version}.xml"/>
<include name="xindice-${project.version}.war"/>
</tarfileset>
<tarfileset dir="${build.dir}/site"
@@ -124,6 +125,7 @@
<zipfileset dir="${bin.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${bin.dir}"/>
<zipfileset dir="${jar.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${jar.dir}"/>
<zipfileset dir="${tools.dir}" excludes="CVS*"
prefix="xindice-${project.version}/${tools.dir}"/>
+ <zipfileset dir="${config.dir}" excludes="CVS*"
prefix="xindice-${project.version}/config"/>
<zipfileset dir="${root.dir}/examples" excludes="CVS*"
prefix="xindice-${project.version}/${root.dir}/examples"/>
<zipfileset dir="${root.dir}/src" excludes="CVS*"
prefix="xindice-${project.version}/${root.dir}/src"/>
@@ -143,43 +145,42 @@
mode="755"
prefix="xindice-${project.version}/${bin.dir}"
preserveLeadingSlashes="true">
- <include name="xindice*"/>
- <include name="lcp*"/>
+ <exclude name="CVS*"/>
</tarfileset>
<tarfileset dir="${jar.dir}"
prefix="xindice-${project.version}/${jar.dir}"
preserveLeadingSlashes="true">
- <include name="*.jar"/>
- <include name="*.LICENSE"/>
+ <exclude name="CVS*"/>
</tarfileset>
<tarfileset dir="${tools.dir}"
prefix="xindice-${project.version}/${tools.dir}"
preserveLeadingSlashes="true">
- <include name="*.jar"/>
- <include name="*.LICENSE"/>
+ <exclude name="CVS*"/>
+ </tarfileset>
+ <tarfileset dir="${config.dir}"
+ prefix="xindice-${project.version}/${config.dir}"
+ preserveLeadingSlashes="true">
+ <exclude name="CVS*"/>
</tarfileset>
+
<tarfileset dir="${root.dir}/examples"
prefix="xindice-${project.version}/${root.dir}/examples"
preserveLeadingSlashes="true">
- <include name="**"/>
<exclude name="CVS*"/>
</tarfileset>
<tarfileset dir="${root.dir}/src"
prefix="xindice-${project.version}/${root.dir}/src"
preserveLeadingSlashes="true">
- <include name="**"/>
<exclude name="CVS*"/>
</tarfileset>
<tarfileset dir="${root.dir}/tests"
prefix="xindice-${project.version}/${root.dir}/tests"
preserveLeadingSlashes="true">
- <include name="**"/>
<exclude name="CVS*"/>
</tarfileset>
<tarfileset dir="${documentation.dir}"
prefix="xindice-${project.version}/${documentation.dir}"
preserveLeadingSlashes="true">
- <include name="**"/>
<exclude name="CVS*"/>
</tarfileset>
</tar>
