You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2021/03/15 21:47:21 UTC
[royale-compiler] branch develop updated: royale-maven-plugin:
allow modules to build with playerglobalc and clean up some naming to avoid
confusion
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new a971579 royale-maven-plugin: allow modules to build with playerglobalc and clean up some naming to avoid confusion
a971579 is described below
commit a9715790b89a37efb5e47d15682ccfa3f45355b6
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Mar 15 14:45:54 2021 -0700
royale-maven-plugin: allow modules to build with playerglobalc and clean up some naming to avoid confusion
---
.../org/apache/royale/maven/CompilePlayerglobalMojo.java | 9 ++++++---
.../org/apache/royale/maven/GeneratePlayerglobalMojo.java | 12 ++++++++----
.../main/resources/config/generate-playerglobal-config.xml | 1 +
3 files changed, 15 insertions(+), 7 deletions(-)
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 @@ import org.apache.maven.project.MavenProjectHelper;
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 @@ public class CompilePlayerglobalMojo
@Parameter(defaultValue = "false")
private boolean skipPlayerglobal;
+ @Parameter(defaultValue = "false")
+ private boolean playerglobalAir;
+
@Component
private MavenProjectHelper projectHelper;
@@ -81,7 +84,7 @@ public class CompilePlayerglobalMojo
if(skipPlayerglobal) {
return true;
}
- File inputFolder = new File(asdocDirectoryName);
+ File inputFolder = new File(project.getBasedir(), playerglobalSourceDirectory);
return !inputFolder.exists() || !inputFolder.isDirectory();
}
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 @@ import org.apache.velocity.VelocityContext;
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 @@ public class GeneratePlayerglobalMojo
@Parameter(defaultValue = "false")
private boolean skipPlayerglobal;
+ @Parameter(defaultValue = "false")
+ private boolean playerglobalAir;
+
@Override
protected String getToolGroupName() {
return "Royale";
@@ -67,7 +70,8 @@ public class GeneratePlayerglobalMojo
@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 @@ public class GeneratePlayerglobalMojo
if(skipPlayerglobal) {
return true;
}
- File inputFolder = new File(asdocDirectoryName);
+ File inputFolder = new File(project.getBasedir(), playerglobalSourceDirectory);
return !inputFolder.exists() || !inputFolder.isDirectory();
}
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>