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 2020/08/21 21:58:28 UTC

[royale-compiler] 01/03: COMPJSC: always use / in the file entry path when including .js.map files into SWCs

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

commit 872574b016b2f0cc686409d4f401908f887eff12
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Fri Aug 21 14:17:11 2020 -0700

    COMPJSC: always use / in the file entry path when including .js.map files into SWCs
    
    This matches the behavior of how .js files are included, which seems to have been started as part of making reproducible builds.
---
 .../src/main/java/org/apache/royale/compiler/clients/COMPJSC.java       | 1 +
 .../src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java | 2 ++
 .../src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java | 1 +
 3 files changed, 4 insertions(+)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
index 2d42011..979d70e 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSC.java
@@ -544,6 +544,7 @@ public class COMPJSC extends MXMLJSC
                                     cu.getQualifiedNames().get(0),
                                     isExterns ? externsOut : jsOut,
                                     false).getPath();
+                                sourceMapFile = sourceMapFile.replace('\\', '/');
                                 if (config.isVerbose())
                                 {
                                     System.out.println("Writing file: " + sourceMapFile);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
index 57d2ead..7f85f76 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCNative.java
@@ -347,6 +347,7 @@ public class COMPJSCNative extends MXMLJSCNative
                                     cu.getQualifiedNames().get(0),
                                     isExterns ? externsOut : jsOut,
                                     false).getPath();
+                            outputClassFile = outputClassFile.replace('\\', '/');
                             if (config.isVerbose())
                             {
                                 System.out.println("Writing file: " + outputClassFile);     	
@@ -362,6 +363,7 @@ public class COMPJSCNative extends MXMLJSCNative
                                     cu.getQualifiedNames().get(0),
                                     isExterns ? externsOut : jsOut,
                                     false).getPath();
+                                sourceMapFile = sourceMapFile.replace('\\', '/');
                                 if (config.isVerbose())
                                 {
                                     System.out.println("Writing file: " + sourceMapFile);
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
index a370772..ed38c4b 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/COMPJSCRoyale.java
@@ -431,6 +431,7 @@ public class COMPJSCRoyale extends MXMLJSCRoyale
                                                                                 cu.getQualifiedNames().get(0),
                                                                                 isExterns ? externsOut : jsOut,
                                                                                 false).getPath();
+                                sourceMapFile = sourceMapFile.replace('\\', '/');
                                 if (config.isVerbose())
                                 {
                                     System.out.println("Writing file: " + sourceMapFile);