commit 380d6d725162af10e5a135fff6fe39e39579e1a0
author Josh Tynjala <joshtynjala@apache.org> Mon Mar 15 14:45:54 2021 -0700
committer Christofer Dutz <christofer.dutz@c-ware.de> Sun Mar 21 12:08:57 2021 +0100
tree ad8d87647e3d30933f501dfa20ea9717aed3ab97
parent 5318a0bd40eb29bc52800bf27baf91ee26607678

royale-maven-plugin: allow modules to build with playerglobalc and clean up some naming to avoid confusion

royale-maven-plugin/src/main/java/org/apache/royale/maven/CompilePlayerglobalMojo.java

diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompilePlayerglobalMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompilePlayerglobalMojo.java
index bbf13b7..237912a 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompilePlayerglobalMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/CompilePlayerglobalMojo.java
@@ -38,8 +38,8 @@
 public class CompilePlayerglobalMojo
     extends BaseMojo
 {
-    @Parameter(defaultValue = "src/main/asdoc")
-    private String asdocDirectoryName;
+    @Parameter(defaultValue = "src/main/playerglobal")
+    private String playerglobalSourceDirectory;
 
     @Parameter(defaultValue = "${project.artifactId}-${project.version}.swc")
     protected String outputFileName;
@@ -47,6 +47,9 @@
     @Parameter(defaultValue = "false")
     private boolean skipPlayerglobal;
 
+    @Parameter(defaultValue = "false")
+    private boolean playerglobalAir;
+
     @Component
     private MavenProjectHelper projectHelper;
 
@@ -81,7 +84,7 @@
         if(skipPlayerglobal) {
             return true;
         }
-        File inputFolder = new File(asdocDirectoryName);
+        File inputFolder = new File(project.getBasedir(), playerglobalSourceDirectory);
         return !inputFolder.exists() || !inputFolder.isDirectory();
     }
 

royale-maven-plugin/src/main/java/org/apache/royale/maven/GeneratePlayerglobalMojo.java

diff --git a/royale-maven-plugin/src/main/java/org/apache/royale/maven/GeneratePlayerglobalMojo.java b/royale-maven-plugin/src/main/java/org/apache/royale/maven/GeneratePlayerglobalMojo.java
index 23fd6f2..876c7d0 100644
--- a/royale-maven-plugin/src/main/java/org/apache/royale/maven/GeneratePlayerglobalMojo.java
+++ b/royale-maven-plugin/src/main/java/org/apache/royale/maven/GeneratePlayerglobalMojo.java
@@ -35,8 +35,8 @@
 public class GeneratePlayerglobalMojo
         extends BaseMojo
 {
-    @Parameter(defaultValue = "src/main/asdoc")
-    private String asdocDirectoryName;
+    @Parameter(defaultValue = "src/main/playerglobal")
+    private String playerglobalSourceDirectory;
 
     @Parameter(defaultValue = "generated-sources/playerglobal")
     private String outputDirectoryName;
@@ -44,6 +44,9 @@
     @Parameter(defaultValue = "false")
     private boolean skipPlayerglobal;
 
+    @Parameter(defaultValue = "false")
+    private boolean playerglobalAir;
+
     @Override
     protected String getToolGroupName() {
         return "Royale";
@@ -67,7 +70,8 @@
     @Override
     protected VelocityContext getVelocityContext() throws MojoExecutionException {
         VelocityContext context = super.getVelocityContext();
-        context.put("asdocRoot", new File(asdocDirectoryName));
+        context.put("asdocRoot", new File(project.getBasedir(), playerglobalSourceDirectory));
+        context.put("air", playerglobalAir);
         return context;
     }
 
@@ -76,7 +80,7 @@
         if(skipPlayerglobal) {
             return true;
         }
-        File inputFolder = new File(asdocDirectoryName);
+        File inputFolder = new File(project.getBasedir(), playerglobalSourceDirectory);
         return !inputFolder.exists() || !inputFolder.isDirectory();
     }
 

royale-maven-plugin/src/main/resources/config/generate-playerglobal-config.xml

diff --git a/royale-maven-plugin/src/main/resources/config/generate-playerglobal-config.xml b/royale-maven-plugin/src/main/resources/config/generate-playerglobal-config.xml
index b8b00e5..6bd34d2 100644
--- a/royale-maven-plugin/src/main/resources/config/generate-playerglobal-config.xml
+++ b/royale-maven-plugin/src/main/resources/config/generate-playerglobal-config.xml
@@ -19,4 +19,5 @@
 <royale-config>
     <as-root>${output.path}</as-root>
     <asdoc-root>${asdocRoot.path}</asdoc-root>
+    <air>${air}</air>
 </royale-config>