You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by er...@apache.org on 2017/11/08 09:28:18 UTC
[royale-compiler] 01/02: Merge branch 'develop' into wast
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a commit to branch feature/wast
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit d832c419861dd64838d57d408c73aae0887ce0af
Merge: 015d08e 8418727
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Wed Nov 8 08:21:40 2017 +0100
Merge branch 'develop' into wast
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
# Conflicts:
# compiler-jx/.classpath
# compiler-jx/.project
ApproveFalcon.xml | 18 +-
LICENSE | 19 ++
LICENSE.jx.bin => LICENSE.bin | 0
LICENSE.jx | 222 ---------------------
NOTICE | 2 +-
NOTICE.base | 2 +-
NOTICE.fdb | 2 +-
NOTICE.jx | 5 -
NOTICE.oem | 2 +-
README | 206 ++++++++++---------
README_JX | 143 -------------
README_MAVEN.txt | 23 ---
RELEASE_NOTES | 80 +-------
RELEASE_NOTES_JX | 201 -------------------
apache-flex-falcon-installer-config.xml | 94 ---------
apache-flex-falconjx-installer-config.xml | 101 ----------
build.properties | 4 +-
build.xml | 141 +++----------
compiler-build-tools/build.xml | 4 +-
compiler-build-tools/pom.xml | 2 +-
compiler-jburg-types/build.xml | 2 +-
compiler-jburg-types/pom.xml | 2 +-
compiler-jx/build.xml | 18 +-
compiler-jx/src/assembly/scripts/asjsc | 18 +-
compiler-jx/src/assembly/scripts/asjsc.bat | 6 +-
compiler-jx/src/assembly/scripts/compc | 18 +-
compiler-jx/src/assembly/scripts/compc.bat | 6 +-
compiler-jx/src/assembly/scripts/mxmlc | 18 +-
compiler-jx/src/assembly/scripts/mxmlc.bat | 6 +-
.../javascript/jscomp/RoyaleDiagnosticGroups.java | 6 +-
.../internal/codegen/js/goog/JSGoogEmitter.java | 2 +-
.../codegen/js/jx/PackageHeaderEmitter.java | 2 +-
.../codegen/mxml/royale/MXMLRoyaleEmitter.java | 2 +-
.../internal/driver/js/JSSourceFileHandler.java | 2 +-
.../driver/js/royale/JSCSSCompilationSession.java | 2 +-
.../driver/mxml/ASDocASSourceFileHandler.java | 2 +-
.../driver/mxml/ASDocMXMLSourceFileHandler.java | 2 +-
.../driver/mxml/MXMLSourceFileHandler.java | 2 +-
.../compiler/internal/graph/GoogDepsWriter.java | 2 +-
compiler-jx/src/main/resources/downloads.xml | 13 +-
compiler-jx/src/test/build.xml | 1 +
compiler-jx/src/test/downloads.xml | 4 +-
.../internal/codegen/as/TestStatements.java | 2 +-
.../codegen/js/goog/TestGoogAccessorMembers.java | 20 +-
.../internal/codegen/js/goog/TestGoogEmitter.java | 14 +-
.../codegen/js/goog/TestGoogExpressions.java | 4 +-
.../codegen/js/goog/TestGoogFieldMembers.java | 40 ++--
.../codegen/js/goog/TestGoogGlobalClasses.java | 2 +-
.../codegen/js/goog/TestGoogGlobalConstants.java | 8 +-
.../codegen/js/goog/TestGoogMethodMembers.java | 32 +--
.../codegen/js/goog/TestGoogStatements.java | 2 +-
.../js/royale/TestRoyaleAccessorMembers.java | 48 ++---
.../codegen/js/royale/TestRoyaleAccessors.java | 42 ++--
.../codegen/js/royale/TestRoyaleEmitter.java | 14 +-
.../codegen/js/royale/TestRoyaleExpressions.java | 56 +++---
.../codegen/js/royale/TestRoyaleFieldMembers.java | 68 +++----
.../codegen/js/royale/TestRoyaleGlobalClasses.java | 4 +-
.../js/royale/TestRoyaleGlobalConstants.java | 8 +-
.../internal/codegen/js/royale/TestRoyaleJSX.java | 84 ++++----
.../codegen/js/royale/TestRoyaleMethodMembers.java | 52 ++---
.../codegen/js/royale/TestRoyaleStatements.java | 18 +-
.../js/sourcemaps/TestSourceMapFieldMembers.java | 34 ++--
.../mxml/sourcemaps/TestSourceMapMXMLScript.java | 4 +-
.../royale/compiler/internal/test/ASTestBase.java | 4 +-
.../royale/compiler/internal/test/TestBase.java | 4 +-
.../test/resources/externals/app1/as_src/Main.as | 2 +-
.../royale/files/CSSTestSource_result.css | 2 +-
.../royale/projects/circular_proto/A_result.js | 2 +-
.../royale/projects/circular_proto/B_result.js | 2 +-
.../royale/projects/circular_proto/C_result.js | 2 +-
.../royale/projects/circular_proto/D_result.js | 2 +-
.../royale/projects/circular_proto/E_result.js | 2 +-
.../royale/projects/circular_proto/F_result.js | 2 +-
.../projects/circular_proto/index_result.html | 2 +-
.../AmbiguousDefinition_result.js | 2 +-
.../Event_result.js | 2 +-
.../Event_result.js | 2 +-
.../mypackage/TestClass_result.js | 2 +-
.../otherpackage/Event_result.js | 2 +-
.../Event_result.js | 2 +-
.../mypackage/TestClass_result.js | 2 +-
.../Event_result.js | 2 +-
.../mypackage/TestClass_result.js | 2 +-
.../Event_result.js | 2 +-
.../mypackage/Event_result.js | 2 +-
.../mypackage/TestClass_result.js | 2 +-
.../package_conflicts_use_window/Event_result.js | 2 +-
.../mypackage/TestClass_result.js | 2 +-
.../otherpackage/Event_result.js | 2 +-
compiler-test-utils/build.xml | 2 -
compiler-test-utils/pom.xml | 2 +-
compiler/README | 109 ----------
compiler/build.xml | 47 +++--
compiler/pom.xml | 4 +-
compiler/src/assembly/scripts/compc | 18 +-
compiler/src/assembly/scripts/compc.bat | 6 +-
compiler/src/assembly/scripts/fdb | 10 +-
compiler/src/assembly/scripts/mxmlc | 18 +-
compiler/src/assembly/scripts/mxmlc.bat | 6 +-
compiler/src/assembly/scripts/optimizer | 10 +-
compiler/src/assembly/scripts/swcdepends | 18 +-
compiler/src/assembly/scripts/swcdepends.bat | 8 +-
compiler/src/assembly/scripts/swfdump | 10 +-
.../royale/compiler/internal/parsing/as/ASParser.g | 2 +-
.../org/apache/royale/compiler/internal/css/CSS.g | 6 +-
.../org/apache/royale/compiler/asdoc/package.html | 2 +-
.../org/apache/royale/compiler/clients/ASDOC.java | 2 +-
.../org/apache/royale/compiler/clients/COMPC.java | 2 +-
.../org/apache/royale/compiler/clients/MXMLC.java | 2 +-
.../{FalconToolGroup.java => RoyaleToolGroup.java} | 8 +-
.../compiler/config/ConfigurationBuffer.java | 2 +-
.../royale/compiler/config/Configurator.java | 14 +-
.../config/ICompilerSettingsConstants.java | 2 +-
.../compiler/fxg/flex/FlexFXG2SWFTranscoder.java | 2 +-
.../internal/as/codegen/ABCGeneratingReducer.java | 2 +-
.../internal/config/ICompilerSettings.java | 4 +-
.../internal/definitions/FunctionDefinition.java | 2 +-
.../internal/definitions/NamespaceDefinition.java | 2 +-
.../internal/definitions/VariableDefinition.java | 2 +-
.../royale/compiler/internal/mxml/MXMLData.java | 6 +-
.../internal/mxml/MXMLTagAttributeData.java | 2 +-
.../royale/compiler/internal/mxml/MXMLTagData.java | 2 +-
.../internal/parsing/mxml/MXMLScopeBuilder.java | 2 +-
.../royale/compiler/internal/scopes/ASScope.java | 6 +-
.../compiler/internal/targets/LinkageChecker.java | 2 +-
.../compiler/internal/targets/RoyaleTarget.java | 6 +-
.../compiler/internal/targets/SWCTarget.java | 2 +-
.../internal/tree/mxml/MXMLInstanceNode.java | 2 +-
.../internal/tree/mxml/MXMLReparentNode.java | 2 +-
.../units/ResourceBundleCompilationUnit.java | 2 +-
.../java/org/apache/royale/compiler/package.html | 8 +-
.../ClassesMappedToSameRemoteAliasProblem.java | 2 +-
.../problems/ConstructorInInterfaceProblem.java | 2 +-
.../RoyaleOnlyConfigurationOptionNotSupported.java | 2 +-
.../royale/compiler/projects/IRoyaleProject.java | 8 +-
.../apache/royale/compiler/projects/package.html | 6 +-
.../compiler/targets/ITargetProgressMonitor.java | 2 +-
.../royale/compiler/targets/ITargetSettings.java | 6 +-
.../workspaces/IWorkspaceProfilingDelegate.java | 2 +-
.../apache/royale/compiler/workspaces/package.html | 4 +-
.../java/org/apache/royale/swc/ISWCVersion.java | 10 +-
.../java/org/apache/royale/swc/SWCVersion.java | 4 +-
.../royale/swc/catalog/ICatalogXMLConstants.java | 2 +-
.../royale/swc/catalog/StAXCatalogReader.java | 4 +-
.../royale/swc/catalog/StAXCatalogWriter.java | 10 +-
.../java/org/apache/royale/swf/io/SWFDump.java | 2 +-
.../org/apache/royale/swf/tags/ProductInfoTag.java | 2 +-
.../java/org/apache/royale/utils/ArgumentUtil.java | 2 +-
.../compiler/internal/as/codegen/CmcPatterns.jbg | 2 +-
.../as/{skeleton.falcon => skeleton.royale} | 4 +-
.../services/org.apache.flex.tools.FlexToolGroup | 2 +-
compiler/src/main/resources/downloads.xml | 27 +--
.../apache/royale/compiler/messages_en.properties | 8 +-
.../apache/royale/compiler/messages_fr.properties | 14 +-
.../apache/royale/compiler/messages_ja.properties | 12 +-
.../royale/compiler/messages_zh_CN.properties | 12 +-
compiler/src/main/resources/overview.html | 4 +-
compiler/src/test/build.xml | 44 ++--
compiler/src/test/downloads.xml | 4 +-
.../java/utils/FlashplayerSecurityHandler.java | 2 +-
debugger/build.properties | 2 +-
debugger/build.xml | 6 +-
debugger/pom.xml | 2 +-
.../tools/debugger/DefaultDebuggerCallbacks.java | 2 +-
.../tools/debugger/expression/CmcPatterns.jbg | 2 +-
flex-compiler-oem/build.xml | 6 +-
flex-compiler-oem/pom.xml | 2 +-
.../compiler/common/CompilerConfiguration.java | 24 +--
.../compiler/common/ConfigurationPathResolver.java | 2 +-
.../compiler/common/DefaultsConfigurator.java | 4 +-
.../flex2/compiler/common/FontsConfiguration.java | 2 +-
.../java/flex2/tools/CommandLineConfiguration.java | 2 +-
.../src/main/java/flex2/tools/MxmlJSC.java | 1 -
.../src/main/java/flex2/tools/Mxmlc.java | 4 +-
.../main/java/flex2/tools/ToolsConfiguration.java | 2 +-
.../src/main/java/flex2/tools/oem/Builder.java | 2 +-
.../main/java/flex2/tools/oem/Configuration.java | 10 +-
.../internal/ApplicationCompilerConfiguration.java | 2 +-
.../flex2/tools/oem/internal/OEMConfiguration.java | 4 +-
.../java/flex2/tools/oem/internal/OEMUtil.java | 2 +-
flex-compiler-oem/src/site/site.xml | 11 +-
installer.properties/en_US.properties | 22 --
installer.xml | 184 -----------------
jenkins.xml | 12 +-
pom.xml | 2 +-
royale-ant-tasks/build.xml | 20 +-
royale-ant-tasks/pom.xml | 2 +-
.../org/apache/royale/compiler/ant/COMPCTask.java | 4 +-
.../org/apache/royale/compiler/ant/FlexTask.java | 20 +-
.../org/apache/royale/compiler/ant/MXMLCTask.java | 2 +-
royale-ant-tasks/src/test/build.xml | 18 +-
royale-maven-extension/pom.xml | 2 +-
...uageSupport.java => RoyaleLanguageSupport.java} | 8 +-
...JsScopeDeriver.java => RoyaleScopeDeriver.java} | 2 +-
...ScopeSelector.java => RoyaleScopeSelector.java} | 2 +-
royale-maven-plugin/pom.xml | 2 +-
.../org/apache/royale/maven/BaseCompileMojo.java | 2 +-
.../org/apache/royale/maven/CompileJSMojo.java | 2 +-
.../apache/royale/maven/CompileTypedefsMojo.java | 2 +-
.../royale/maven/trust/DefaultTrustHandler.java | 2 +-
.../org/apache/royale/maven/types/FlexScope.java | 26 ---
.../main/resources/config/compile-app-config.xml | 6 +-
.../resources/config/compile-extern-config.xml | 1 +
src/site/asciidoc/build.adoc | 3 +-
src/site/asciidoc/featurebranch-autobuild.adoc | 2 +-
src/site/site.xml | 2 +-
206 files changed, 898 insertions(+), 2136 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@royale.apache.org" <co...@royale.apache.org>.