You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by el...@apache.org on 2013/06/07 18:57:17 UTC
svn commit: r1490726 - in /lucene/dev/branches/branch_4x: ./ build.xml
dev-tools/ dev-tools/eclipse/dot.project lucene/ lucene/CHANGES.txt
lucene/common-build.xml
Author: elyograg
Date: Fri Jun 7 16:57:17 2013
New Revision: 1490726
URL: http://svn.apache.org/r1490726
Log:
LUCENE-5043: autogenerate eclipse project name (merge r1490450)
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/build.xml
lucene/dev/branches/branch_4x/dev-tools/ (props changed)
lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.project
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt
lucene/dev/branches/branch_4x/lucene/common-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=1490726&r1=1490725&r2=1490726&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/build.xml (original)
+++ lucene/dev/branches/branch_4x/build.xml Fri Jun 7 16:57:17 2013
@@ -130,7 +130,7 @@
<target name="get-maven-poms"
description="Copy Maven POMs from dev-tools/maven/ to maven-build/">
- <copy todir="${maven-build-dir}" overwrite="true">
+ <copy todir="${maven-build-dir}" overwrite="true" encoding="UTF-8">
<fileset dir="${basedir}/dev-tools/maven"/>
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
@@ -185,7 +185,12 @@
</target>
<target name="eclipse" depends="resolve" description="Setup Eclipse configuration">
- <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false"/>
+ <basename file="${basedir}" property="eclipseprojectname"/>
+ <copy file="dev-tools/eclipse/dot.project" tofile=".project" overwrite="false" encoding="UTF-8">
+ <filterset>
+ <filter token="ECLIPSEPROJECTNAME" value="${eclipseprojectname}"/>
+ </filterset>
+ </copy>
<mkdir dir=".settings"/>
<copy todir=".settings/" overwrite="true">
<fileset dir="dev-tools/eclipse/dot.settings" includes="*.prefs" />
Modified: lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.project?rev=1490726&r1=1490725&r2=1490726&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/branches/branch_4x/dev-tools/eclipse/dot.project Fri Jun 7 16:57:17 2013
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>lucene_solr_branch_4x</name>
+ <name>@ECLIPSEPROJECTNAME@</name>
<comment></comment>
<projects>
</projects>
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1490726&r1=1490725&r2=1490726&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Fri Jun 7 16:57:17 2013
@@ -165,6 +165,10 @@ Build
Test framework may fail internally due to overly aggresive J9 optimizations.
(Dawid Weiss, Shai Erera)
+* LUCENE-5043: The eclipse target now uses the containing directory for the
+ project name. This also enforces UTF-8 encoding when files are copied with
+ filtering.
+
Tests
* LUCENE-4901: TestIndexWriterOnJRECrash should work on any
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=1490726&r1=1490725&r2=1490726&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/common-build.xml Fri Jun 7 16:57:17 2013
@@ -1457,7 +1457,7 @@ ${tests-output}/junit4-*.suites - pe
<target name="filter-pom-templates" unless="filtered.pom.templates.uptodate">
<mkdir dir="${filtered.pom.templates.dir}"/>
- <copy todir="${common.dir}/build/poms" overwrite="true">
+ <copy todir="${common.dir}/build/poms" overwrite="true" encoding="UTF-8">
<fileset dir="${common.dir}/../dev-tools/maven"/>
<filterset begintoken="@" endtoken="@">
<filter token="version" value="${version}"/>
@@ -2032,7 +2032,7 @@ ${tests-output}/junit4-*.suites - pe
<element name="nested" optional="false" implicit="true"/>
<sequential>
<copy todir="@{todir}" flatten="@{flatten}" overwrite="@{overwrite}" verbose="true"
- preservelastmodified="false" encoding="UTF-8" outputencoding="UTF-8" taskname="pegdown"
+ preservelastmodified="false" encoding="UTF-8" taskname="pegdown"
>
<filterchain>
<tokenfilter>