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 2019/05/19 06:46:59 UTC
[royale-compiler] 02/03: Allow line-based separation of individual
additionalCompilerOptions entries in pom.xml
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch improvements/Language
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit e59fbf8152c09b65dbf7bb2dc74913a06b10c69d
Author: greg-dove <gr...@gmail.com>
AuthorDate: Sun May 19 17:32:23 2019 +1200
Allow line-based separation of individual additionalCompilerOptions entries in pom.xml
---
.../src/main/java/org/apache/royale/maven/BaseMojo.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 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 74af100..d748ffa 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
@@ -236,16 +236,20 @@ public abstract class BaseMojo
List<String> args = new LinkedList<String>();
args.add("-load-config=" + configFile.getPath());
if(additionalCompilerOptions != null) {
+ if (additionalCompilerOptions.contains("\n")) additionalCompilerOptions = additionalCompilerOptions.replace("\n", "");
if (additionalCompilerOptions.contains(";"))
{
String[] options = additionalCompilerOptions.split(";");
for (String option : options)
{
- args.add(option);
+ if (option.trim().length() > 0)
+ args.add(option.trim());
}
}
- else
- args.add(additionalCompilerOptions);
+ else {
+ if (additionalCompilerOptions.trim().length() > 0)
+ args.add(additionalCompilerOptions.trim());
+ }
}
return args;
}