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/10 02:19:08 UTC
svn commit: r1080094 - in /lucene/dev/trunk: ./ lucene/ solr/ solr/client/
solr/contrib/ solr/example/ solr/lib/ solr/site/ solr/src/
Author: sarowe
Date: Thu Mar 10 01:19:07 2011
New Revision: 1080094
URL: http://svn.apache.org/viewvc?rev=1080094&view=rev
Log:
SOLR-2411: place release packages and maven artifacts in solr/package/ instead of solr/dist/
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/CHANGES.txt (props changed)
lucene/dev/trunk/solr/KEYS (props changed)
lucene/dev/trunk/solr/LICENSE.txt (props changed)
lucene/dev/trunk/solr/NOTICE.txt (props changed)
lucene/dev/trunk/solr/README.txt (props changed)
lucene/dev/trunk/solr/build.xml (contents, props changed)
lucene/dev/trunk/solr/client/ (props changed)
lucene/dev/trunk/solr/common-build.xml (contents, props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/example/ (props changed)
lucene/dev/trunk/solr/lib/ (props changed)
lucene/dev/trunk/solr/site/ (props changed)
lucene/dev/trunk/solr/src/ (props changed)
lucene/dev/trunk/solr/testlogging.properties (props changed)
Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1080094&r1=1080093&r2=1080094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Thu Mar 10 01:19:07 2011
@@ -30,7 +30,7 @@
<property name="src" location="src" />
<property name="web.xml" location="${src}/webapp/web/WEB-INF/web.xml"/>
- <!-- Destination for distribution files (demo WAR, src distro, etc.) -->
+ <!-- Destination for distribution files (demo WAR, contrib JARs, etc.) -->
<property name="dist" location="dist" />
<property name="clover.db.dir" location="${dest}/tests/clover/db"/>
@@ -68,12 +68,13 @@
description="Cleans compiled files and other temporary artifacts.">
<delete dir="${dest}" />
<delete dir="${dist}" />
+ <delete dir="${package.dir}" />
<delete dir="example/solr/lib" />
<delete dir="${lucene-libs}" />
</target>
<target name="clean-dest"
- description="Cleans out ${dest} but leaves ${dist} alone. This allows us to run nightly and clover together in Hudson">
+ description="Cleans out ${dest} but leaves ${dist} and ${package.dir} alone. This allows us to run nightly and clover together in Hudson">
<delete includeemptydirs="true" >
<fileset dir="${dest}">
<exclude name="docs/"/>
@@ -767,6 +768,7 @@
<target name="package-src"
description="Packages the Solr Source Distribution"
depends="dist">
+ <mkdir dir="${package.dir}"/>
<delete includeemptydirs="true">
<fileset dir="${example}/work" includes="**/*"/>
@@ -776,10 +778,10 @@
<fileset dir="${dest}/${fullnamever}" includes="**/*"/>
</delete>
- <delete file="${dist}/${fullnamever}-src.tgz" failonerror="false" />
- <delete file="${dist}/${fullnamever}-src.zip" failonerror="false" />
+ <delete file="${package.dir}/${fullnamever}-src.tgz" failonerror="false" />
+ <delete file="${package.dir}/${fullnamever}-src.zip" failonerror="false" />
- <tar destfile="${dist}/${fullnamever}-src.tgz" compression="gzip" longfile="gnu">
+ <tar destfile="${package.dir}/${fullnamever}-src.tgz" compression="gzip" longfile="gnu">
<tarfileset dir=".."
prefix="${fullnamever}"
includes="*.txt *.xml dev-tools/*" />
@@ -789,7 +791,7 @@
<tarfileset dir="."
prefix="${fullnamever}/solr"
includes="LICENSE.txt NOTICE.txt *.txt *.xml lib/** src/** example/** client/** contrib/"
- excludes="${dist}/** example/webapps/*.war lib/README.committers.txt **/data/ **/logs/* **/classes/ **/*.sh **/bin/ src/scripts/ src/site/build/ **/target/ client/python client/javascript contrib/**/build/ **/*.iml **/*.ipr **/*.iws" />
+ excludes="${package.dir}/** ${dist}/** example/webapps/*.war lib/README.committers.txt **/data/ **/logs/* **/classes/ **/*.sh **/bin/ src/scripts/ src/site/build/ **/target/ client/python client/javascript contrib/**/build/ **/*.iml **/*.ipr **/*.iws" />
<tarfileset dir="."
prefix="${fullnamever}/solr"
includes="src/test-files/solr/lib/classes/empty-file-main-lib.txt" />
@@ -804,9 +806,9 @@
prefix="${fullnamever}/modules"
excludes="**/build/" />
</tar>
- <solr-checksum file="${dist}/${fullnamever}-src.tgz"/>
+ <solr-checksum file="${package.dir}/${fullnamever}-src.tgz"/>
- <gunzip src="${dist}/${fullnamever}-src.tgz" dest="${dest}/${fullnamever}-src.tar"/>
+ <gunzip src="${package.dir}/${fullnamever}-src.tgz" dest="${dest}/${fullnamever}-src.tar"/>
<untar src="${dest}/${fullnamever}-src.tar" dest="${dest}"/>
<!--
@@ -829,7 +831,7 @@
excludes="**/stopwordsWrongEncoding.txt **/gb18030-example.xml"
/>
- <zip destfile="${dist}/${fullnamever}-src.zip">
+ <zip destfile="${package.dir}/${fullnamever}-src.zip">
<zipfileset dir="${dest}/${fullnamever}"
prefix="${fullnamever}"
excludes="**/*.sh **/bin/ src/scripts/" />
@@ -838,7 +840,7 @@
includes="**/*.sh **/bin/ src/scripts/"
filemode="755" />
</zip>
- <solr-checksum file="${dist}/${fullnamever}-src.zip"/>
+ <solr-checksum file="${package.dir}/${fullnamever}-src.zip"/>
</target>
@@ -846,6 +848,7 @@
<target name="create-package"
description="Packages the Solr Binary Distribution"
depends="dist, example, javadoc">
+ <mkdir dir="${package.dir}"/>
<copy failonerror="false" todir="${build.docs}">
<fileset dir="site" />
@@ -859,10 +862,10 @@
<fileset dir="${dest}/${fullnamever}" includes="**/*"/>
</delete>
- <delete file="${dist}/${fullnamever}.tgz" failonerror="false" />
- <delete file="${dist}/${fullnamever}.zip" failonerror="false" />
+ <delete file="${package.dir}/${fullnamever}.tgz" failonerror="false" />
+ <delete file="${package.dir}/${fullnamever}.zip" failonerror="false" />
- <tar destfile="${dist}/${fullnamever}.tgz" compression="gzip" longfile="gnu">
+ <tar destfile="${package.dir}/${fullnamever}.tgz" compression="gzip" longfile="gnu">
<tarfileset dir="."
prefix="${fullnamever}"
includes="LICENSE.txt NOTICE.txt *.txt example/** client/** contrib/**/lib/ contrib/**/lucene-libs/ contrib/**/README.txt contrib/**/CHANGES.txt"
@@ -878,9 +881,9 @@
<tarfileset dir="${build.docs}"
prefix="${fullnamever}/docs/" />
</tar>
- <solr-checksum file="${dist}/${fullnamever}.tgz"/>
+ <solr-checksum file="${package.dir}/${fullnamever}.tgz"/>
- <gunzip src="${dist}/${fullnamever}.tgz" dest="${dest}/${fullnamever}.tar"/>
+ <gunzip src="${package.dir}/${fullnamever}.tgz" dest="${dest}/${fullnamever}.tar"/>
<untar src="${dest}/${fullnamever}.tar" dest="${dest}"/>
<fixcrlf srcdir="${dest}/${fullnamever}"
@@ -890,7 +893,7 @@
excludes="**/stopwordsWrongEncoding.txt **/gb18030-example.xml"
/>
- <zip destfile="${dist}/${fullnamever}.zip">
+ <zip destfile="${package.dir}/${fullnamever}.zip">
<zipfileset dir="${dest}/${fullnamever}"
prefix="${fullnamever}"
excludes="**/*.sh **/bin/ src/scripts/" />
@@ -899,7 +902,7 @@
includes="**/*.sh **/bin/ src/scripts/"
filemode="755" />
</zip>
- <solr-checksum file="${dist}/${fullnamever}.zip"/>
+ <solr-checksum file="${package.dir}/${fullnamever}.zip"/>
</target>
@@ -929,22 +932,22 @@
</exec>
</target>
- <target name="clean-dist-signatures">
+ <target name="clean-package-signatures">
<delete failonerror="false">
- <fileset dir="${dist}">
+ <fileset dir="${package.dir}">
<include name="**/*.asc"/>
</fileset>
</delete>
</target>
- <target name="sign-artifacts" depends="clean-dist-signatures">
+ <target name="sign-artifacts" depends="clean-package-signatures">
<!--<property file="${user.home}/.solr/build.properties" />-->
<input message="password:>" addproperty="gpg.passphrase">
<handler classname="org.apache.tools.ant.input.SecureInputHandler" />
</input>
- <sign-artifact input.file="${dist}/${fullnamever}.tgz" output.file="${dist}/${fullnamever}.tgz.asc" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${dist}/${fullnamever}.zip" output.file="${dist}/${fullnamever}.zip.asc" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${dist}/${fullnamever}-src.tgz" output.file="${dist}/${fullnamever}-src.tgz.asc" gpg.passphrase="${gpg.passphrase}"/>
- <sign-artifact input.file="${dist}/${fullnamever}-src.zip" output.file="${dist}/${fullnamever}-src.zip.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${package.dir}/${fullnamever}.tgz" output.file="${package.dir}/${fullnamever}.tgz.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${package.dir}/${fullnamever}.zip" output.file="${package.dir}/${fullnamever}.zip.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${package.dir}/${fullnamever}-src.tgz" output.file="${package.dir}/${fullnamever}-src.tgz.asc" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-artifact input.file="${package.dir}/${fullnamever}-src.zip" output.file="${package.dir}/${fullnamever}-src.zip.asc" gpg.passphrase="${gpg.passphrase}"/>
<!-- Maven artifacts -->
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv" gpg.passphrase="${gpg.passphrase}"/>
@@ -962,15 +965,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>
Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1080094&r1=1080093&r2=1080094&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Thu Mar 10 01:19:07 2011
@@ -35,6 +35,7 @@
<property name="dev-tools.dir" value="${solr-path}/../dev-tools"/>
<property name="prettify.dir" value="${dev-tools.dir}/prettify"/>
+ <property name="package.dir" location="package"/>
<tstamp>
<format property="year" pattern="yyyy"/>
@@ -150,7 +151,7 @@
<!-- Maven properties -->
<property name="maven.build.dir" value="${basedir}/build/maven"/>
- <property name="maven.dist.dir" value="${basedir}/dist/maven"/>
+ <property name="maven.dist.dir" value="${package.dir}/maven"/>
<property name="maven.dist.prefix" value="${maven.dist.dir}/org/apache/solr"/>