You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by eh...@apache.org on 2005/05/07 01:43:56 UTC
svn commit: r168986 - in /lucene/java/trunk: build.xml common-build.xml
contrib/contrib-build.xml
Author: ehatcher
Date: Fri May 6 16:43:54 2005
New Revision: 168986
URL: http://svn.apache.org/viewcvs?rev=168986&view=rev
Log:
prefix all JARs with lucene-
Modified:
lucene/java/trunk/build.xml
lucene/java/trunk/common-build.xml
lucene/java/trunk/contrib/contrib-build.xml
Modified: lucene/java/trunk/build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/build.xml?rev=168986&r1=168985&r2=168986&view=diff
==============================================================================
--- lucene/java/trunk/build.xml (original)
+++ lucene/java/trunk/build.xml Fri May 6 16:43:54 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="lucene" default="default" basedir=".">
+<project name="core" default="default" basedir=".">
<import file="common-build.xml"/>
@@ -10,7 +10,7 @@
-->
<import file="build-deprecated.xml"/>
- <property name="demo.name" value="${name}-demos-${version}"/>
+ <property name="demo.name" value="lucene-demos-${version}"/>
<property name="demo.war.name" value="luceneweb"/>
<property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
@@ -195,7 +195,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar-core, javadocs, war-demo, build-contrib">
+ <target name="package" depends="jar-core, javadocs, jjdoc, war-demo, build-contrib">
<mkdir dir="${dist.dir}"/>
</target>
@@ -207,12 +207,12 @@
<target name="package-zip" depends="package"
description="--> Generates the Lucene distribution as .zip">
- <delete file="${dist.dir}/${final.name}.zip"/>
- <zip destfile="${dist.dir}/${final.name}.zip">
- <zipfileset prefix="${final.name}" dir=".">
+ <delete file="${dist.dir}/lucene-${version}.zip"/>
+ <zip destfile="${dist.dir}/lucene-${version}.zip">
+ <zipfileset prefix="lucene-${version}" dir=".">
<patternset refid="binary.root.dist.patterns"/>
</zipfileset>
- <zipfileset prefix="${final.name}" dir="${build.dir}">
+ <zipfileset prefix="lucene-${version}" dir="${build.dir}">
<patternset refid="binary.build.dist.patterns"/>
</zipfileset>
</zip>
@@ -226,19 +226,19 @@
<target name="package-tgz" depends="package"
description="--> Generates the lucene distribution as .tar.gz">
- <delete file="${build.dir}/${final.name}.tar"/>
- <delete file="${dist.dir}/${final.name}.tar.gz"/>
- <tar tarfile="${build.dir}/${final.name}.tar">
- <tarfileset prefix="${final.name}" dir=".">
+ <delete file="${build.dir}/lucene-${version}.tar"/>
+ <delete file="${dist.dir}/lucene-${version}.tar.gz"/>
+ <tar tarfile="${build.dir}/lucene-${version}.tar">
+ <tarfileset prefix="lucene-${version}" dir=".">
<patternset refid="binary.root.dist.patterns"/>
</tarfileset>
- <tarfileset prefix="${final.name}" dir="${build.dir}">
+ <tarfileset prefix="lucene-${version}" dir="${build.dir}">
<patternset refid="binary.build.dist.patterns"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.dir}/${final.name}.tar.gz"
- src="${build.dir}/${final.name}.tar"
+ <gzip zipfile="${dist.dir}/lucene-${version}.tar.gz"
+ src="${build.dir}/lucene-${version}.tar"
/>
</target>
@@ -268,8 +268,8 @@
<!-- ================================================================== -->
<target name="package-zip-src" depends="init"
description="--> Generates the Lucene sources as .zip">
- <zip destfile="${dist.dir}/${final.name}-src.zip">
- <zipfileset prefix="${final.name}" dir=".">
+ <zip destfile="${dist.dir}/lucene-${version}-src.zip">
+ <zipfileset prefix="lucene-${version}" dir=".">
<patternset refid="src.dist.patterns"/>
</zipfileset>
</zip>
@@ -283,16 +283,16 @@
<target name="package-tgz-src" depends="init"
description="--> Generates the Lucene distribution as .tar.gz">
- <delete file="${build.dir}/${final.name}-src.tar"/>
- <delete file="${dist.dir}/${final.name}-src.tar.gz"/>
- <tar tarfile="${build.dir}/${final.name}-src.tar">
- <tarfileset prefix="${final.name}" dir=".">
+ <delete file="${build.dir}/lucene-${version}-src.tar"/>
+ <delete file="${dist.dir}/lucene-${version}-src.tar.gz"/>
+ <tar tarfile="${build.dir}/lucene-${version}-src.tar">
+ <tarfileset prefix="lucene-${version}" dir=".">
<patternset refid="src.dist.patterns"/>
</tarfileset>
</tar>
- <gzip zipfile="${dist.dir}/${final.name}-src.tar.gz"
- src="${build.dir}/${final.name}-src.tar"
+ <gzip zipfile="${dist.dir}/lucene-${version}-src.tar.gz"
+ src="${build.dir}/lucene-${version}-src.tar"
/>
</target>
@@ -322,10 +322,6 @@
outputfile="${build.dir}/docs/grammars/QueryParser.html"
javacchome="${javacc.home}"
/>
- <jjdoc target="src/java/org/apache/lucene/queryParser/precedence/PrecedenceQueryParser.jj"
- outputfile="${build.dir}/docs/grammars/PrecedenceQueryParser.html"
- javacchome="${javacc.home}"
- />
<jjdoc target="src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj"
outputfile="${build.dir}/docs/grammars/StandardTokenizer.html"
javacchome="${javacc.home}"
@@ -348,8 +344,6 @@
</target>
<target name="javacc" depends="clean-javacc,javacc-StandardAnalyzer,javacc-QueryParser,javacc-PrecedenceQueryParser,javacc-HTMLParser"/>
-
-
<target name="javacc-StandardAnalyzer" depends="init,javacc-check" if="javacc.present">
<!-- generate this in a build directory so we can exclude ParseException -->
Modified: lucene/java/trunk/common-build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/common-build.xml?rev=168986&r1=168985&r2=168986&view=diff
==============================================================================
--- lucene/java/trunk/common-build.xml (original)
+++ lucene/java/trunk/common-build.xml Fri May 6 16:43:54 2005
@@ -23,7 +23,7 @@
<property name="Name" value="Lucene"/>
<property name="version" value="1.9-rc1-dev"/>
<property name="year" value="2000-${current.year}"/>
- <property name="final.name" value="${name}-${version}"/>
+ <property name="final.name" value="lucene-${name}-${version}"/>
<property name="javac.deprecation" value="on"/>
<property name="javac.debug" value="on"/>
Modified: lucene/java/trunk/contrib/contrib-build.xml
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/contrib/contrib-build.xml?rev=168986&r1=168985&r2=168986&view=diff
==============================================================================
--- lucene/java/trunk/contrib/contrib-build.xml (original)
+++ lucene/java/trunk/contrib/contrib-build.xml Fri May 6 16:43:54 2005
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-
<project name="contrib-build">
<echo>Building ${ant.project.name}...</echo>
- <!-- TODO: adjust build.dir appropriately when a contrib project is run individually -->
+ <!-- TODO: adjust build.dir/dist.dir appropriately when a contrib project is run individually -->
<property name="build.dir" location="../../build/contrib/${ant.project.name}"/>
+ <property name="dist.dir" location="../../dist/contrib/${ant.project.name}"/>
<import file="../common-build.xml"/>
- <property name="lucene.jar" location="${common.dir}/build/lucene-${version}.jar"/>
+ <property name="lucene.jar" location="${common.dir}/build/lucene-core-${version}.jar"/>
<available property="lucene.jar.present" type="file" file="${lucene.jar}"/>
<path id="classpath">