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/13 18:31:27 UTC
[royale-compiler] branch release_practice updated (efbbf18 ->
e53d2c5)
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 efbbf18 use qnames for CompilationUnit names instead of absolutefilepath so the string is the same during all builds on all platforms and machines. This may be affecting the SWF order between machines. We want them to be the same for reproducible builds
new 55550e7 Revert "[maven-release-plugin] prepare for next development iteration"
new e53d2c5 add -swf-debugfile-alias option so we can set the debugfile paths in the SWCs so they will match between build machines. It also has the advantage of removing any personally identifying paths in the builds like /users/aharui
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 ++--
.../apache/royale/compiler/config/Configuration.java | 18 ++++++++++++++++++
compiler-externc/pom.xml | 8 ++++----
compiler-jx/pom.xml | 14 +++++++-------
compiler-test-utils/pom.xml | 4 ++--
compiler/pom.xml | 10 +++++-----
.../compiler/internal/projects/RoyaleProject.java | 11 +++++++++++
.../internal/projects/RoyaleProjectConfigurator.java | 2 ++
.../compiler/internal/units/CompilationUnitBase.java | 7 +++++++
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 ++--
15 files changed, 74 insertions(+), 36 deletions(-)
[royale-compiler] 01/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 55550e78416a4e83a6a925f847fce96b46cb6c90
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu May 2 23:49:22 2019 -0700
Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ab284595a1309ad01582fdd2c4370839cff9c0da.
---
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] 02/02: add -swf-debugfile-alias option so we can
set the debugfile paths in the SWCs so they will match between build
machines. It also has the advantage of removing any personally identifying
paths in the builds like /users/aharui
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 e53d2c5585ad776bf1cb5b82f6f05119cbf2f295
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon May 13 11:31:14 2019 -0700
add -swf-debugfile-alias option so we can set the debugfile paths in the SWCs so they will match between build machines. It also has the advantage of removing any personally identifying paths in the builds like /users/aharui
---
.../apache/royale/compiler/config/Configuration.java | 18 ++++++++++++++++++
.../compiler/internal/projects/RoyaleProject.java | 11 +++++++++++
.../internal/projects/RoyaleProjectConfigurator.java | 2 ++
.../compiler/internal/units/CompilationUnitBase.java | 7 +++++++
4 files changed, 38 insertions(+)
diff --git a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
index 9b8d0de..7373ada 100644
--- a/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
+++ b/compiler-common/src/main/java/org/apache/royale/compiler/config/Configuration.java
@@ -5572,6 +5572,24 @@ public class Configuration
}
//
+ // 'swf-debugfile-alias' option
+ //
+
+ private String swfDebugfileAlias;
+
+ public String getSwfDebugfileAlias()
+ {
+ return swfDebugfileAlias;
+ }
+
+ @Config
+ @Arguments("filename")
+ public void setSwfDebugfileAlias(ConfigurationValue val, String output) throws ConfigurationException
+ {
+ this.swfDebugfileAlias = output;
+ }
+
+ //
// 'dump-config-file' option from ToolsConfiguration
//
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
index c99f5bb..fe06103 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProject.java
@@ -380,6 +380,7 @@ public class RoyaleProject extends ASProject implements IRoyaleProject, ICompile
private String objectProxyClass;
private String xmlWatcherClass;
private Name xmlWatcherClassName;
+ private String swfDebugfileAlias;
/**
* The fully-qualified name of the runtime class
@@ -2555,4 +2556,14 @@ public class RoyaleProject extends ASProject implements IRoyaleProject, ICompile
return config.getLinkReport();
}
+ public String getSwfDebugfileAlias()
+ {
+ return swfDebugfileAlias;
+ }
+
+ public void setSwfDebugfileAlias(String swfDebugfileAlias)
+ {
+ this.swfDebugfileAlias = swfDebugfileAlias;
+ }
+
}
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
index cb3a35b..2ad763a 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/projects/RoyaleProjectConfigurator.java
@@ -266,6 +266,8 @@ public class RoyaleProjectConfigurator extends Configurator
project.setAllowImportAliases(configuration.getCompilerAllowImportAliases());
project.setAllowAbstractClasses(configuration.getCompilerAllowAbstractClasses());
+ project.setSwfDebugfileAlias(configuration.getSwfDebugfileAlias());
+
DataTranscoder.embedClassName = configuration.getByteArrayEmbedClass();
}
}
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/units/CompilationUnitBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/units/CompilationUnitBase.java
index 0da5cb2..01ca6ac 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/units/CompilationUnitBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/units/CompilationUnitBase.java
@@ -58,6 +58,7 @@ import org.apache.royale.compiler.internal.projects.ASProject;
import org.apache.royale.compiler.internal.projects.CompilerProject;
import org.apache.royale.compiler.internal.projects.DefinitionPriority;
import org.apache.royale.compiler.internal.projects.DependencyGraph;
+import org.apache.royale.compiler.internal.projects.RoyaleProject;
import org.apache.royale.compiler.internal.scopes.ASFileScope;
import org.apache.royale.compiler.internal.scopes.ASProjectScope;
import org.apache.royale.compiler.internal.scopes.ASProjectScope.DefinitionPromise;
@@ -1168,6 +1169,12 @@ public abstract class CompilationUnitBase implements ICompilationUnit
rootPath = getAbsoluteFilename().replace(File.separatorChar + filenameNoPath, "");
else
rootPath = getAbsoluteFilename().replace(File.separatorChar + packagePath + File.separatorChar + filenameNoPath, "");
+ if (asProject instanceof RoyaleProject)
+ {
+ String swfDebugfileAlias = ((RoyaleProject)asProject).getSwfDebugfileAlias();
+ if (swfDebugfileAlias != null)
+ rootPath = swfDebugfileAlias;
+ }
String encodedPath = rootPath + ';' + packagePath + ';' + getFilenameNoPath();