You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2013/07/24 15:42:19 UTC
svn commit: r1506549 - in /lucene/dev/branches/branch_4x: ./
extra-targets.xml lucene/ lucene/common-build.xml lucene/core/
lucene/core/build.xml
Author: uschindler
Date: Wed Jul 24 13:42:18 2013
New Revision: 1506549
URL: http://svn.apache.org/r1506549
Log:
Merged revision(s) 1506533 from lucene/dev/trunk:
LUCENE-4335: Make moman not use HG anymore. Just download as ZIP from bitbucket and unzip
Merged revision(s) 1506548 from lucene/dev/trunk:
LUCENE-4335: Fix the bug with modifications on the SVN root folder
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/extra-targets.xml
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/branch_4x/lucene/core/ (props changed)
lucene/dev/branches/branch_4x/lucene/core/build.xml
Modified: lucene/dev/branches/branch_4x/extra-targets.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/extra-targets.xml?rev=1506549&r1=1506548&r2=1506549&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/extra-targets.xml (original)
+++ lucene/dev/branches/branch_4x/extra-targets.xml Wed Jul 24 13:42:18 2013
@@ -94,7 +94,7 @@
File basedir = new File(project.getProperty('basedir')).getAbsoluteFile();
int baseLen = basedir.toString().length();
def convertRelative = {
- file -> file.getAbsolutePath().substring(baseLen + 1).replace(File.separatorChar, (char)'/');
+ file -> '.' + file.getAbsolutePath().substring(baseLen).replace(File.separatorChar, (char)'/');
}
Set missingProps = new TreeSet(), unversioned = new TreeSet(), changed = new TreeSet();
@@ -108,11 +108,9 @@
} else if (status.getKind() == SVNNodeKind.FILE && nodeStatus != SVNStatusType.STATUS_DELETED) {
missingProps.add(convertRelative(status.getFile()));
}
- if (status.getKind() == SVNNodeKind.FILE) {
- if (nodeStatus == SVNStatusType.STATUS_MODIFIED || nodeStatus == SVNStatusType.STATUS_REPLACED ||
- nodeStatus == SVNStatusType.STATUS_DELETED || nodeStatus == SVNStatusType.STATUS_ADDED) {
- changed.add(convertRelative(status.getFile()));
- }
+ if (nodeStatus == SVNStatusType.STATUS_MODIFIED || nodeStatus == SVNStatusType.STATUS_REPLACED ||
+ nodeStatus == SVNStatusType.STATUS_DELETED || nodeStatus == SVNStatusType.STATUS_ADDED) {
+ changed.add(convertRelative(status.getFile()));
}
} as ISVNStatusHandler, null);
Modified: lucene/dev/branches/branch_4x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/common-build.xml?rev=1506549&r1=1506548&r2=1506549&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Wed Jul 24 13:42:18 2013
@@ -230,9 +230,6 @@
<property name="svn.exe" value="svn" />
<property name="perl.exe" value="perl" />
- <property name="hg.exe" value="hg" />
- <property name="moman.url" value="https://bitbucket.org/jpbarrette/moman" />
- <property name="moman.rev" value="120" />
<property name="python.exe" value="python" />
<property name="python32.exe" value="python3.2" />
Modified: lucene/dev/branches/branch_4x/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/build.xml?rev=1506549&r1=1506548&r2=1506549&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/core/build.xml Wed Jul 24 13:42:18 2013
@@ -24,6 +24,9 @@
<import file="../common-build.xml"/>
+ <property name="moman.commit-hash" value="5c5c2a1e4dea" />
+ <property name="moman.url" value="https://bitbucket.org/jpbarrette/moman/get/${moman.commit-hash}.zip" />
+
<path id="classpath"/>
<path id="test.classpath">
@@ -109,37 +112,22 @@
<fixcrlf srcdir="src/java/org/apache/lucene/util/packed" includes="BulkOperation*.java,Direct*.java,Packed64SingleBlock.java,Packed*ThreeBlocks.py" encoding="UTF-8"/>
</target>
- <target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
+ <target name="createLevAutomata" depends="check-moman,download-moman">
<createLevAutomaton n="1"/>
<createLevAutomaton n="2"/>
</target>
<target name="check-moman">
- <condition property="moman.cloned">
- <available file="${build.dir}/moman"/>
- </condition>
+ <available file="${build.dir}/moman" property="moman.downloaded"/>
</target>
- <target name="clone-moman" unless="moman.cloned">
- <mkdir dir="${build.dir}"/>
- <exec dir="${build.dir}"
- executable="${hg.exe}" failonerror="true">
- <arg value="clone"/>
- <arg value="-r"/>
- <arg value="${moman.rev}"/>
- <arg value="${moman.url}"/>
- <arg value="moman"/>
- </exec>
- </target>
-
- <target name="pull-moman" if="moman.cloned">
- <exec dir="${build.dir}/moman"
- executable="${hg.exe}" failonerror="true">
- <arg value="pull"/>
- <arg value="-f"/>
- <arg value="-r"/>
- <arg value="${moman.rev}"/>
- </exec>
+ <target name="download-moman" unless="moman.downloaded">
+ <mkdir dir="${build.dir}/moman"/>
+ <get src="${moman.url}" dest="${build.dir}/moman.zip"/>
+ <unzip dest="${build.dir}/moman" src="${build.dir}/moman.zip">
+ <cutdirsmapper dirs="1"/>
+ </unzip>
+ <delete file="${build.dir}/moman.zip"/>
</target>
<target name="regenerate" depends="createLevAutomata,createPackedIntSources"/>