]> source.dussan.org Git - poi.git/commitdiff
try to fix windows builds - path issues with regex patterns
authorAndreas Beeker <kiwiwings@apache.org>
Wed, 5 Aug 2020 22:41:36 +0000 (22:41 +0000)
committerAndreas Beeker <kiwiwings@apache.org>
Wed, 5 Aug 2020 22:41:36 +0000 (22:41 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1880619 13f79535-47bb-0310-9956-ffa450edef68

build.xml

index 02453efb05c7b4afd27805c21061391e04a91e11..fb2e8ad613801174ac25945920a1104bcc1ce26e 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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}">