You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/11/23 19:11:39 UTC
svn commit: r1641238 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/ lucene/analysis/kuromoji/ lucene/queryparser/
lucene/replicator/ solr/ solr/contrib/ solr/contrib/morphlines-core/
solr/core/ solr/server/ solr/solrj/
Author: rmuir
Date: Sun Nov 23 18:11:39 2014
New Revision: 1641238
URL: http://svn.apache.org/r1641238
Log:
LUCENE-6074: symlink jars on unix/os X systems
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/build.xml
lucene/dev/branches/branch_5x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed)
lucene/dev/branches/branch_5x/lucene/queryparser/build.xml
lucene/dev/branches/branch_5x/lucene/replicator/ (props changed)
lucene/dev/branches/branch_5x/lucene/replicator/build.xml
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/contrib-build.xml
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/build.xml
lucene/dev/branches/branch_5x/solr/server/ (props changed)
lucene/dev/branches/branch_5x/solr/server/build.xml
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/build.xml
Modified: lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/analysis/kuromoji/build.xml Sun Nov 23 18:11:39 2014
@@ -58,7 +58,7 @@
<target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
<target name="download-dict" depends="ivy-availability-check,ivy-fail,ivy-configure" unless="dict.available">
- <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}"/>
+ <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}" symlink="${ivy.symlink}"/>
<!-- TODO: we should checksum too -->
<gunzip src="${build.dir}/${dict.src.file}"/>
<untar src="${build.dir}/${ipadic.version}.tar" dest="${build.dir}"/>
Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Sun Nov 23 18:11:39 2014
@@ -411,10 +411,14 @@
<!-- <property name="ivy.settings.uptodate" value="true"/> -->
</target>
+ <condition property="ivy.symlink">
+ <os family="unix"/>
+ </condition>
+
<target name="resolve" depends="ivy-availability-check,ivy-configure">
<!-- todo, make this a property or something.
only special cases need bundles -->
- <ivy:retrieve type="jar,bundle,test,test-jar,tests" log="download-only"
+ <ivy:retrieve type="jar,bundle,test,test-jar,tests" log="download-only" symlink="${ivy.symlink}"
conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
</target>
Modified: lucene/dev/branches/branch_5x/lucene/queryparser/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/queryparser/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/queryparser/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/queryparser/build.xml Sun Nov 23 18:11:39 2014
@@ -142,7 +142,7 @@ import org.apache.lucene.queryparser.fle
<target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: -->
- <ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0"
+ <ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0" symlink="${ivy.symlink}"
inline="true" conf="default" transitive="false" type="jar" sync="true"
pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
</target>
Modified: lucene/dev/branches/branch_5x/lucene/replicator/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/replicator/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/replicator/build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/replicator/build.xml Sun Nov 23 18:11:39 2014
@@ -32,7 +32,7 @@
<target name="resolve" depends="common.resolve">
<sequential>
<!-- javax.servlet jar -->
- <ivy:retrieve conf="servlet" log="download-only" type="orbit"/>
+ <ivy:retrieve conf="servlet" log="download-only" type="orbit" symlink="${ivy.symlink}"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_5x/solr/contrib/contrib-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/contrib-build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/contrib-build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/contrib-build.xml Sun Nov 23 18:11:39 2014
@@ -49,8 +49,8 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<sequential>
- <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
- <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
+ <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/build.xml Sun Nov 23 18:11:39 2014
@@ -93,8 +93,8 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<sequential>
- <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
- <ivy:retrieve conf="test,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
+ <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="test,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_5x/solr/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/build.xml Sun Nov 23 18:11:39 2014
@@ -62,8 +62,8 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<sequential>
- <ivy:retrieve conf="compile,compile.hadoop" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
- <ivy:retrieve conf="test,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
+ <ivy:retrieve conf="compile,compile.hadoop" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="test,test.DfsMiniCluster" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
</sequential>
</target>
@@ -92,7 +92,7 @@
<target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make JavaCC ANT task happy: -->
<ivy:retrieve organisation="net.java.dev.javacc" module="javacc" revision="5.0"
- inline="true" transitive="false" type="jar" sync="true"
+ inline="true" transitive="false" type="jar" sync="true" symlink="${ivy.symlink}"
pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
</target>
Modified: lucene/dev/branches/branch_5x/solr/server/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/server/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/server/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/server/build.xml Sun Nov 23 18:11:39 2014
@@ -51,14 +51,14 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure,sync-hack">
<sequential>
<!-- jetty libs in lib/ -->
- <ivy:retrieve conf="jetty" type="jar" log="download-only"/>
- <ivy:retrieve conf="logging" type="jar,bundle" log="download-only"
+ <ivy:retrieve conf="jetty" type="jar" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="logging" type="jar,bundle" log="download-only" symlink="${ivy.symlink}"
pattern="lib/ext/[artifact]-[revision].[ext]"/>
<!-- start.jar -->
- <ivy:retrieve conf="start" type="jar" log="download-only"
+ <ivy:retrieve conf="start" type="jar" log="download-only" symlink="${ivy.symlink}"
pattern="start.jar"/>
<!-- servlet-api.jar -->
- <ivy:retrieve conf="servlet" log="download-only" type="orbit"
+ <ivy:retrieve conf="servlet" log="download-only" type="orbit" symlink="${ivy.symlink}"
pattern="lib/servlet-api-3.0.jar"/>
</sequential>
</target>
Modified: lucene/dev/branches/branch_5x/solr/solrj/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/build.xml?rev=1641238&r1=1641237&r2=1641238&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/build.xml (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/build.xml Sun Nov 23 18:11:39 2014
@@ -44,8 +44,8 @@
<target name="resolve" depends="ivy-availability-check,ivy-fail,ivy-configure">
<sequential>
- <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only"/>
- <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only"
+ <ivy:retrieve conf="compile" type="jar,bundle" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"/>
+ <ivy:retrieve conf="test" type="jar,bundle,test" sync="${ivy.sync}" log="download-only" symlink="${ivy.symlink}"
pattern="${test.lib.dir}/[artifact]-[revision](-[classifier]).[ext]"/>
</sequential>
</target>