flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [50/50] git commit: [flex-falcon] [refs/heads/dual] - Merge branch 'develop' into dual
Date Thu, 13 Apr 2017 17:44:21 GMT
Merge branch 'develop' into dual

Conflicts:
	compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
	compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
	flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
	flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f39e0fbc
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f39e0fbc
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f39e0fbc

Branch: refs/heads/dual
Commit: f39e0fbc379228bd29c1027f86631d056bf3e362
Parents: f1860c1 9f793c6
Author: Alex Harui <aharui@apache.org>
Authored: Thu Apr 13 10:43:29 2017 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu Apr 13 10:43:29 2017 -0700

----------------------------------------------------------------------
 RELEASE_NOTES_JX                                |  13 +-
 compiler-jx/pom.xml                             |   2 +
 .../flex/compiler/codegen/INestingEmitter.java  |  26 +
 .../flex/compiler/codegen/as/IASEmitter.java    |   3 +-
 .../flex/compiler/codegen/js/IJSEmitter.java    |  38 +-
 .../compiler/codegen/js/IMappingEmitter.java    |  66 +++
 .../flex/compiler/driver/js/IJSBackend.java     |   4 +-
 .../flex/compiler/internal/codegen/Emitter.java |  28 ++
 .../compiler/internal/codegen/as/ASEmitter.java |  31 +-
 .../compiler/internal/codegen/js/JSEmitter.java |  16 +
 .../internal/codegen/js/JSSessionModel.java     |   2 +
 .../internal/codegen/js/JSSourceMapEmitter.java |  10 +-
 .../compiler/internal/codegen/js/JSWriter.java  |   7 +-
 .../codegen/js/flexjs/JSFlexJSEmitter.java      |  57 ++-
 .../internal/codegen/js/goog/JSGoogEmitter.java |   3 +-
 .../codegen/js/goog/JSGoogEmitterTokens.java    |   2 +
 .../codegen/js/jx/DynamicAccessEmitter.java     |   3 +
 .../internal/codegen/js/jx/FieldEmitter.java    |  25 +
 .../internal/codegen/js/jx/LiteralEmitter.java  |  12 +-
 .../codegen/js/jx/MemberAccessEmitter.java      |  21 +-
 .../codegen/js/jx/PackageFooterEmitter.java     |  39 +-
 .../internal/codegen/js/utils/EmitterUtils.java |  29 ++
 .../internal/codegen/mxml/MXMLWriter.java       |  25 +-
 .../codegen/mxml/flexjs/MXMLEventSpecifier.java |   3 +
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java  | 473 +++++++++++++------
 .../mxml/flexjs/MXMLFlexJSPublisher.java        | 168 +++++--
 .../compiler/internal/driver/js/JSBackend.java  |   3 +-
 .../compiler/internal/graph/GoogDepsWriter.java | 420 ++++++++++++----
 .../internal/projects/FlexJSProject.java        |   4 +-
 .../utils/JSClosureCompilerWrapper.java         |  12 +-
 .../apache/flex/compiler/utils/NativeUtils.java |  13 +
 compiler-jx/src/test/build.xml                  |   2 +
 .../js/flexjs/TestFlexJSExpressions.java        |  45 ++
 .../js/flexjs/TestFlexJSGlobalClasses.java      |  51 ++
 .../js/flexjs/TestFlexJSGlobalFunctions.java    |   2 +-
 .../codegen/js/flexjs/TestFlexJSPackage.java    |   4 +-
 .../codegen/js/flexjs/TestFlexJSProject.java    |  17 +
 .../codegen/js/goog/TestGoogProject.java        |  35 ++
 .../mxml/flexjs/TestFlexJSMXMLApplication.java  |  47 +-
 .../mxml/flexjs/TestFlexJSMXMLScript.java       | 107 +++++
 .../sourcemaps/TestSourceMapMXMLEvents.java     |  44 ++
 .../sourcemaps/TestSourceMapMXMLScript.java     |  77 +++
 .../internal/test/FlexJSSourceMapTestBase.java  |  64 +++
 .../compiler/internal/test/FlexJSTestBase.java  |  33 ++
 .../internal/test/SourceMapTestBase.java        |   5 +-
 .../flex/compiler/internal/test/TestBase.java   |  51 ++
 .../org/apache/flex/utils/EnvProperties.java    |   1 -
 .../flexjs/projects/circular_proto/A.as         |  35 ++
 .../flexjs/projects/circular_proto/A_result.js  |  74 +++
 .../flexjs/projects/circular_proto/B.as         |  39 ++
 .../flexjs/projects/circular_proto/B_result.js  |  78 +++
 .../flexjs/projects/circular_proto/C.as         |  38 ++
 .../flexjs/projects/circular_proto/C_result.js  |  80 ++++
 .../flexjs/projects/circular_proto/D.as         |  37 ++
 .../flexjs/projects/circular_proto/D_result.js  |  80 ++++
 .../flexjs/projects/circular_proto/E.as         |  38 ++
 .../flexjs/projects/circular_proto/E_result.js  |  76 +++
 .../flexjs/projects/circular_proto/F.as         |  36 ++
 .../flexjs/projects/circular_proto/F_result.js  |  80 ++++
 .../projects/circular_proto/index_result.html   |  42 ++
 .../projects/xml_requires/XMLRequire_result.js  |   2 -
 .../flex/compiler/config/Configuration.java     |  20 +
 .../compiler/internal/embedding/EmbedData.java  |  63 ++-
 .../embedding/transcoders/DataTranscoder.java   |   4 +-
 .../projects/FlexProjectConfigurator.java       |   4 +-
 .../semantics/MethodBodySemanticChecker.java    |   7 +
 .../tree/mxml/MXMLPropertySpecifierNode.java    |  47 +-
 ...XMLBadChildTagPropertyAssignmentProblem.java |  47 ++
 .../MXMLMultipleInitializersProblem.java        |  46 ++
 .../src/test/java/as/ASInheritanceTests.java    |  59 +++
 .../flexjs/extension/FlexJsLanguageSupport.java |  14 +
 .../flexjs/extension/FlexJsScopeDeriver.java    |  14 +
 .../flexjs/extension/FlexJsScopeSelector.java   |  14 +
 .../flex/maven/flexjs/CompileAppMojo.java       |  15 +-
 .../apache/flex/maven/flexjs/CompileJSMojo.java |  40 +-
 .../apache/flex/maven/flexjs/PackageJSMojo.java | 116 +++++
 .../resources/META-INF/plexus/components.xml    |   6 +-
 pom.xml                                         |  35 +-
 78 files changed, 3026 insertions(+), 403 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSPublisher.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/main/java/org/apache/flex/compiler/internal/graph/GoogDepsWriter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/main/java/org/apache/flex/compiler/internal/projects/FlexJSProject.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/js/flexjs/TestFlexJSProject.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/test/java/org/apache/flex/compiler/internal/codegen/mxml/flexjs/TestFlexJSMXMLApplication.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/test/java/org/apache/flex/compiler/internal/test/FlexJSTestBase.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
