You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2011/03/22 20:50:06 UTC
svn commit: r1084324 - in /lucene/dev/branches/branch_3x: lucene/build.xml
solr/build.xml solr/common-build.xml
Author: sarowe
Date: Tue Mar 22 19:50:05 2011
New Revision: 1084324
URL: http://svn.apache.org/viewvc?rev=1084324&view=rev
Log:
use ${svn.exe} property instead of directly calling svn executable
Modified:
lucene/dev/branches/branch_3x/lucene/build.xml
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/common-build.xml
Modified: lucene/dev/branches/branch_3x/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/build.xml Tue Mar 22 19:50:05 2011
@@ -373,7 +373,7 @@
<target name="svn-export-source" depends="get-svn-info">
<delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/>
<mkdir dir="${build.dir}"/>
- <exec dir="." executable="svn" failonerror="true">
+ <exec dir="." executable="${svn.exe}" failonerror="true">
<arg value="export"/>
<arg value="--native-eol"/>
<arg value="LF"/>
@@ -388,7 +388,7 @@
<!-- Populates properties svn.URL and svn.Revision using "svn info". -->
<!-- ================================================================== -->
<target name="get-svn-info">
- <exec dir="." executable="svn" outputproperty="svn.info" failonerror="true">
+ <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
<arg value="info"/>
</exec>
<loadproperties>
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Tue Mar 22 19:50:05 2011
@@ -761,7 +761,7 @@
<target name="svn-export-source" depends="get-svn-info">
<delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/>
<mkdir dir="${dest}"/>
- <exec dir="." executable="svn" failonerror="true">
+ <exec dir="." executable="${svn.exe}" failonerror="true">
<arg value="export"/>
<arg value="--native-eol"/>
<arg value="LF"/>
@@ -774,7 +774,7 @@
<!-- Populates properties svn.URL and svn.Revision using "svn info" -->
<target name="get-svn-info">
- <exec dir=".." executable="svn" outputproperty="svn.info" failonerror="true">
+ <exec dir=".." executable="${svn.exe}" outputproperty="svn.info" failonerror="true">
<arg value="info"/>
</exec>
<loadproperties>
@@ -874,7 +874,7 @@
</target>
<target name="svn-up">
- <exec executable="svn">
+ <exec executable="${svn.exe}">
<arg value="update"/>
</exec>
</target>
Modified: lucene/dev/branches/branch_3x/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/common-build.xml Tue Mar 22 19:50:05 2011
@@ -81,6 +81,7 @@
default PATH. (this is useful for Hudson)
-->
<property name="svnversion.exe" value="svnversion" />
+ <property name="svn.exe" value="svn" />
<!-- Java Version we are compatible with -->
<property name="java.compat.version" value="1.5" />
RE: svn commit: r1084324 - in /lucene/dev/branches/branch_3x:
lucene/build.xml solr/build.xml solr/common-build.xml
Posted by Steven A Rowe <sa...@syr.edu>.
I agree – I’ve added it. - Steve
From: Uwe Schindler [mailto:uwe@thetaphi.de]
Sent: Tuesday, March 22, 2011 3:54 PM
To: dev@lucene.apache.org
Subject: Re: svn commit: r1084324 - in /lucene/dev/branches/branch_3x: lucene/build.xml solr/build.xml solr/common-build.xml
Thanks, we should add this rev also to the 3.1.1 issue still open. Maybe we get another rc, we can merge then earlier.
--
Uwe Schindler
H.-H.-Meier-Allee 63, 28213 Bremen
http://www.thetaphi.de
sarowe@apache.org<ma...@apache.org> schrieb:
Author: sarowe Date: Tue Mar 22 19:50:05 2011 New Revision: 1084324 URL: http://svn.apache.org/viewvc?rev=1084324&view=rev Log: use ${svn.exe} property instead of directly calling svn executable Modified: lucene/dev/branches/branch_3x/lucene/build.xml lucene/dev/branches/branch_3x/solr/build.xml lucene/dev/branches/branch_3x/solr/common-build.xml Modified: lucene/dev/branches/branch_3x/lucene/build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
________________________________
--- lucene/dev/branches/branch_3x/lucene/build.xml (original) +++ lucene/dev/branches/branch_3x/lucene/build.xml Tue Mar 22 19:50:05 2011 @@ -373,7 +373,7 @@ <target name="svn-export-source" depends="get-svn-info"> <delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/> <mkdir dir="${build.dir}"/> - <exec dir="." executable="svn" failonerror="true"> + <exec dir="." executable="${svn.exe}" failonerror="true"> <arg value="export"/> <arg value="--native-eol"/> <arg value="LF"/> @@ -388,7 +388,7 @@ <!-- Populates properties svn.URL and svn.Revision using "svn info". --> <!--
________________________________
--> <target name="get-svn-info"> - <exec dir="." executable="svn" outputproperty="svn.info<http://svn.info>" failonerror="true"> + <exec dir="." executable="${svn.exe}" outputproperty="svn.info<http://svn.info>" failonerror="true"> <arg value="info"/> </exec> <loadproperties> Modified: lucene/dev/branches/branch_3x/solr/build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
________________________________
--- lucene/dev/branches/branch_3x/solr/build.xml (original) +++ lucene/dev/branches/branch_3x/solr/build.xml Tue Mar 22 19:50:05 2011 @@ -761,7 +761,7 @@ <target name="svn-export-source" depends="get-svn-info"> <delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/> <mkdir dir="${dest}"/> - <exec dir="." executable="svn" failonerror="true"> + <exec dir="." executable="${svn.exe}" failonerror="true"> <arg value="export"/> <arg value="--native-eol"/> <arg value="LF"/> @@ -774,7 +774,7 @@ <!-- Populates properties svn.URL and svn.Revision using "svn info" --> <target name="get-svn-info"> - <exec dir=".." executable="svn" outputproperty="svn.info<http://svn.info>" failonerror="true"> + <exec dir=".." executable="${svn.exe}" outputproperty="svn.info<http://svn.info>" failonerror="true"> <arg value="info"/> </exec> <loadproperties> @@ -874,7 +874,7 @@ </target> <target name="svn-up"> - <exec executable="svn"> + <exec executable="${svn.exe}"> <arg value="update"/> </exec> </target> Modified: lucene/dev/branches/branch_3x/solr/common-build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff
________________________________
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original) +++ lucene/dev/branches/branch_3x/solr/common-build.xml Tue Mar 22 19:50:05 2011 @@ -81,6 +81,7 @@ default PATH. (this is useful for Hudson) --> <property name="svnversion.exe" value="svnversion" /> + <property name="svn.exe" value="svn" /> <!-- Java Version we are compatible with --> <property name="java.compat.version" value="1.5" />
Re: svn commit: r1084324 - in /lucene/dev/branches/branch_3x: lucene/build.xml solr/build.xml solr/common-build.xml
Posted by Uwe Schindler <uw...@thetaphi.de>.
Thanks, we should add this rev also to the 3.1.1 issue still open. Maybe we get another rc, we can merge then earlier.
--
Uwe Schindler
H.-H.-Meier-Allee 63, 28213 Bremen
http://www.thetaphi.de
sarowe@apache.org schrieb:
Author: sarowe Date: Tue Mar 22 19:50:05 2011 New Revision: 1084324 URL: http://svn.apache.org/viewvc?rev=1084324&view=rev Log: use ${svn.exe} property instead of directly calling svn executable Modified: lucene/dev/branches/branch_3x/lucene/build.xml lucene/dev/branches/branch_3x/solr/build.xml lucene/dev/branches/branch_3x/solr/common-build.xml Modified: lucene/dev/branches/branch_3x/lucene/build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff_____________________________________________
--- lucene/dev/branches/branch_3x/lucene/build.xml (original) +++ lucene/dev/branches/branch_3x/lucene/build.xml Tue Mar 22 19:50:05 2011 @@ -373,7 +373,7 @@ <target name="svn-export-source" depends="get-svn-info"> <delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/> <mkdir dir="${build.dir}"/> - <exec dir="." executable="svn" failonerror="true"> + <exec dir="." executable="${svn.exe}" failonerror="true"> <arg value="export"/> <arg value="--native-eol"/> <arg value="LF"/> @@ -388,7 +388,7 @@ <!-- Populates properties svn.URL and svn.Revision using "svn info". --> <!--_____________________________________________
--> <target name="get-svn-info"> - <exec dir="." executable="svn" outputproperty="svn.info" failonerror="true"> + <exec dir="." executable="${svn.exe}" outputproperty="svn.info" failonerror="true"> <arg value="info"/> </exec> <loadproperties> Modified: lucene/dev/branches/branch_3x/solr/build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff_____________________________________________
--- lucene/dev/branches/branch_3x/solr/build.xml (original) +++ lucene/dev/branches/branch_3x/solr/build.xml Tue Mar 22 19:50:05 2011 @@ -761,7 +761,7 @@ <target name="svn-export-source" depends="get-svn-info"> <delete dir="${svn.export.dir}" includeemptydirs="true" failonerror="false"/> <mkdir dir="${dest}"/> - <exec dir="." executable="svn" failonerror="true"> + <exec dir="." executable="${svn.exe}" failonerror="true"> <arg value="export"/> <arg value="--native-eol"/> <arg value="LF"/> @@ -774,7 +774,7 @@ <!-- Populates properties svn.URL and svn.Revision using "svn info" --> <target name="get-svn-info"> - <exec dir=".." executable="svn" outputproperty="svn.info" failonerror="true"> + <exec dir=".." executable="${svn.exe}" outputproperty="svn.info" failonerror="true"> <arg value="info"/> </exec> <loadproperties> @@ -874,7 +874,7 @@ </target> <target name="svn-up"> - <exec executable="svn"> + <exec executable="${svn.exe}"> <arg value="update"/> </exec> </target> Modified:
lucene/dev/branches/branch_3x/solr/common-build.xml URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/common-build.xml?rev=1084324&r1=1084323&r2=1084324&view=diff_____________________________________________
--- lucene/dev/branches/branch_3x/solr/common-build.xml (original) +++ lucene/dev/branches/branch_3x/solr/common-build.xml Tue Mar 22 19:50:05 2011 @@ -81,6 +81,7 @@ default PATH. (this is useful for Hudson) --> <property name="svnversion.exe" value="svnversion" /> + <property name="svn.exe" value="svn" /> <!-- Java Version we are compatible with --> <property name="java.compat.version" value="1.5" />