flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [1/6] git commit: [flex-falcon] [refs/heads/develop] - Merge branch 'release0.8.0' into tlf
Date Mon, 03 Jul 2017 16:42:19 GMT
Repository: flex-falcon
Updated Branches:
  refs/heads/develop d79844028 -> e2ed46dad


Merge branch 'release0.8.0' into tlf

# Conflicts:
#	compiler-jx/pom.xml
#	compiler-test-utils/pom.xml
#	compiler/pom.xml
#	debugger/pom.xml
#	flex-compiler-oem/pom.xml
#	flexjs-ant-tasks/pom.xml
#	flexjs-maven-extension/pom.xml
#	flexjs-maven-plugin/pom.xml
#	pom.xml


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

Branch: refs/heads/develop
Commit: 91a29d9c0153e302ce54e20ff332c3e2f4ccc733
Parents: c96a7b9 cf07c62
Author: piotrz <piotrz@apache.org>
Authored: Sun Jun 18 14:34:55 2017 +0200
Committer: piotrz <piotrz@apache.org>
Committed: Sun Jun 18 14:34:55 2017 +0200

----------------------------------------------------------------------
 ApproveFalcon.xml                               |   2 +-
 NOTICE                                          |   2 +-
 NOTICE.base                                     |   2 +-
 NOTICE.fdb                                      |   2 +-
 NOTICE.jx                                       |   2 +-
 NOTICE.oem                                      |   2 +-
 README_JX                                       |   1 -
 RELEASE_NOTES                                   |  13 +
 RELEASE_NOTES_JX                                |   8 +
 build.xml                                       |   3 +-
 compiler-jx/.classpath                          |   1 -
 .../apache/flex/compiler/clients/COMPJSC.java   |   4 +
 .../flex/compiler/clients/COMPJSCFlex.java      |  38 +++
 .../compiler/clients/ExternCConfiguration.java  |  11 +-
 .../apache/flex/compiler/clients/MXMLJSC.java   |  47 ++-
 .../flex/compiler/clients/MXMLJSCNode.java      |   8 +-
 .../compiler/clients/MXMLJSCNodeModule.java     |  30 ++
 .../internal/codegen/js/JSSessionModel.java     |   2 +
 .../codegen/js/flexjs/JSFlexJSEmitter.java      |   3 +-
 .../internal/codegen/js/jx/AsIsEmitter.java     |   2 +-
 .../codegen/js/jx/FunctionCallEmitter.java      |   4 +
 .../codegen/js/jx/PackageHeaderEmitter.java     |  13 +-
 .../internal/codegen/js/node/NodePublisher.java |  17 +-
 .../driver/js/node/NodeModuleBackend.java       |  47 +++
 .../internal/projects/FlexJSProject.java        |  10 +-
 .../apache/flex/compiler/utils/NodeJSUtils.java |  41 +++
 compiler-jx/src/main/resources/downloads.xml    |  15 -
 .../org/apache/flex/compiler/clients/MXMLC.java |   1 +
 .../flex/compiler/common/VersionInfo.java       |   4 +-
 .../databinding/BindingDestinationMaker.java    |  21 +-
 .../css/semantics/CSSSemanticAnalyzer.java      |  36 ++-
 .../definitions/AccessorDefinition.java         |   6 +
 .../compiler/internal/projects/FlexProject.java |  11 +-
 .../compiler/internal/targets/SWFTarget.java    |   7 +-
 .../flex/tools/debugger/cli/fdb_da.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_de.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_en.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_es.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_fi.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_fr.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_it.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ja.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ko.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_nb.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_nl.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_pt.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_ru.properties   |   2 +-
 .../flex/tools/debugger/cli/fdb_sv.properties   |   2 +-
 .../tools/debugger/cli/fdb_zh_CN.properties     |   2 +-
 .../tools/debugger/cli/fdb_zh_TW.properties     |   2 +-
 .../src/main/java/flex2/compiler/Source.java    |  12 +
 .../flex2/compiler/common/Configuration.java    | 297 +++++++++++++++++++
 .../main/java/flex2/tools/oem/Application.java  |  14 +-
 .../src/main/java/flex2/tools/oem/Library.java  |  59 +++-
 .../tools/oem/internal/OEMConfiguration.java    |  15 +
 .../flex2/tools/oem/internal/OEMReport.java     |   2 +-
 .../java/flex2/tools/oem/internal/OEMUtil.java  |  40 +++
 pom.xml                                         |   6 +
 releasecandidate.xml                            |   4 +-
 59 files changed, 787 insertions(+), 110 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/91a29d9c/pom.xml
----------------------------------------------------------------------


Mime
View raw message