----------------------------------------------------------------------
diff --cc compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
index 1b526b8,ee2c3f3..a481a6e
--- a/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
+++ b/compiler-jx/src/test/java/org/apache/flex/utils/EnvProperties.java
@@@ -70,12 -75,7 +70,11 @@@ public class EnvProperties 
       */
      public String GOOG;
  
 +    /**
 +     * PLAYERGLOBAL_VERSION
 +     */
 +    public String FPVER;
  
- 
      private static EnvProperties env;
  
      public static EnvProperties initiate() {

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/compiler/src/main/java/org/apache/flex/compiler/config/Configuration.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --cc flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index b2686d1,5f4b11b..46f6b33
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@@ -59,12 -58,12 +57,9 @@@ public class CompileAppMoj
      @Parameter(defaultValue = "false")
      protected boolean removeCirculars;
  
-     @Component
-     protected MavenProjectHelper mavenProjectHelper;
- 
      @Override
      protected String getToolGroupName() {
 -        if(outputJavaScript) {
 -            return "FlexJS";
 -        }
 -        return "Falcon";
 +        return "FlexJS";
      }
  
      @Override
@@@ -87,6 -89,9 +82,12 @@@
  
      @Override
      protected File getOutput() throws MojoExecutionException {
++<<<<<<< HEAD
++=======
+         if(outputJavaScript) {
+             return new File(outputDirectory, javascriptOutputDirectoryName);
+         }
++>>>>>>> develop
          return new File(outputDirectory, flashOutputFileName);
      }
  

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f39e0fbc/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
----------------------------------------------------------------------
diff --cc flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
index de53957,2347f4a..98bbe75
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileJSMojo.java
@@@ -21,12 -20,12 +21,14 @@@ import org.apache.maven.plugins.annotat
  import org.apache.maven.plugins.annotations.LifecyclePhase;
  import org.apache.maven.plugins.annotations.Mojo;
  import org.apache.maven.plugins.annotations.Parameter;
 +import org.apache.maven.project.MavenProjectHelper;
 +
  
- import java.io.File;
+ import java.io.*;
  import java.util.LinkedList;
  import java.util.List;
+ import java.util.zip.ZipEntry;
+ import java.util.zip.ZipOutputStream;
  
  /**
   * goal which compiles a project into a flexjs swc library.
@@@ -119,16 -121,43 +121,52 @@@ public class CompileJSMoj
  
      @Override
      protected boolean includeLibrary(Artifact library) {
 -        return "typedefs".equalsIgnoreCase(library.getClassifier());
 +        return "typedefs".equalsIgnoreCase(library.getClassifier()) ||
 +                "js".equalsIgnoreCase(library.getClassifier());
 +    }
 +
 +    /* return false since we will already list the libraries we want on the
 +       regular library-path and external-library-path
 +     */
 +    @Override
 +    protected boolean includeLibraryJS(Artifact library) {
 +        return false;
      }
  
+     private void createEmptySwc(File outputFile) throws MojoExecutionException {
+         if(!outputFile.getParentFile().exists()) {
+             if(!outputFile.getParentFile().mkdirs()) {
+                 throw new MojoExecutionException("Could not create directory " + outputFile.getParent());
+             }
+         }
+ 
+         // Create a dummy swc (A zip file which contains a minimal catalog.xml) */
+         try {
+             OutputStream stream = new FileOutputStream(outputFile);
+             stream = new BufferedOutputStream(stream);
+             ZipOutputStream zipStream = new ZipOutputStream(stream);
+             ZipEntry entry = new ZipEntry("catalog.xml");
+             zipStream.putNextEntry(entry);
+             byte[] dummyCatalog = (
+                     "<?xml version=\"1.0\" ?>\n" +
+                     "<swc xmlns=\"http://www.adobe.com/flash/swccatalog/9\">\n" +
+                     "    <versions>\n" +
+                     "        <swc version=\"1.2\"/>\n" +
+                     "        <compiler name=\"Apache Flex - FlexJS: Compiler: Compiler\"
version=\"0.8\" build=\"0-SNAPSHOT\"/>\n" +
+                     "    </versions>\n" +
+                     "    <features>\n" +
+                     "    </features>\n" +
+                     "    <libraries>\n" +
+                     "    </libraries>\n" +
+                     "</swc>").getBytes();
+             zipStream.write(dummyCatalog);
+             zipStream.closeEntry();
+             zipStream.close();
+         } catch (FileNotFoundException e) {
+             throw new MojoExecutionException("Could not create empty zip file at " + outputFile.getPath());
+         } catch (IOException e) {
+             throw new MojoExecutionException("Could not create empty zip file at " + outputFile.getPath());
+         }
+     }
+ 
  }


Mime
View raw message