svn commit: r1376476 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/build.xml

[us...@apache.org]

Author: uschindler
Date: Thu Aug 23 13:08:46 2012
New Revision: 1376476

URL: http://svn.apache.org/viewvc?rev=1376476&view=rev
Log:
Merged revision(s) 1376475 from lucene/dev/trunk:
Fix exec targets to use <arg value=""/>

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (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/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/build.xml?rev=1376476&r1=1376475&r2=1376476&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/build.xml (original)
+++ lucene/dev/branches/branch_4x/lucene/core/build.xml Thu Aug 23 13:08:46 2012
@@ -62,24 +62,26 @@
   	<sequential>
       <exec dir="src/java/org/apache/lucene/util/automaton"
             executable="${python.exe}" failonerror="true">
-        <arg line="createLevAutomata.py @{n} True"/>
+        <arg value="createLevAutomata.py"/>
+        <arg value="@{n}"/>
+        <arg value="True"/>
       </exec>
       <exec dir="src/java/org/apache/lucene/util/automaton"
             executable="${python.exe}" failonerror="true">
-        <arg line="createLevAutomata.py @{n} False"/>
+        <arg value="createLevAutomata.py"/>
+        <arg value="@{n}"/>
+        <arg value="False"/>
       </exec>
       <fixcrlf srcdir="src/java/org/apache/lucene/util/automaton" includes="*ParametricDescription.java" encoding="UTF-8"/>
     </sequential>
   </macrodef>
 
   <target name="createBulkPackedIntSources">
-    <sequential>
-      <exec dir="src/java/org/apache/lucene/util/packed"
-            executable="${python.exe}" failonerror="true">
-        <arg line="gen_BulkOperation.py"/>
-      </exec>
-      <fixcrlf srcdir="src/java/org/apache/lucene/util/packed" includes="BulkOperation*.java" encoding="UTF-8"/>
-    </sequential>
+    <exec dir="src/java/org/apache/lucene/util/packed"
+          executable="${python.exe}" failonerror="true">
+      <arg value="gen_BulkOperation.py"/>
+    </exec>
+    <fixcrlf srcdir="src/java/org/apache/lucene/util/packed" includes="BulkOperation*.java" encoding="UTF-8"/>
   </target>
 
   <target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
@@ -96,14 +98,21 @@
   <target name="clone-moman" unless="moman.cloned">
   	<exec dir="src/java/org/apache/lucene/util/automaton" 
           executable="${hg.exe}" failonerror="true">
-      <arg line="clone -r ${moman.rev} ${moman.url} moman"/>
+      <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="src/java/org/apache/lucene/util/automaton/moman" 
           executable="${hg.exe}" failonerror="true">
-      <arg line="pull -f -r ${moman.rev}"/>
+      <arg value="pull"/>
+      <arg value="-f"/>
+      <arg value="-r"/>
+      <arg value="${moman.rev}"/>
     </exec>
   </target>
 </project>