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 2012/02/15 23:24:05 UTC
svn commit: r1244767 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/common-build.xml lucene/contrib/facet/build.xml solr/
solr/common-build.xml solr/test-framework/build.xml solr/webapp/build.xml
Author: sarowe
Date: Wed Feb 15 22:24:04 2012
New Revision: 1244767
URL: http://svn.apache.org/viewvc?rev=1244767&view=rev
Log:
LUCENE-3754: Store generated archive manifests in per-module output directories - each artifact gets its own manifest file
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/facet/build.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/common-build.xml
lucene/dev/branches/branch_3x/solr/test-framework/build.xml
lucene/dev/branches/branch_3x/solr/webapp/build.xml
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1244767&r1=1244766&r2=1244767&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Wed Feb 15 22:24:04 2012
@@ -170,7 +170,7 @@
</condition>
<property name="junit.parallel.selector" value="org.apache.lucene.util.LuceneJUnitDividingSelector"/>
- <property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
+ <property name="manifest.file" location="${build.dir}/MANIFEST.MF"/>
<!--
we attempt to exec svnversion to get details build information
@@ -377,8 +377,9 @@
<attribute name="title"/>
<attribute name="implementation.title"/>
<attribute name="spec.version"/>
+ <attribute name="manifest.file" default="${manifest.file}"/>
<sequential>
- <manifest file="${manifest.file}">
+ <manifest file="@{manifest.file}">
<!--
http://java.sun.com/j2se/1.5.0/docs/guide/jar/jar.html#JAR%20Manifest
http://java.sun.com/j2se/1.5.0/docs/guide/versioning/spec/versioning2.html
@@ -425,6 +426,7 @@
<attribute name="metainf.source.dir" default="${common.dir}"/>
<attribute name="implementation.title" default="org.apache.lucene"/>
<attribute name="spec.version" default="${spec.version}"/>
+ <attribute name="manifest.file" default="${manifest.file}"/>
<element name="nested" optional="true" implicit="true"/>
<sequential>
<!-- If possible, include the svnversion -->
@@ -435,11 +437,12 @@
<build-manifest title="@{title}"
implementation.title="@{implementation.title}"
- spec.version="@{spec.version}"/>
+ spec.version="@{spec.version}"
+ manifest.file="@{manifest.file}"/>
<jar destfile="@{destfile}"
basedir="@{basedir}"
- manifest="${manifest.file}"
+ manifest="@{manifest.file}"
excludes="@{excludes}">
<metainf dir="@{metainf.source.dir}" includes="LICENSE.txt,NOTICE.txt"/>
<nested />
Modified: lucene/dev/branches/branch_3x/lucene/contrib/facet/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/facet/build.xml?rev=1244767&r1=1244766&r2=1244767&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/facet/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/facet/build.xml Wed Feb 15 22:24:04 2012
@@ -51,8 +51,9 @@
<target name="jar-examples" depends="compile-examples">
<jarify basedir="${build.dir}/classes/examples"
- destfile="${build.dir}/${final.name}-examples.jar"
- title="Lucene Search Engine: ${ant.project.name}-examples">
+ destfile="${build.dir}/${final.name}-examples.jar"
+ title="Lucene Search Engine: ${ant.project.name}-examples"
+ manifest.file="${build.dir}/EXAMPLES-MANIFEST.MF">
<fileset dir="src/examples" />
</jarify>
</target>
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1244767&r1=1244766&r2=1244767&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Wed Feb 15 22:24:04 2012
@@ -38,7 +38,6 @@
<property name="package.dir" location="${common-solr.dir}/package"/>
<property name="maven.dist.dir" location="${package.dir}/maven"/>
<property name="lucene-libs" location="${dest}/lucene-libs" />
- <property name="manifest.file" location="${dest}/META-INF/MANIFEST.MF"/>
<property name="tests.userdir" value="src/test-files"/>
<property name="example" value="${common-solr.dir}/example" />
<property name="javadoc.dir" location="${build.dir}/docs/api"/>
@@ -151,12 +150,31 @@
</target>
<!-- Shared core/solrj/test-framework/contrib targets -->
+
+ <macrodef name="solr-jarify" description="Builds a Solr JAR file">
+ <attribute name="basedir" default="${build.dir}/classes/java"/>
+ <attribute name="destfile" default="${build.dir}/${final.name}.jar"/>
+ <attribute name="title" default="Apache Solr Search Server: ${ant.project.name}"/>
+ <attribute name="excludes" default="**/pom.xml,**/*.iml"/>
+ <attribute name="metainf.source.dir" default="${common-solr.dir}"/>
+ <attribute name="implementation.title" default="org.apache.solr"/>
+ <attribute name="spec.version" default="${solr.spec.version}"/>
+ <attribute name="manifest.file" default="${manifest.file}"/>
+ <element name="nested" optional="true" implicit="true"/>
+ <sequential>
+ <jarify basedir="@{basedir}" destfile="@{destfile}"
+ title="@{title}" excludes="@{excludes}"
+ metainf.source.dir="@{metainf.source.dir}"
+ implementation.title="@{implementation.title}"
+ spec.version="@{spec.version}"
+ manifest.file="@{manifest.file}">
+ <nested/>
+ </jarify>
+ </sequential>
+ </macrodef>
+
<target name="jar-core" depends="compile-core">
- <mkdir dir="${dest}/META-INF/"/>
- <jarify title="Apache Solr Search Server: ${ant.project.name}"
- metainf.source.dir="${common-solr.dir}"
- implementation.title="org.apache.solr"
- spec.version="${solr.spec.version}"/>
+ <solr-jarify/>
</target>
<target name="compile-core" depends="prep-lucene-jars,common.compile-core"/>
@@ -183,12 +201,7 @@
<packageset dir="${src.dir}"/>
</sources>
</invoke-javadoc>
- <jarify basedir="${javadoc.dir}"
- destfile="${build.dir}/${final.name}-javadoc.jar"
- title="Apache Solr Search Server: ${ant.project.name}"
- metainf.source.dir="${common-solr.dir}"
- implementation.title="org.apache.solr"
- spec.version="${solr.spec.version}"/>
+ <solr-jarify basedir="${javadoc.dir}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
</sequential>
</target>
@@ -213,11 +226,7 @@
</target>
<target name="jar-src" depends="init">
- <jarify basedir="${src.dir}"
- destfile="${build.dir}/${final.name}-src.jar"
- implementation.title="org.apache.solr"
- metainf.source.dir="${common-solr.dir}"
- spec.version="${solr.spec.version}"/>
+ <solr-jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar"/>
</target>
<!-- Solr core targets -->
Modified: lucene/dev/branches/branch_3x/solr/test-framework/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/test-framework/build.xml?rev=1244767&r1=1244766&r2=1244767&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/test-framework/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/test-framework/build.xml Wed Feb 15 22:24:04 2012
@@ -57,12 +57,7 @@
<packageset dir="${src.dir}"/>
</sources>
</invoke-javadoc>
- <jarify basedir="${javadoc.dir}"
- destfile="${build.dir}/${final.name}-javadoc.jar"
- title="Apache Solr Search Server: ${ant.project.name}"
- metainf.source.dir="${common-solr.dir}"
- implementation.title="org.apache.solr"
- spec.version="${solr.spec.version}"/>
+ <solr-jarify basedir="${javadoc.dir}" destfile="${build.dir}/${final.name}-javadoc.jar"/>
<mkdir dir="${dest}/docs/api/test-framework"/>
<copy todir="${dest}/docs/api/test-framework">
<fileset dir="${javadoc.dir}"/>
Modified: lucene/dev/branches/branch_3x/solr/webapp/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/webapp/build.xml?rev=1244767&r1=1244766&r2=1244767&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/webapp/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/webapp/build.xml Wed Feb 15 22:24:04 2012
@@ -52,7 +52,7 @@
<ant dir="${common-solr.dir}" inheritall="false" target="contribs-add-to-war"/>
<war destfile="${dist}/apache-solr-${version}${solr.war.suffix}.war"
webxml="web/WEB-INF/web.xml"
- manifest="${dest}/META-INF/MANIFEST.MF">
+ manifest="${manifest.file}">
<lib dir="${common-solr.dir}/lib" excludes="${exclude.from.war}">
<exclude name="servlet-api*.jar" />
<exclude name="easymock-*.jar" />