lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elyog...@apache.org
Subject svn commit: r1490450 - in /lucene/dev/trunk: build.xml dev-tools/eclipse/dot.project lucene/CHANGES.txt lucene/common-build.xml
Date Thu, 06 Jun 2013 21:32:53 GMT
Author: elyograg
Date: Thu Jun  6 21:32:53 2013
New Revision: 1490450

URL: http://svn.apache.org/r1490450
Log:
LUCENE-5043: autogenerate eclipse project name

Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/dev-tools/eclipse/dot.project
    lucene/dev/trunk/lucene/CHANGES.txt
    lucene/dev/trunk/lucene/common-build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1490450&r1=1490449&r2=1490450&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Thu Jun  6 21:32:53 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/trunk/dev-tools/eclipse/dot.project
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.project?rev=1490450&r1=1490449&r2=1490450&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.project (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.project Thu Jun  6 21:32:53 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>lucene_solr_trunk</name>
+	<name>@ECLIPSEPROJECTNAME@</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1490450&r1=1490449&r2=1490450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Jun  6 21:32:53 2013
@@ -194,6 +194,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/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1490450&r1=1490449&r2=1490450&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Jun  6 21:32:53 2013
@@ -1454,7 +1454,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}"/>
@@ -2030,7 +2030,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>



Mime
View raw message