1. Moving solr-jar to common-build.xml so it can be used by contribs

2. Adding correct manifest information to DataImportHandler jar

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@685164 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2008-08-12 14:24:57 +00:00
parent 6ce91c9515
commit b25d5b3a33
3 changed files with 25 additions and 24 deletions

View File

@ -47,25 +47,6 @@
</and>
</condition>
<!-- Macro for building Jars -->
<macrodef name="solr-jar">
<attribute name="destfile" />
<attribute name="basedir" />
<attribute name="includes" default="org/apache/**" />
<attribute name="manifest" default="${dest}/META-INF/MANIFEST.MF" />
<element name="nested" optional="true" implicit="true" />
<sequential>
<jar destfile="@{destfile}"
basedir="@{basedir}"
includes="@{includes}"
filesetmanifest="skip"
manifest="@{manifest}">
<metainf dir="${basedir}" includes="LICENSE.txt,NOTICE.txt"/>
<nested />
</jar>
</sequential>
</macrodef>
<!-- Default target: usage. Prints out instructions. -->
<target name="usage"
description="Prints out instructions">

View File

@ -119,6 +119,25 @@
</sequential>
</macrodef>
<!-- Macro for building Jars -->
<macrodef name="solr-jar">
<attribute name="destfile" />
<attribute name="basedir" />
<attribute name="includes" default="org/apache/**" />
<attribute name="manifest" default="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
<element name="nested" optional="true" implicit="true" />
<sequential>
<jar destfile="@{destfile}"
basedir="@{basedir}"
includes="@{includes}"
filesetmanifest="skip"
manifest="@{manifest}">
<metainf dir="${common.dir}" includes="LICENSE.txt,NOTICE.txt"/>
<nested />
</jar>
</sequential>
</macrodef>
<!-- Macro for building checksum files
This is only needed until the "format" option is supported
by ant's built in checksum task
@ -214,13 +233,13 @@
<!-- Creates a Manifest file for Jars and WARs -->
<target name="make-manifest">
<!-- If possible, include the svnversion -->
<exec dir="." executable="svnversion" outputproperty="svnversion" failifexecutionfails="false">
<exec dir="${common.dir}" executable="svnversion" outputproperty="svnversion" failifexecutionfails="false">
<arg line="."/>
</exec>
<!-- no description, don't advertise -->
<mkdir dir="${dest}/META-INF/" />
<manifest mode="replace" file="${dest}/META-INF/MANIFEST.MF">
<mkdir dir="${common.dir}/${dest}/META-INF/" />
<manifest mode="replace" file="${common.dir}/${dest}/META-INF/MANIFEST.MF">
<!--
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

View File

@ -60,8 +60,9 @@
</solr-javac>
</target>
<target name="build" depends="compile">
<jar destfile="target/${fullnamever}.jar" basedir="target/classes" />
<target name="build" depends="compile, make-manifest">
<solr-jar destfile="target/${fullnamever}.jar" basedir="target/classes"
manifest="${common.dir}/${dest}/META-INF/MANIFEST.MF" />
</target>
<target name="compileTests" depends="compile">