You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/10/19 09:42:26 UTC

[royale-compiler] branch develop updated (30bbf1b -> 3151e46)

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.


    from 30bbf1b  improve constant handling in typedefs.  @const is used in externs for both read-only and true constants because from GCC's perspective they are the same (you can't write to them) but we want to make certain constants actually be constants so they can be used as default parameter values and other places where compile-time constants are required
     new 9e6ee00  Revert "remove sourceMappingURL from App.js release, still need to remove the generation of the source map file App.js.map"
     new 3151e46  Revert "avoid generation of the .js.map file in release mode for App.js"

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:
 .../internal/codegen/mxml/royale/MXMLRoyalePublisher.java    |  5 ++---
 .../royale/compiler/utils/JSClosureCompilerWrapper.java      | 12 ++++--------
 2 files changed, 6 insertions(+), 11 deletions(-)


[royale-compiler] 02/02: Revert "avoid generation of the .js.map file in release mode for App.js"

Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 3151e46b23d69da1c0c62d63833bbeb37d025f52
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Oct 19 11:42:02 2018 +0200

    Revert "avoid generation of the .js.map file in release mode for App.js"
    
    This reverts commit ad33823b2073094087ad2bd157a4c47f6e61dc2a.
---
 .../internal/codegen/mxml/royale/MXMLRoyalePublisher.java    |  2 +-
 .../royale/compiler/utils/JSClosureCompilerWrapper.java      | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
index 968a7f5..281fe99 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
@@ -505,7 +505,7 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
             compilerWrapper.setOptions(projectReleaseMainFile.getCanonicalPath(), useStrictPublishing, !googConfiguration.getRemoveCirculars(), projectName);
             compilerWrapper.targetFilePath = projectReleaseMainFile.getCanonicalPath();
 
-            compilerWrapper.compile(false);
+            compilerWrapper.compile();
 
             appendSourceMapLocation(projectReleaseMainFile, projectName);
         }
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
index a7dd7dd..5437c70 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/utils/JSClosureCompilerWrapper.java
@@ -122,8 +122,7 @@ public class JSClosureCompilerWrapper
     	provideds = set;
     }
     
-    // isDebug is used to avoid sourceMaps on release build
-    public void compile(Boolean isDebug)
+    public void compile()
     {
     	System.out.println("list of source files");
     	for (SourceFile file : jsSourceFiles_)
@@ -165,12 +164,9 @@ public class JSClosureCompilerWrapper
             targetFile.write(compiler_.toSource());
             targetFile.close();
 
-            if(isDebug)
-            {
-                FileWriter sourceMapFile = new FileWriter(options_.sourceMapOutputPath);
-                compiler_.getSourceMap().appendTo(sourceMapFile, "");
-                sourceMapFile.close();
-            }
+            FileWriter sourceMapFile = new FileWriter(options_.sourceMapOutputPath);
+            compiler_.getSourceMap().appendTo(sourceMapFile, "");
+            sourceMapFile.close();
         }
         catch (IOException error)
         {


[royale-compiler] 01/02: Revert "remove sourceMappingURL from App.js release, still need to remove the generation of the source map file App.js.map"

Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 9e6ee00a7471c0453d848494cdbaeca369c24fe2
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Oct 19 11:41:34 2018 +0200

    Revert "remove sourceMappingURL from App.js release, still need to remove the generation of the source map file App.js.map"
    
    This reverts commit 0daed06bd828274cf8d7a3f6ff75eaee42aaf624.
---
 .../compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
index 07336a2..968a7f5 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java
@@ -507,8 +507,7 @@ public class MXMLRoyalePublisher extends JSGoogPublisher implements IJSPublisher
 
             compilerWrapper.compile(false);
 
-            //we don't want sourceMap file in release build since it's only needed in debug
-            //appendSourceMapLocation(projectReleaseMainFile, projectName);
+            appendSourceMapLocation(projectReleaseMainFile, projectName);
         }
 
         // if (ok)