You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/08/30 16:06:23 UTC

svn commit: r1518972 - in /lucene/dev/trunk: build.xml lucene/CHANGES.txt lucene/analysis/build.xml lucene/build.xml solr/build.xml solr/common-build.xml

Author: shaie
Date: Fri Aug 30 14:06:22 2013
New Revision: 1518972

URL: http://svn.apache.org/r1518972
Log:
LUCENE-5193: add jar-src to build.xml

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/analysis/build.xml
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/solr/build.xml
    lucene/dev/trunk/solr/common-build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Fri Aug 30 14:06:22 2013
@@ -125,6 +125,13 @@
     </subant>
   </target>
 
+  <target name="jar-src" description="Build Lucene and Solr Source Jar files">
+    <subant target="jar-src" inheritall="false" failonerror="true">
+      <fileset dir="lucene" includes="build.xml"/>
+      <fileset dir="solr" includes="build.xml"/>
+    </subant>
+  </target>
+
   <property name="version" value="5.0-SNAPSHOT"/>
   <property name="maven-build-dir" value="maven-build"/>
   <property name="maven-version" value="2.2.1"/>

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Fri Aug 30 14:06:22 2013
@@ -284,6 +284,9 @@ Build
 * SOLR-5159: Manifest includes non-parsed maven variables. 
   (Artem Karpenko via Steve Rowe)
 
+* LUCENE-5193: Add jar-src as top-level target to generate all Lucene and Solr
+  *-src.jar. (Steve Rowe, Shai Erera)
+
 ======================= Lucene 4.4.0 =======================
 
 Changes in backwards compatibility policy

Modified: lucene/dev/trunk/lucene/analysis/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/build.xml?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/build.xml (original)
+++ lucene/dev/trunk/lucene/analysis/build.xml Fri Aug 30 14:06:22 2013
@@ -107,6 +107,9 @@
   <target name="jar">
     <forall-analyzers target="jar-core"/>
   </target>
+  <target name="jar-src">
+    <forall-analyzers target="jar-src"/>
+  </target>
   <target name="jar-core" depends="jar"/>
 
   <target name="build-artifacts-and-tests" depends="default,compile-test" />

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Fri Aug 30 14:06:22 2013
@@ -597,6 +597,12 @@
     <modules-crawl target="jar-core"/>
   </target>
 
+  <target name="jar-src" description="create source jars for all modules">
+    <ant dir="${common.dir}/core" target="jar-src" inheritAll="false" />
+    <ant dir="${common.dir}/test-framework" target="jar-src" inheritAll="false" />
+    <modules-crawl target="jar-src"/>
+  </target>
+
   <target name="get-jenkins-line-docs" unless="enwiki.exists">
     <sequential>
       <!-- TODO: can get .lzma instead (it's ~17% smaller) but there's no builtin ant support...? -->

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Fri Aug 30 14:06:22 2013
@@ -176,6 +176,14 @@
   <target name="jar" depends="jar-core,jar-solrj,jar-solr-test-framework,jar-contrib"
           description="Jar solr core, solrj, solr-test-framework, and all contribs"/>
 
+  <target name="jar-src" 
+          description="Create source jars for solr core, solrj, solr-test-framework, and all contribs">
+    <ant dir="core" target="jar-src" inheritAll="false"/>
+    <ant dir="solrj" target="jar-src" inheritAll="false"/>
+    <ant dir="test-framework" target="jar-src" inheritAll="false"/>
+    <contrib-crawl target="jar-src"/>
+  </target>
+
   <!-- Solr core targets -->
   <target name="test-solr-core" description="Test solr core">
     <ant dir="core" target="test" inheritAll="false">

Modified: lucene/dev/trunk/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/common-build.xml?rev=1518972&r1=1518971&r2=1518972&view=diff
==============================================================================
--- lucene/dev/trunk/solr/common-build.xml (original)
+++ lucene/dev/trunk/solr/common-build.xml Fri Aug 30 14:06:22 2013
@@ -297,8 +297,13 @@
     ]]></script>
   </target>
 
-  <target name="jar-src" depends="init">
-  	<solr-jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar"/>
+  <target name="jar-src">
+    <sequential>
+      <mkdir dir="${build.dir}"/>
+      <solr-jarify basedir="${src.dir}" destfile="${build.dir}/${final.name}-src.jar">
+        <fileset dir="${resources.dir}" erroronmissingdir="no"/>
+      </solr-jarify>
+    </sequential>
   </target>
 
   <target name="m2-deploy-solr-parent-pom" depends="filter-pom-templates"