You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2020/04/02 09:50:39 UTC
[royale-compiler] 04/08: Fix for the fix.
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 332a2e8d366136ba435a10a6bb8c37a66ad28532
Author: greg-dove <gr...@gmail.com>
AuthorDate: Thu Apr 2 22:30:38 2020 +1300
Fix for the fix.
---
.../src/main/java/org/apache/royale/maven/BaseMojo.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
index 9968054..a72a0fb 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/BaseMojo.java
@@ -285,8 +285,9 @@ public abstract class BaseMojo
additionalCompilerOptions = additionalCompilerOptions.replaceAll("=\\s+", "=");
//remove whitespace before or after any ',' (this assumes that ',' is never part of a value assignment itself and is only used to separate list values in config settings)
additionalCompilerOptions = additionalCompilerOptions.replaceAll("\\s*,\\s*", ",");
- //any other whitespace can be resolved to a single separator (';') multiple sequential separators will be ignored if there are explicit ';' separators included
- additionalCompilerOptions = additionalCompilerOptions.replaceAll("\\s+", ";");
+
+ //any explicit line separators can be resolved to a single separator (';') multiple sequential separators will be ignored if there are explicit ';' separators included below
+ additionalCompilerOptions = additionalCompilerOptions.replaceAll("(\\r\\n?|\\n)+", ";");
if (additionalCompilerOptions.contains(";"))
{
String[] options = additionalCompilerOptions.split(";");