You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/03/08 15:53:09 UTC
svn commit: r1079380 - in /lucene/dev/trunk: ./ lucene/ solr/
solr/contrib/analysis-extras/ solr/contrib/clustering/
solr/contrib/dataimporthandler/ solr/contrib/extraction/ solr/contrib/uima/
Author: sarowe
Date: Tue Mar 8 14:53:08 2011
New Revision: 1079380
URL: http://svn.apache.org/viewvc?rev=1079380&view=rev
Log:
SOLR-2411: solr/dist/ should only contain distribution files, not intermediate .jars/.war
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/build.xml
lucene/dev/trunk/solr/common-build.xml
lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
lucene/dev/trunk/solr/contrib/clustering/build.xml
lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
lucene/dev/trunk/solr/contrib/extraction/build.xml
lucene/dev/trunk/solr/contrib/uima/build.xml
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Tue Mar 8 14:53:08 2011
@@ -252,7 +252,7 @@
<fileset dir="${lib}">
<include name="lucene-*.jar"/>
</fileset>
- <fileset dir="${dist}">
+ <fileset dir="${dist-work}">
<include name="*.jar"/>
<exclude name="*solrj*.jar"/>
</fileset>
@@ -600,8 +600,8 @@
<target name="dist-war"
description="Creates the Solr WAR Distribution file."
depends="compile, test-jsp, make-manifest, dist-jar, dist-solrj, lucene-jars-to-solr">
- <mkdir dir="${dist}" />
- <war destfile="${dist}/${fullnamever}.war"
+ <mkdir dir="${dist-work}" />
+ <war destfile="${dist-work}/${fullnamever}.war"
webxml="${web.xml}"
filesetmanifest="skip"
manifest="${dest}/META-INF/MANIFEST.MF">
@@ -615,7 +615,7 @@
<lib dir="${lucene-libs}"/>
- <lib dir="${dist}">
+ <lib dir="${dist-work}">
<include name="${fullname}-solrj-${version}.jar" />
<include name="${fullname}-core-${version}.jar" />
</lib>
@@ -630,30 +630,30 @@
<target name="dist-src" description="Creates the Solr source distribution files"
depends="make-manifest">
- <mkdir dir="${dist}" />
+ <mkdir dir="${dist-work}" />
- <solr-jar destfile="${dist}/${fullname}-solrj-src-${version}.jar">
+ <solr-jar destfile="${dist-work}/${fullname}-solrj-src-${version}.jar">
<fileset dir="${src}/common" />
<fileset dir="${src}/solrj"/>
</solr-jar>
- <solr-jar destfile="${dist}/${fullname}-core-src-${version}.jar">
+ <solr-jar destfile="${dist-work}/${fullname}-core-src-${version}.jar">
<fileset dir="${src}/java" />
<fileset dir="${src}/webapp/src"/>
</solr-jar>
- <solr-jar destfile="${dist}/apache-solr-dataimporthandler-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-dataimporthandler-src-${version}.jar"
basedir="contrib/dataimporthandler/src/main/java" />
- <solr-jar destfile="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-dataimporthandler-extras-src-${version}.jar"
basedir="contrib/dataimporthandler/src/extras/main/java" />
- <solr-jar destfile="${dist}/apache-solr-cell-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-cell-src-${version}.jar"
basedir="contrib/extraction/src" />
- <solr-jar destfile="${dist}/apache-solr-clustering-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-clustering-src-${version}.jar"
basedir="contrib/clustering/src" />
- <solr-jar destfile="${dist}/apache-solr-analysis-extras-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-analysis-extras-src-${version}.jar"
basedir="contrib/analysis-extras/src" />
- <solr-jar destfile="${dist}/apache-solr-uima-src-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-uima-src-${version}.jar"
basedir="contrib/uima/src/main/java" >
<fileset dir="contrib/uima/src/main/resources" />
</solr-jar>
@@ -661,21 +661,21 @@
<target name="dist-javadoc" description="Creates the Solr javadoc distribution files"
depends="make-manifest, javadoc">
- <mkdir dir="${dist}" />
+ <mkdir dir="${dist-work}" />
- <solr-jar destfile="${dist}/${fullname}-core-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/${fullname}-core-docs-${version}.jar"
basedir="${build.javadoc}/solr" />
- <solr-jar destfile="${dist}/${fullname}-solrj-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/${fullname}-solrj-docs-${version}.jar"
basedir="${build.javadoc}/solrj" />
- <solr-jar destfile="${dist}/apache-solr-dataimporthandler-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-dataimporthandler-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-dataimporthandler" />
- <solr-jar destfile="${dist}/apache-solr-clustering-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-clustering-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-clustering" />
- <solr-jar destfile="${dist}/apache-solr-cell-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-cell-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-cell" />
- <solr-jar destfile="${dist}/apache-solr-analysis-extras-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-analysis-extras-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-analysis-extras" />
- <solr-jar destfile="${dist}/apache-solr-uima-docs-${version}.jar"
+ <solr-jar destfile="${dist-work}/apache-solr-uima-docs-${version}.jar"
basedir="${build.javadoc}/contrib-solr-uima" />
</target>
@@ -683,8 +683,8 @@
<target name="dist-jar"
description="Creates the Solr JAR Distribution file."
depends="compile, make-manifest">
- <mkdir dir="${dist}" />
- <solr-jar destfile="${dist}/${fullname}-core-${version}.jar">
+ <mkdir dir="${dist-work}" />
+ <solr-jar destfile="${dist-work}/${fullname}-core-${version}.jar">
<fileset dir="${dest}/solr" />
</solr-jar>
@@ -694,13 +694,13 @@
<target name="dist-solrj"
description="Creates the Solr JAR Distribution file."
depends="compile-solrj, make-manifest">
- <mkdir dir="${dist}" />
+ <mkdir dir="${dist-work}" />
<solr-jar
- destfile="${dist}/${fullname}-solrj-${version}.jar"
+ destfile="${dist-work}/${fullname}-solrj-${version}.jar"
basedir="${dest}/solrj" />
- <mkdir dir="${dist}/solrj-lib" />
- <copy todir="${dist}/solrj-lib">
+ <mkdir dir="${dist-work}/solrj-lib" />
+ <copy todir="${dist-work}/solrj-lib">
<fileset dir="${lib}">
<include name="commons-codec-*.jar"/>
<include name="commons-io-*.jar"/>
@@ -717,7 +717,7 @@
<target name="example"
description="Creates a runnable example configuration."
depends="init-forrest-entities,compile-lucene,dist-contrib,dist-war,example-contrib">
- <copy file="${dist}/${fullnamever}.war"
+ <copy file="${dist-work}/${fullnamever}.war"
tofile="${example}/webapps/${ant.project.name}.war"/>
<jar destfile="${example}/exampledocs/post.jar"
basedir="${dest}/solr"
@@ -767,6 +767,7 @@
<target name="package-src"
description="Packages the Solr Source Distribution"
depends="dist">
+ <mkdir dir="${dist}"/>
<delete includeemptydirs="true">
<fileset dir="${example}/work" includes="**/*"/>
@@ -871,9 +872,9 @@
mode="755"
prefix="${fullnamever}"
includes="example/**/*.sh example/**/bin/" />
- <tarfileset dir="."
- prefix="${fullnamever}"
- includes="dist/*.jar dist/*.war dist/solrj-lib/*"
+ <tarfileset dir="${dist-work}"
+ prefix="${fullnamever}/dist"
+ includes="*.jar *.war solrj-lib/*"
excludes="**/*.tgz **/*.zip **/*.md5 **/*src*.jar **/*docs*.jar" />
<tarfileset dir="${build.docs}"
prefix="${fullnamever}/docs/" />
@@ -962,15 +963,8 @@
<sign-artifact input.file="${maven.dist.prefix}/solr-parent/${version}/solr-parent-${version}.pom" gpg.passphrase="${gpg.passphrase}"/>
</target>
- <target name="prepare-release" depends="clean, svn-up, build-site, package, sign-artifacts" description="Prototype helper for Committers. Assumes gpg is in the path">
-
- <tar destfile="${dist}/solr-maven.tar" longfile="gnu">
- <tarfileset dir="${dist}/maven" prefix="maven"/>
- </tar>
- <tar destfile="${dist}/solr.tar" longfile="gnu">
- <tarfileset dir="${dist}" includes="${fullnamever}.* solr-maven.tar" excludes="${fullnamever}.war"/>
- </tar>
- </target>
+ <target name="prepare-release" depends="clean, svn-up, build-site, package, sign-artifacts"
+ description="Prototype helper for Committers. Assumes gpg is in the path"/>
<target name="generate-maven-artifacts" depends="maven.ant.tasks-check,dist,dist-src,dist-javadoc">
<sequential>
@@ -1001,71 +995,71 @@
jar.file="lib/apache-solr-noggit-r944541.jar" />
<m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
- jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
+ jar.file="${dist-work}/apache-solr-dataimporthandler-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-dataimporthandler-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-dataimporthandler-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="contrib/dataimporthandler/src/extras/pom.xml"
- jar.file="${dist}/apache-solr-dataimporthandler-extras-${version}.jar">
+ jar.file="${dist-work}/apache-solr-dataimporthandler-extras-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-dataimporthandler-extras-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-dataimporthandler-extras-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-dataimporthandler-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="contrib/extraction/pom.xml"
- jar.file="${dist}/apache-solr-cell-${version}.jar">
+ jar.file="${dist-work}/apache-solr-cell-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-cell-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-cell-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-cell-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-cell-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="contrib/clustering/pom.xml"
- jar.file="${dist}/apache-solr-clustering-${version}.jar">
+ jar.file="${dist-work}/apache-solr-clustering-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-clustering-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-clustering-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-clustering-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-clustering-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="contrib/analysis-extras/pom.xml"
- jar.file="${dist}/apache-solr-analysis-extras-${version}.jar">
+ jar.file="${dist-work}/apache-solr-analysis-extras-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-analysis-extras-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-analysis-extras-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-analysis-extras-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-analysis-extras-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="contrib/uima/pom.xml"
- jar.file="${dist}/apache-solr-uima-${version}.jar">
+ jar.file="${dist-work}/apache-solr-uima-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-uima-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-uima-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-uima-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-uima-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="src/pom.xml"
- jar.file="${dist}/apache-solr-core-${version}.jar">
+ jar.file="${dist-work}/apache-solr-core-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-core-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-core-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-core-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-core-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="src/solrj/pom.xml"
- jar.file="${dist}/apache-solr-solrj-${version}.jar">
+ jar.file="${dist-work}/apache-solr-solrj-${version}.jar">
<artifact-attachments>
- <attach file="${dist}/apache-solr-solrj-src-${version}.jar" classifier="sources"/>
- <attach file="${dist}/apache-solr-solrj-docs-${version}.jar" classifier="javadoc"/>
+ <attach file="${dist-work}/apache-solr-solrj-src-${version}.jar" classifier="sources"/>
+ <attach file="${dist-work}/apache-solr-solrj-docs-${version}.jar" classifier="javadoc"/>
</artifact-attachments>
</m2-deploy>
<m2-deploy pom.xml="src/webapp/pom.xml"
- jar.file="${dist}/apache-solr-${version}.war"/>
+ jar.file="${dist-work}/apache-solr-${version}.war"/>
</sequential>
</target>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Tue Mar 8 14:53:08 2011
@@ -117,6 +117,8 @@
<!-- Destination for compiled classes and binaries -->
<property name="dest" value="build" />
+
+ <property name="dist-work" value="${common-solr.dir}/${dest}/dist-work"/>
<!-- Destination for Lucene jars -->
<property name="lucene-libs" location="lucene-libs" />
Modified: lucene/dev/trunk/solr/contrib/analysis-extras/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/analysis-extras/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/analysis-extras/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/analysis-extras/build.xml Tue Mar 8 14:53:08 2011
@@ -186,7 +186,7 @@
</fileset>
</copy>
-->
- <copy file="${dest}/${fullnamever}.jar" todir="${solr-path}/dist"/>
+ <copy file="${dest}/${fullnamever}.jar" todir="${dist-work}"/>
</target>
<target name="javadoc">
Modified: lucene/dev/trunk/solr/contrib/clustering/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/clustering/build.xml Tue Mar 8 14:53:08 2011
@@ -160,7 +160,7 @@
</fileset>
</copy>
-->
- <copy file="${dest}/${fullnamever}.jar" todir="${solr-path}/dist"/>
+ <copy file="${dest}/${fullnamever}.jar" todir="${dist-work}"/>
</target>
<target name="javadoc">
Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/dataimporthandler/build.xml Tue Mar 8 14:53:08 2011
@@ -277,8 +277,8 @@
</copy>
<mkdir dir="../../build/web/WEB-INF/lib"/>
<!--<copy file="target/${fullnamever}.jar" todir="${solr-path}/build/web/WEB-INF/lib"></copy>-->
- <copy file="target/${fullnamever}.jar" todir="${solr-path}/dist"></copy>
- <copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${solr-path}/dist"></copy>
+ <copy file="target/${fullnamever}.jar" todir="${dist-work}"/>
+ <copy file="target/apache-${ant.project.name}-extras-${version}.jar" todir="${dist-work}"/>
</target>
<target name="javadoc">
Modified: lucene/dev/trunk/solr/contrib/extraction/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/extraction/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/extraction/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/extraction/build.xml Tue Mar 8 14:53:08 2011
@@ -164,7 +164,7 @@
</target>
<target name="dist" depends="build">
- <copy file="build/${fullnamever}.jar" todir="${solr-path}/dist"/>
+ <copy file="build/${fullnamever}.jar" todir="${dist-work}"/>
</target>
<target name="example" depends="build">
Modified: lucene/dev/trunk/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/uima/build.xml?rev=1079380&r1=1079379&r2=1079380&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/uima/build.xml (original)
+++ lucene/dev/trunk/solr/contrib/uima/build.xml Tue Mar 8 14:53:08 2011
@@ -160,7 +160,7 @@
</target>
<target name="dist" depends="build">
- <copy file="build/${fullnamever}.jar" todir="${solr-path}/dist"/>
+ <copy file="build/${fullnamever}.jar" todir="${dist-work}"/>
</target>
<target name="example" depends="build">