You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2020/08/05 22:41:36 UTC

svn commit: r1880619 - /poi/trunk/build.xml

Author: kiwiwings
Date: Wed Aug  5 22:41:36 2020
New Revision: 1880619

URL: http://svn.apache.org/viewvc?rev=1880619&view=rev
Log:
try to fix windows builds - path issues with regex patterns

Modified:
    poi/trunk/build.xml

Modified: poi/trunk/build.xml
URL: http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1880619&r1=1880618&r2=1880619&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Wed Aug  5 22:41:36 2020
@@ -849,7 +849,11 @@ under the License.
             <local name="cp_java"/>
             <pathconvert property="cp_java" pathsep=",">
                 <path><lib/></path>
-                <regexpmapper from="^${basedir}[/\\](.*)$" to="\1/*.jar"/>
+                <filtermapper>
+                    <replacestring from="${basedir}" to=""/>
+                    <replaceregex pattern="^." replace=""/>
+                    <suffixlines suffix="${file.separator}*.jar"/>
+                </filtermapper>
             </pathconvert>
 
             <local name="maven-name"/>
@@ -1106,7 +1110,11 @@ under the License.
             <local name="cp_java"/>
             <pathconvert property="cp_java" pathsep=",">
                 <path refid="@{modulepath-ref}"/>
-                <regexpmapper from="^${basedir}[/\\](.*)$" to="\1/*.jar"/>
+                <filtermapper>
+                    <replacestring from="${basedir}" to=""/>
+                    <replaceregex pattern="^." replace=""/>
+                    <suffixlines suffix="${file.separator}*.jar"/>
+                </filtermapper>
             </pathconvert>
 
             <jacoco:coverage enabled="${coverage.enabled}" excludes="${coverage.excludes}" destfile="@{jacocodest}">



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org