lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From uschind...@apache.org
Subject svn commit: r1684827 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/common-build.xml
Date Thu, 11 Jun 2015 08:20:36 GMT
Author: uschindler
Date: Thu Jun 11 08:20:36 2015
New Revision: 1684827

URL: http://svn.apache.org/r1684827
Log:
Merged revision(s) 1684825 from lucene/dev/trunk:
Fix a small problem where the "svnversion" command may output an error message and therefore
creates invalid manifest (with special chars included). This checks with regex, if the returned
SVN revision is according to spec, otherwise it writes "unknown" to manifest

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/common-build.xml   (contents, props changed)

Modified: lucene/dev/branches/branch_5x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/common-build.xml?rev=1684827&r1=1684826&r2=1684827&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_5x/lucene/common-build.xml Thu Jun 11 08:20:36 2015
@@ -635,8 +635,14 @@
     <attribute name="manifest.file" default="${manifest.file}"/>
     <element name="additional-manifest-attributes" optional="true"/>
     <sequential>
+      <local name="-svnversion-raw"/>
+      <local name="svnversion"/>
+      
       <!-- If possible, include the svnversion -->
-      <exec dir="." executable="${svnversion.exe}" outputproperty="svnversion" failifexecutionfails="false"/>
+      <exec dir="." executable="${svnversion.exe}" outputproperty="-svnversion-raw" failifexecutionfails="false"/>
+      <condition property="svnversion" value="${-svnversion-raw}" else="unknown">
+        <matches pattern="[\d:MSP]+" string="${-svnversion-raw}" casesensitive="true"/>
+      </condition>
 
       <manifest file="@{manifest.file}">
         <!--



Mime
View raw message