flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [6/6] git commit: [flex-falcon] [refs/heads/develop] - Merge branch 'feature/flex-tool-api' into develop
Date Sun, 23 Nov 2014 12:26:43 GMT
Merge branch 'feature/flex-tool-api' into develop

Conflicts:
	compiler.jx/build.xml
	compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.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/18b403c9
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/18b403c9
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/18b403c9

Branch: refs/heads/develop
Commit: 18b403c9c20439faad4cbf6545edea3c863b738f
Parents: 461873b e92a0e9
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sun Nov 23 12:42:52 2014 +0100
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sun Nov 23 12:42:52 2014 +0100

----------------------------------------------------------------------
 compiler.jx/build.xml                           |   9 +-
 compiler.jx/downloads.xml                       |  14 ++
 .../org.apache.flex.tools.FlexToolGroup         |   2 +
 .../apache/flex/compiler/clients/COMPJSC.java   |  13 +-
 .../flex/compiler/clients/FlexJSToolGroup.java  |  36 ++++++
 .../apache/flex/compiler/clients/MXMLJSC.java   | 129 ++++++++-----------
 .../flex/compiler/clients/VF2JSToolGroup.java   |  36 ++++++
 .../codegen/js/goog/JSGoogPublisher.java        |  36 +++++-
 .../mxml/flexjs/MXMLFlexJSPublisher.java        | 125 ++++++++++++++----
 .../codegen/mxml/vf2js/MXMLVF2JSPublisher.java  |  81 ++++++++----
 .../driver/js/goog/JSGoogConfiguration.java     |   6 +-
 .../compiler/internal/graph/GoogDepsWriter.java |  58 +++++----
 compiler/build.xml                              |   7 +-
 compiler/downloads.xml                          |  14 ++
 .../org.apache.flex.tools.FlexToolGroup         |   1 +
 .../org/apache/flex/compiler/clients/COMPC.java |  15 ++-
 .../flex/compiler/clients/FalconToolGroup.java  |  36 ++++++
 .../org/apache/flex/compiler/clients/MXMLC.java |  16 ++-
 .../apache/flex/compiler/clients/Optimizer.java |  12 +-
 maven/falcon-jx-compiler.pom                    |   5 +
 20 files changed, 485 insertions(+), 166 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/18b403c9/compiler.jx/build.xml
----------------------------------------------------------------------
diff --cc compiler.jx/build.xml
index cdaf24b,1f6b4e1..82ccde8
--- a/compiler.jx/build.xml
+++ b/compiler.jx/build.xml
@@@ -88,7 -93,7 +93,7 @@@
  
  		<echo message="Building ${jsc.jar}" />
  		<jar file="${jsc.jar}" basedir="${classes.dir}"
-             includes="**/*.properties,org/apache/**/*,com/google/**/*"
 -            includes="**/*.properties,org/apache/**/*,META-INF/**/*"
++            includes="**/*.properties,org/apache/**/*,com/google/**/*,META-INF/**/*"
  			excludes="**/JSDriver*,**/IASNodeAdapter*,org/apache/flex/compiler/internal/parsing/abc/*"
>
              <manifest>
                  <attribute name="Class-Path" value="${jar.classpath}" />

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

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/18b403c9/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/vf2js/MXMLVF2JSPublisher.java
----------------------------------------------------------------------

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


Mime
View raw message