You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2019/05/31 06:48:22 UTC
[royale-compiler] branch release_practice updated (d77fcba ->
31e54ab)
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a change to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from d77fcba [maven-release-plugin] prepare for next development iteration
new 7b712d8 use debugfile alias in fxg
new 31e54ab Revert "[maven-release-plugin] prepare for next development iteration"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
compiler-common/pom.xml | 4 ++--
compiler-externc/pom.xml | 8 ++++----
compiler-jx/pom.xml | 14 +++++++-------
compiler-test-utils/pom.xml | 4 ++--
compiler/pom.xml | 10 +++++-----
.../royale/compiler/internal/units/FXGCompilationUnit.java | 13 ++++++++++++-
debugger/pom.xml | 8 ++++----
flex-compiler-oem/pom.xml | 10 +++++-----
pom.xml | 2 +-
royale-ant-tasks/pom.xml | 4 ++--
royale-maven-plugin/pom.xml | 4 ++--
swfutils/pom.xml | 4 ++--
12 files changed, 48 insertions(+), 37 deletions(-)
[royale-compiler] 02/02: Revert "[maven-release-plugin] prepare for
next development iteration"
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 31e54ab98d9617bd36193c265d26359c90dda4dd
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu May 30 23:47:42 2019 -0700
Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit d77fcba21bb91c40b80b0665e6f831d25ab12ae6.
---
compiler-common/pom.xml | 4 ++--
compiler-externc/pom.xml | 8 ++++----
compiler-jx/pom.xml | 14 +++++++-------
compiler-test-utils/pom.xml | 4 ++--
compiler/pom.xml | 10 +++++-----
debugger/pom.xml | 8 ++++----
flex-compiler-oem/pom.xml | 10 +++++-----
pom.xml | 2 +-
royale-ant-tasks/pom.xml | 4 ++--
royale-maven-plugin/pom.xml | 4 ++--
swfutils/pom.xml | 4 ++--
11 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/compiler-common/pom.xml b/compiler-common/pom.xml
index 235e0f6..a1195c9 100644
--- a/compiler-common/pom.xml
+++ b/compiler-common/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>compiler-common</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-Common</name>
<description>The Apache Royale Compiler Common classes</description>
diff --git a/compiler-externc/pom.xml b/compiler-externc/pom.xml
index 63c4451..efa2e1b 100644
--- a/compiler-externc/pom.xml
+++ b/compiler-externc/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>compiler-externc</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Externc</name>
<description>The Apache Royale Compiler Externs Compiler</description>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.javascript</groupId>
@@ -143,7 +143,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/compiler-jx/pom.xml b/compiler-jx/pom.xml
index fb8236a..c0a6e01 100644
--- a/compiler-jx/pom.xml
+++ b/compiler-jx/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>compiler-jx</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler-JX</name>
@@ -78,17 +78,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -132,7 +132,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
diff --git a/compiler-test-utils/pom.xml b/compiler-test-utils/pom.xml
index 83ac366..a69393c 100644
--- a/compiler-test-utils/pom.xml
+++ b/compiler-test-utils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Test Utils</name>
<description>
diff --git a/compiler/pom.xml b/compiler/pom.xml
index 3423877..924cf40 100644
--- a/compiler/pom.xml
+++ b/compiler/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>compiler</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Compiler</name>
<description>The Apache Royale Compiler</description>
@@ -538,7 +538,7 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-common</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.flex</groupId>
@@ -590,13 +590,13 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-test-utils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-externc</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git a/debugger/pom.xml b/debugger/pom.xml
index 22b6dc3..3dd57b8 100644
--- a/debugger/pom.xml
+++ b/debugger/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>debugger</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: Debugger</name>
@@ -88,12 +88,12 @@ Do all the JBurg code generation.
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
diff --git a/flex-compiler-oem/pom.xml b/flex-compiler-oem/pom.xml
index 065bea5..bb61461 100644
--- a/flex-compiler-oem/pom.xml
+++ b/flex-compiler-oem/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>flex-compiler-oem</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: OEM Layer</name>
@@ -45,17 +45,17 @@
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-jx</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>swfutils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index d2ce7ca..d417606 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Royale: Compiler: Parent</name>
diff --git a/royale-ant-tasks/pom.xml b/royale-ant-tasks/pom.xml
index 2546247..f1edce5 100644
--- a/royale-ant-tasks/pom.xml
+++ b/royale-ant-tasks/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>royale-ant-tasks</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Royale Ant Tasks</name>
diff --git a/royale-maven-plugin/pom.xml b/royale-maven-plugin/pom.xml
index ad48e21..e29593b 100644
--- a/royale-maven-plugin/pom.xml
+++ b/royale-maven-plugin/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>royale-maven-plugin</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Royale: Royale Maven Plugin</name>
diff --git a/swfutils/pom.xml b/swfutils/pom.xml
index 98d9d43..85c5ebe 100644
--- a/swfutils/pom.xml
+++ b/swfutils/pom.xml
@@ -23,11 +23,11 @@
<parent>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>royale-compiler-parent</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
</parent>
<artifactId>swfutils</artifactId>
- <version>0.9.7-SNAPSHOT</version>
+ <version>0.9.6-SNAPSHOT</version>
<name>Apache Royale: Compiler: SWFUtils</name>
<description>The Apache Royale Compiler SWF Utility classes</description>
[royale-compiler] 01/02: use debugfile alias in fxg
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch release_practice
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit 7b712d81322e5a55eee6e802bdf0eab1fdf7a639
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu May 30 23:46:29 2019 -0700
use debugfile alias in fxg
---
.../royale/compiler/internal/units/FXGCompilationUnit.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/units/FXGCompilationUnit.java b/compiler/src/main/java/org/apache/royale/compiler/internal/units/FXGCompilationUnit.java
index aed04d4..406f6fa 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/units/FXGCompilationUnit.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/units/FXGCompilationUnit.java
@@ -52,6 +52,7 @@ import org.apache.royale.compiler.internal.fxg.sax.FXGSAXParser;
import org.apache.royale.compiler.internal.parsing.as.ASParser;
import org.apache.royale.compiler.internal.projects.CompilerProject;
import org.apache.royale.compiler.internal.projects.DefinitionPriority.BasePriority;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.scopes.ASProjectScope;
import org.apache.royale.compiler.internal.scopes.FXGFileScope;
import org.apache.royale.compiler.internal.scopes.PackageScope;
@@ -64,6 +65,7 @@ import org.apache.royale.compiler.internal.units.requests.ASFileScopeRequestResu
import org.apache.royale.compiler.internal.units.requests.SyntaxTreeRequestResult;
import org.apache.royale.compiler.problems.ICompilerProblem;
import org.apache.royale.compiler.problems.InternalCompilerProblem2;
+import org.apache.royale.compiler.projects.ICompilerProject;
import org.apache.royale.compiler.units.requests.IABCBytesRequestResult;
import org.apache.royale.compiler.units.requests.IFileScopeRequestResult;
import org.apache.royale.compiler.units.requests.IOutgoingDependenciesRequestResult;
@@ -95,7 +97,16 @@ public class FXGCompilationUnit extends CompilationUnitBase
public GeneratedSourceFileSpecfication(String name, String content)
{
this.reader = new StringReader(content);
- this.name = FilenameNormalization.normalize(name);
+ String alias = null;
+ ICompilerProject project = FXGCompilationUnit.this.getProject();
+ if (project instanceof RoyaleProject)
+ {
+ alias = ((RoyaleProject)project).getSwfDebugfileAlias();
+ }
+ if (alias != null)
+ this.name = alias + "/" + name;
+ else
+ this.name = FilenameNormalization.normalize(name);
}
private final StringReader reader;