You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/03/27 16:13:24 UTC

[10/11] git commit: [flex-falcon] [refs/heads/feature/maven-migration] - Merge branches 'develop' and 'feature/maven-migration' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature/maven-migration

Merge branches 'develop' and 'feature/maven-migration' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature/maven-migration


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

Branch: refs/heads/feature/maven-migration
Commit: 36182c97fa0972b8254bcf5bc40bebdcb8787c12
Parents: a28717c 80e344a
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sun Mar 27 11:14:07 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sun Mar 27 11:14:07 2016 +0200

----------------------------------------------------------------------
 .../codegen/externals/ExternalsTestUtils.java   |   3 +
 .../codegen/externals/TestExternJQuery.java     |   4 +-
 .../externals/TestExternalsJSCompile.java       |  16 +-
 .../js/flexjs/TestFlexJSGlobalClasses.java      |  18 ++
 .../codegen/js/flexjs/TestFlexJSProject.java    |  74 ++++++-
 .../codegen/js/vf2js/TestVF2JSFile.java         |  14 +-
 .../mxml/flexjs/TestFlexJSMXMLApplication.java  | 204 ++++++++++++++++++-
 .../mxml/vf2js/TestVF2JSMXMLApplication.java    |   8 +-
 .../compiler/internal/test/FlexJSTestBase.java  |   6 +-
 .../compiler/internal/test/VF2JSTestBase.java   |   8 +-
 .../flexjs/projects/bad_overrides/Test.as       |  43 ++++
 .../projects/bad_overrides/Test_result.js       |  94 +++++++++
 .../flexjs/projects/bad_overrides/classes/A.as  |  41 ++++
 .../projects/bad_overrides/classes/A_result.js  |  92 +++++++++
 .../flexjs/projects/bad_overrides/classes/B.as  |  25 +++
 .../projects/bad_overrides/classes/B_result.js  |  69 +++++++
 .../flexjs/projects/bad_overrides/classes/C.as  |  25 +++
 .../projects/bad_overrides/classes/C_result.js  |  69 +++++++
 .../projects/bad_overrides/interfaces/IA.as     |  28 +++
 .../bad_overrides/interfaces/IA_result.js       |  69 +++++++
 .../projects/bad_overrides/interfaces/IB.as     |  22 ++
 .../bad_overrides/interfaces/IB_result.js       |  62 ++++++
 .../projects/bad_overrides/interfaces/IC.as     |  22 ++
 .../bad_overrides/interfaces/IC_result.js       |  62 ++++++
 .../flexjs/projects/overrides/Test.as           |  43 ++++
 .../flexjs/projects/overrides/Test_result.js    |  94 +++++++++
 .../flexjs/projects/overrides/classes/A.as      |  41 ++++
 .../projects/overrides/classes/A_result.js      |  92 +++++++++
 .../flexjs/projects/overrides/classes/B.as      |  25 +++
 .../projects/overrides/classes/B_result.js      |  69 +++++++
 .../flexjs/projects/overrides/classes/C.as      |  25 +++
 .../projects/overrides/classes/C_result.js      |  74 +++++++
 .../flexjs/projects/overrides/interfaces/IA.as  |  28 +++
 .../projects/overrides/interfaces/IA_result.js  |  69 +++++++
 .../flexjs/projects/overrides/interfaces/IB.as  |  22 ++
 .../projects/overrides/interfaces/IB_result.js  |  62 ++++++
 .../flexjs/projects/overrides/interfaces/IC.as  |  22 ++
 .../projects/overrides/interfaces/IC_result.js  |  65 ++++++
 .../codegen/js/jx/FunctionCallEmitter.java      |  23 +++
 .../codegen/js/jx/MemberAccessEmitter.java      |   5 -
 .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java  |  38 +++-
 .../internal/projects/FlexJSProject.java        |   1 -
 .../org/apache/flex/utils/AntTestAdapter.java   |   2 +-
 .../org/apache/flex/compiler/clients/ASC.java   |   9 +-
 .../flex/compiler/config/Configuration.java     |  18 ++
 .../internal/config/TargetSettings.java         |   6 +
 .../definitions/FunctionDefinition.java         |   2 +-
 .../internal/projects/CompilerProject.java      |   5 +
 .../compiler/internal/projects/FlexProject.java |  13 ++
 .../compiler/projects/ICompilerProject.java     |   7 +
 .../flex/compiler/targets/ITargetSettings.java  |   6 +
 env-template.properties                         |   4 +
 externs/js/missing.js                           |  24 ++-
 53 files changed, 1921 insertions(+), 51 deletions(-)
----------------------------------------------------------------------