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 2012/10/08 14:19:21 UTC
svn commit: r1395524 - in /lucene/dev/branches/branch_4x: ./ build.xml
lucene/ lucene/build.xml lucene/ivy-settings.xml solr/ solr/build.xml
Author: rmuir
Date: Mon Oct 8 12:19:21 2012
New Revision: 1395524
URL: http://svn.apache.org/viewvc?rev=1395524&view=rev
Log:
remove useless and inefficient clean-jars: we call ivy with sync-true so this is a massive slowdown of the build
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (contents, props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/build.xml (contents, props changed)
Modified: lucene/dev/branches/branch_4x/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/build.xml?rev=1395524&r1=1395523&r2=1395524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Mon Oct 8 12:19:21 2012
@@ -101,7 +101,7 @@
</subant>
</target>
- <target name="resolve" depends="clean-jars" description="Resolves all dependencies">
+ <target name="resolve" description="Resolves all dependencies">
<subant target="resolve" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
<fileset dir="solr" includes="build.xml" />
@@ -174,7 +174,7 @@
</delete>
</target>
- <target name="eclipse" depends="clean-jars, resolve" description="Setup Eclipse configuration">
+ <target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
<copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
<copy file="dev-tools/eclipse/dot.classpath" tofile=".classpath" overwrite="true"/>
<mkdir dir=".settings"/>
@@ -195,7 +195,7 @@
<delete dir="eclipse-build" failonerror="true"/>
</target>
- <target name="idea" depends="clean-jars, resolve" description="Setup IntelliJ IDEA configuration">
+ <target name="idea" depends="resolve" description="Setup IntelliJ IDEA configuration">
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
@@ -227,16 +227,6 @@
</sequential>
</target>
- <!-- TODO: in the future, we don't need to actually put
- jars in the lib/ folders, but can just put in classpath.
- only packaging tasks really need that (and could do it
- under build/ directories) -->
- <target name="clean-jars" description="Clean local jars">
- <delete>
- <fileset dir="." includes="**/*.jar"/>
- </delete>
- </target>
-
<target name="ivy-bootstrap" description="Download and install Ivy in the users ant lib dir">
<subant buildpath="lucene" target="ivy-bootstrap" inheritall="false" failonerror="true"/>
</target>
Modified: lucene/dev/branches/branch_4x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/build.xml?rev=1395524&r1=1395523&r2=1395524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/build.xml Mon Oct 8 12:19:21 2012
@@ -543,13 +543,6 @@
<property name="lucene-core.uptodate" value="true"/>
</target>
- <!-- NOTE: not really useful anymore ... -->
- <target name="clean-jars" description="Clean local jars">
- <delete failonerror="false">
- <fileset dir="." includes="**/*.jar"/>
- </delete>
- </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/branches/branch_4x/lucene/ivy-settings.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/ivy-settings.xml?rev=1395524&r1=1395523&r2=1395524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/ivy-settings.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/ivy-settings.xml Mon Oct 8 12:19:21 2012
@@ -26,6 +26,8 @@
<include url="${ivy.default.settings.dir}/ivysettings-local.xml"/>
<include url="${ivy.default.settings.dir}/ivysettings-main-chain.xml"/>
+ <caches lockStrategy="artifact-lock"/>
+
<resolvers>
<ibiblio name="sonatype-releases" root="http://oss.sonatype.org/content/repositories/releases" m2compatible="true" />
Modified: lucene/dev/branches/branch_4x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/build.xml?rev=1395524&r1=1395523&r2=1395524&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/build.xml (original)
+++ lucene/dev/branches/branch_4x/solr/build.xml Mon Oct 8 12:19:21 2012
@@ -675,13 +675,6 @@
tofile="${analysis.conf.dest}/stopwords_tr.txt"/>
</target>
- <!-- NOTE: not really useful anymore -->
- <target name="clean-jars" description="Clean local jars">
- <delete failonerror="false">
- <fileset dir="." includes="**/*.jar"/>
- </delete>
- </target>
-
<target name="jar-checksums" depends="clean-jars,resolve">
<jar-checksum-macro srcdir="${common-solr.dir}" dstdir="${common-solr.dir}/licenses"/>
</target>