[royale-asjs] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 587255ddb5520d211eca87c1d0669845e217baec Merge: 99c4173 0b6a6fc Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Jan 8 13:04:54 2018 +0100 Merge branch 'develop' into as2wasm ApproveRoyale.xml | 6 +- .../flexUnitTests/CoreTester.as => GIT-TEST.txt| 16 +- LICENSE| 2 +- NOTICE | 2 +- archetypes/pom.xml | 6 +- .../royale-simple-application-archetype/pom.xml| 4 +- .../pom.xml| 4 +- .../pom.xml| 10 +- archetypes/royale-simple-library-archetype/pom.xml | 4 +- archetypes/royale-simple-typedef-archetype/pom.xml | 4 +- build.xml | 107 ++- distribution/jars/compc/pom.xml| 2 +- distribution/jars/compiler-asc/pom.xml | 2 +- distribution/jars/compiler-compc/pom.xml | 2 +- distribution/jars/compiler-mxmlc/pom.xml | 2 +- distribution/jars/compiler-optimizer/pom.xml | 2 +- distribution/jars/compiler-swfdump/pom.xml | 2 +- distribution/jars/mxmlc/pom.xml| 2 +- distribution/pom.xml | 5 +- .../src/main/resources/flex-sdk-description.xml| 4 +- .../src/main/resources/flexjs-sdk-description.xml | 32 - ...-description.xml => royale-sdk-description.xml} | 0 examples/build_example.xml | 7 + examples/pom.xml | 2 +- examples/royale/ASDoc/build.xml| 7 +- .../CordovaCameraExample-app.xml | 4 +- examples/royale/DesktopMap/DesktopMap-app.xml | 2 +- examples/royale/Flex2Royale/build.xml | 2 +- examples/royale/ListExample/pom.xml| 10 +- examples/royale/MDLBlogExample/pom.xml | 2 +- .../MDLDynamicTableExample/src/MainView.mxml | 2 +- .../itemRenderers/CustomTableRowItemRenderer.mxml | 4 +- .../src/main/resources/mdl-styles.css | 2 +- .../src/main/royale/views/InitialView.mxml | 5 +- examples/royale/MDLExample/.vscode/tasks.json | 1 - .../MDLExample/src/main/royale/TextFields.mxml | 4 +- examples/royale/MapSearch/MapSearch-app.xml| 4 +- examples/royale/MobileMap/MobileMap-app.xml| 4 +- examples/royale/MobileStocks/MobileStocks-app.xml | 4 +- examples/royale/RoyaleThemes/.vscode/tasks.json| 1 - .../royale/StorageExample/StorageExample-app.xml | 4 +- .../TreeExample/src/main/royale/MyInitialView.mxml | 18 +- frameworks/fontsrc/pom.xml | 4 +- frameworks/pom.xml | 6 +- frameworks/projects/.vscode/tasks.json | 1 - frameworks/projects/Basic/pom.xml | 20 +- .../Basic/src/main/resources/basic-manifest.xml| 3 + .../projects/Basic/src/main/resources/defaults.css | 10 +- .../projects/Basic/src/main/royale/BasicClasses.as | 4 +- .../main/royale/org/apache/royale/html/Label.as| 2 +- .../main/royale/org/apache/royale/html/TextArea.as | 4 +- .../src/main/royale/org/apache/royale/html/Tree.as | 35 +- .../main/royale/org/apache/royale/html/TreeGrid.as | 46 +- .../org/apache/royale/html/beads/DataGridView.as | 6 +- .../beads/DataItemRendererFactoryForArrayList.as | 11 +- .../DataItemRendererFactoryForCollectionView.as| 300 +++ .../DataItemRendererFactoryForHierarchicalData.as | 28 +- ...s => DynamicAddItemRendererForArrayListData.as} | 93 ++- .../DynamicItemsRendererFactoryForArrayListData.as | 13 +- .../DynamicRemoveItemRendererForArrayListData.as | 12 +- ...> DynamicUpdateItemRendererForArrayListData.as} | 42 +- .../TreeSingleSelectionMouseController.as | 21 +- .../models/SingleSelectionCollectionViewModel.as | 246 ++ .../royale/html/beads/models/TreeGridModel.as | 46 +- .../models/TreeModel.as} | 42 +- .../html/supportClasses/StringItemRenderer.as | 4 - .../royale/html/supportClasses/TreeGridColumn.as | 8 + .../royale/html/supportClasses/TreeItemRenderer.as | 14 +- frameworks/projects/Binding/pom.xml| 8 +- frameworks/projects/Charts/pom.xml | 24 +- frameworks/projects/Collections/pom.xml| 8 +- .../src/main/royale/CollectionsClasses.as | 1 + .../org/apache/royale/collections/ArrayList.as | 2 +- .../org/apache/royale/collections/FlattenedList.as | 11 + .../apache/royale/collections/HierarchicalData.as | 22 + .../apache/
[royale-compiler] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 33c76115234ea88d081ab3598c6529dd72d3b946 Merge: 34054d5 bec15f8 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Jan 8 13:04:27 2018 +0100 Merge branch 'develop' into as2wasm NOTICE | 2 +- NOTICE.base| 2 +- NOTICE.fdb | 2 +- NOTICE.oem | 2 +- compiler-common/pom.xml| 7 +- .../royale/compiler/config/Configuration.java | 3 +- compiler-externc/pom.xml | 11 ++- compiler-jx/pom.xml| 14 ++-- compiler-test-utils/pom.xml| 4 +- .../org/apache/royale/utils/AntTestAdapter.java| 2 +- compiler/pom.xml | 11 +-- .../internal/css/CSSNamespaceDefinition.java | 4 +- .../internal/parsing/SourceFragmentsReader.java| 24 ++ .../tree/mxml/MXMLClassReferenceNodeBase.java | 90 ++ .../internal/tree/mxml/MXMLExpressionNodeBase.java | 2 +- .../internal/tree/mxml/MXMLTreeBuilder.java| 2 + ...MavenTestSWCs.java => AAAMavenTestExternc.java} | 71 + compiler/src/test/java/aa/AAMavenTestSWCs.java | 23 -- debugger/pom.xml | 8 +- .../royale/tools/debugger/cli/fdb_da.properties| 2 +- .../royale/tools/debugger/cli/fdb_de.properties| 2 +- .../royale/tools/debugger/cli/fdb_en.properties| 2 +- .../royale/tools/debugger/cli/fdb_es.properties| 2 +- .../royale/tools/debugger/cli/fdb_fi.properties| 2 +- .../royale/tools/debugger/cli/fdb_fr.properties| 2 +- .../royale/tools/debugger/cli/fdb_it.properties| 2 +- .../royale/tools/debugger/cli/fdb_ja.properties| 2 +- .../royale/tools/debugger/cli/fdb_ko.properties| 2 +- .../royale/tools/debugger/cli/fdb_nb.properties| 2 +- .../royale/tools/debugger/cli/fdb_nl.properties| 2 +- .../royale/tools/debugger/cli/fdb_pt.properties| 2 +- .../royale/tools/debugger/cli/fdb_ru.properties| 2 +- .../royale/tools/debugger/cli/fdb_sv.properties| 2 +- .../royale/tools/debugger/cli/fdb_zh_CN.properties | 2 +- .../royale/tools/debugger/cli/fdb_zh_TW.properties | 2 +- flex-compiler-oem/pom.xml | 10 +-- pom.xml| 9 ++- royale-ant-tasks/pom.xml | 4 +- royale-maven-plugin/pom.xml| 4 +- swfutils/pom.xml | 7 +- 40 files changed, 189 insertions(+), 161 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] 02/02: Add condition to not assert quotes when the method is passed an “empty string”
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit bec15f843ec8d6cb3c3d3837dd0e507488fe7da1 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Jan 8 13:04:09 2018 +0100 Add condition to not assert quotes when the method is passed an “empty string” Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../apache/royale/compiler/internal/css/CSSNamespaceDefinition.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java index 2a2e217..2a2951a 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java +++ b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSNamespaceDefinition.java @@ -43,7 +43,9 @@ public class CSSNamespaceDefinition extends CSSNodeBase implements ICSSNamespace { super(tree, tokenStream, CSSModelTreeType.NAMESPACE_DEFINITION); assert uri != null : "@namespace URI can't be null."; -assert CSSStringPropertyValue.isQuoted(uri) : "Do not strip namespace quotes in parser."; +if (!uri.equals("")) { +assert CSSStringPropertyValue.isQuoted(uri) : "Do not strip namespace quotes in parser."; +} this.prefix = prefix; this.uri = CSSStringPropertyValue.stripQuotes(uri); -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] branch feature/as2wasm updated (34054d5 -> 33c7611)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 34054d5 Merge branch 'develop' into as2wasm add 75f2e92 exclude-css didn't seem to work because we resolved swc references as files add 9a5ff1c special case the HTML package to allow either child tags or html content add f440df1 handle innerHTML as special case, allowing text and HTML tags add 612b159 fix maven scm info add da9b812 maven was complaining about a missing version add d443b9a [maven-release-plugin] prepare branch release/0.9.0 add 67fe96e [maven-release-plugin] prepare for next development iteration add 0e09d1b Revert "[maven-release-plugin] prepare for next development iteration" add 5b4ae68 Revert "[maven-release-plugin] prepare branch release/0.9.0" add b4ae3be refactor these tests to try to enforce test order add 3052354 [maven-release-plugin] prepare branch release/0.9.0 add 7cc6d08 [maven-release-plugin] prepare for next development iteration add a9a6cdf need to include the test add 1b7c2e4 Revert "[maven-release-plugin] prepare for next development iteration" add 5c2f374 Revert "[maven-release-plugin] prepare branch release/0.9.0" add 36c0a2c [maven-release-plugin] prepare branch release/0.9.0 add 0b902ed [maven-release-plugin] prepare for next development iteration add a30cff8 Revert "[maven-release-plugin] prepare for next development iteration" add d6aa7e5 Revert "[maven-release-plugin] prepare branch release/0.9.0" add 27da6b9 [maven-release-plugin] prepare branch release/0.9.0 add 8f6efaf [maven-release-plugin] prepare for next development iteration add 138674a Revert "[maven-release-plugin] prepare for next development iteration" add 3c2891f Revert "[maven-release-plugin] prepare branch release/0.9.0" add 54f6b80 [maven-release-plugin] prepare branch release/0.9.0 add 622d01f [maven-release-plugin] prepare for next development iteration add 43c313e Revert "[maven-release-plugin] prepare for next development iteration" add 78e11bc Revert "[maven-release-plugin] prepare branch release/0.9.0" add 0f96d4e [maven-release-plugin] prepare branch release/0.9.0 add 0cf856a [maven-release-plugin] prepare for next development iteration add e246a67 Revert "[maven-release-plugin] prepare for next development iteration" add b57b35d Revert "[maven-release-plugin] prepare branch release/0.9.0" add 76a43c4 update copyright year add 4df8f2d [maven-release-plugin] prepare branch release/0.9.0 add 227708a [maven-release-plugin] prepare for next development iteration add ab25849 Apply normalization to the path’s string value to make it platform independent add bec15f8 Add condition to not assert quotes when the method is passed an “empty string” new 33c7611 Merge branch 'develop' into as2wasm The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 2 +- NOTICE.base| 2 +- NOTICE.fdb | 2 +- NOTICE.oem | 2 +- compiler-common/pom.xml| 7 +- .../royale/compiler/config/Configuration.java | 3 +- compiler-externc/pom.xml | 11 ++- compiler-jx/pom.xml| 14 ++-- compiler-test-utils/pom.xml| 4 +- .../org/apache/royale/utils/AntTestAdapter.java| 2 +- compiler/pom.xml | 11 +-- .../internal/css/CSSNamespaceDefinition.java | 4 +- .../internal/parsing/SourceFragmentsReader.java| 24 ++ .../tree/mxml/MXMLClassReferenceNodeBase.java | 90 ++ .../internal/tree/mxml/MXMLExpressionNodeBase.java | 2 +- .../internal/tree/mxml/MXMLTreeBuilder.java| 2 + ...MavenTestSWCs.java => AAAMavenTestExternc.java} | 71 + compiler/src/test/java/aa/AAMavenTestSWCs.java | 23 -- debugger/pom.xml | 8 +- .../royale/tools/debugger/cli/fdb_da.properties| 2 +- .../royale/tools/debugger/cli/fdb_de.properties| 2 +- .../royale/tools/debugger/cli/fdb_en.properties| 2 +- .../royale/tools/debugger/cli/fdb_es.properties| 2 +- .../royale/tools/debugger/cli/fdb_fi.properties| 2 +- .../royale/tools/debugger/cli/fd
[royale-compiler] 01/02: Apply normalization to the path’s string value to make it platform independent
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit ab2584940eac5c5964961339a4add8e61e520b9b Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Jan 8 12:30:32 2018 +0100 Apply normalization to the path’s string value to make it platform independent Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../src/main/java/org/apache/royale/utils/AntTestAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java index 5052a06..96834a9 100644 --- a/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java +++ b/compiler-test-utils/src/main/java/org/apache/royale/utils/AntTestAdapter.java @@ -84,7 +84,7 @@ public class AntTestAdapter implements ITestAdapter { @Override public String getFlexManifestPath(String type) { -return env.SDK + "\\frameworks\\" + type + "-manifest.xml"; +return FilenameNormalization.normalize(env.SDK + "\\frameworks\\" + type + "-manifest.xml"); } @Override -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] branch develop updated (227708a -> bec15f8)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 227708a [maven-release-plugin] prepare for next development iteration new ab25849 Apply normalization to the path’s string value to make it platform independent new bec15f8 Add condition to not assert quotes when the method is passed an “empty string” The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/royale/utils/AntTestAdapter.java | 2 +- .../apache/royale/compiler/internal/css/CSSNamespaceDefinition.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 34054d5ae4845acc1949e2b3f27c72d449d71597 Merge: da92fa3 995f0e8 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Dec 20 09:04:56 2017 +0100 Merge branch 'develop' into as2wasm Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> # Conflicts: # compiler-jx/.classpath # compiler-jx/.project # compiler/.classpath # compiler/.project compiler-build-tools/.classpath| 14 +++ compiler-build-tools/.project | 21 ++ compiler-common/.classpath | 17 compiler-common/.project | 32 -- .../royale/compiler/config/Configuration.java | 22 +- .../royale/compiler/config/Configurator.java | 6 +++ compiler-externc/.classpath| 18 compiler-externc/.project | 32 -- .../codegen/typedefs/TypedefsTestUtils.java| 8 ++-- compiler-jburg-types/.classpath| 15 +++ compiler-jburg-types/.project | 21 ++ compiler-jx/.classpath | 27 ++-- compiler-jx/.project | 23 -- .../codegen/js/royale/TestRoyaleClass.java | 4 +- .../royale/compiler/internal/test/TestBase.java| 28 - .../test/resources/royale/files/models/MyModel.as | 4 +- .../royale/files/models/MyModel_result.js | 6 +-- .../{externals => typedefs}/app1/as_src/Main.as| 0 compiler-test-utils/.classpath | 14 +++ compiler-test-utils/.project | 21 ++ .../org/apache/royale/utils/AntTestAdapter.java| 4 ++ compiler/.classpath| 27 ++-- compiler/.project | 49 -- .../test/java/mxml/tags/MXMLComponentTagTests.java | 4 +- .../java/mxml/tags/MXMLDefinitionTagTests.java | 3 +- .../test/java/mxml/tags/MXMLFeatureTestsBase.java | 7 ++-- .../internal/tree/mxml/MXMLComponentNodeTests.java | 22 +- .../tree/mxml/MXMLDesignLayerNodeTests.java| 4 +- .../internal/tree/mxml/MXMLNodeBaseTests.java | 9 +++- royale-ant-tasks/.classpath| 15 +++ royale-ant-tasks/.project | 21 ++ 31 files changed, 274 insertions(+), 224 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] branch feature/as2wasm updated: Add EXTERNC to the prebuild target, to make it available when compiling
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/feature/as2wasm by this push: new da92fa3 Add EXTERNC to the prebuild target, to make it available when compiling da92fa3 is described below commit da92fa3549f00a063a95a24b07c882aed27fe734 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Dec 19 15:09:09 2017 +0100 Add EXTERNC to the prebuild target, to make it available when compiling Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/build.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml index e002e67..320bcc4 100644 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@ -103,6 +103,10 @@ + + + + @@ -114,10 +118,6 @@ - - - - '].
[royale-asjs] branch feature/as2wasm updated (d1b0d3c -> 880e09a)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from d1b0d3c Merge branch 'develop' into as2wasm add 2ce8f3f DynamicRemoveItemRendererForArrayListData gets same treatment as DynamicItemsRendererFactoryForArrayListData in that it discovers the dataProvider and assigns the remove item listener when the dataProvider becomes present. add 26acf9c more tuning of release artifacts add 5dfa96c Override missing methods in MDL Table add fe0d68a Update MDLDynamicTableExample and show add/remove add 9c1b63c handle not having fonts folder add 6039b96 try to maintain execute bits in tar.gz add b704800 Adding the name that's currently the default for windows add 30599f8 first cut at npm add 62dfceb Merge branch 'develop' of https://github.com/apache/royale-asjs into develop add a7f90b3 Added initial version of TreeGrid, a Tree+DataGrid hybrid component. Modified TreeExample to demonstrate TreeGrid. add 12ac9bd try again with npm add 3764e6b shouldn't need these any more add dafa80a add Using section add 3b304a0 Updated the Slider by moving the layout into its own layout bead (HorizontalSliderLayout) and fixing some calculations. Added a VerticalSliderLayout. Mouse tracking on HTML/JS an issue. VerticalSliderLayout not fully working yet. add 7b89f3c Added first version. User will need to feed the browser path after they launch eclipse, until we find a better solution. add 4460a05 Slider updated with new layouts and tracking algorithm. Addresses GitHub issues 81, 82, 83, and 84. add ff5e475 Changed slider symbol to something more generic that works with horizontal and vertical sliders. add 357a16e hack in source attachments add f7d6724 default to LanguageJS since JSOnly packages don't have a Language.swc add 23c00b3 Add DynamicRemoveAllItemRendererForArrayListData add 915a4e7 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop add 1be8895 Added HSlider and VSlider to Express package. add eb358af Add DynamicRemoveAllByNullItemRendererForArrayListData add 3b9e38d Fixed Rectangle.contains method add e04299c First implementation of ThrottleBead add 294fc29 Fixed version number. add 8c1dbe8 Fixed typo. add 84e7b3b Add test overflow beads fixes #77 add e92c79a not needed as it's listed in the manifest add 41972b3 remove uneeded parameter add 7709edc Merge pull request #97 from justinmclean/button_text_overflow_II new 880e09a Merge branch 'develop' into as2wasm The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ApproveRoyale.xml | 146 +- InstallAdobeSDKs.xml | 1 + LICENSE| 3 +- LICENSE.bin| 2 +- build.xml | 570 + examples/build_example.xml | 2 +- examples/royale/DataBindingExample_Flat/build.xml | 4 +- .../MDLDynamicTableExample/src/MainView.mxml | 42 +- .../src/resources/mdl-styles.css | 3 +- .../TreeExample/src/main/royale/MyInitialView.mxml | 26 +- .../TreeExample/src/main/royale/models/MyModel.as | 19 +- frameworks/jquery-config-template.xml | 2 +- frameworks/js-config-template.xml | 2 +- frameworks/node-config-template.xml| 2 +- .../Basic/src/main/resources/basic-manifest.xml| 9 + .../projects/Basic/src/main/resources/defaults.css | 23 +- .../projects/Basic/src/main/royale/BasicClasses.as | 12 +- .../main/royale/org/apache/royale/html/Slider.as | 1 - .../apache/royale/html/{Tree.as => TreeGrid.as}| 59 ++- ...RemoveAllByNullItemRendererForArrayListData.as} | 58 ++- ...ynamicRemoveAllItemRendererForArrayListData.as} | 56 +- .../DynamicRemoveItemRendererForArrayListData.as | 38 +- .../org/apache/royale/html/beads/SliderView.as | 77 +-- ...{UnselectableElementBead.as => TextOverflow.as} | 48 +- .../{AccessibilityAltBead.as => ThrottleBead.as} | 98 ++-- .../org/apache/royale/html/beads/TreeGridView.as | 244 + ...ouseController.as => HSliderMouseController.as} | 97 ++-- .../beads/controllers/VSliderMouseController.as| 293 +++ .../html/beads/layouts/HorizontalSliderLayout.as | 138 + .../royale/html/beads/layouts/TreeGridLayout.as| 152 ++ .../html/beads/layouts/VerticalSliderLayout.as | 137 + ...
[royale-compiler] 02/03: Make first test work again
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit ac44c11055a3e6c1d6a214f8022f09214cbab4d5 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Dec 19 11:59:38 2017 +0100 Make first test work again Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../apache/royale/compiler/internal/codegen/wast/TestWASTClass.java | 2 -- .../test/java/org/apache/royale/compiler/internal/test/TestBase.java | 4 +++- .../java/org/apache/royale/compiler/internal/test/WASTTestBase.java | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java index bf178e6..eab8957 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java @@ -21,7 +21,6 @@ package org.apache.royale.compiler.internal.codegen.wast; import org.apache.royale.compiler.internal.test.WASTTestBase; import org.apache.royale.compiler.tree.as.IClassNode; -import org.junit.Ignore; import org.junit.Test; /** @@ -31,7 +30,6 @@ import org.junit.Test; */ public class TestWASTClass extends WASTTestBase { -@Ignore @Test public void testClassSimple() { diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java index 9e728bf..f130779 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java @@ -130,7 +130,9 @@ public class TestBase implements ITestBase { } -writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject); +if (backend instanceof IJSBackend) { + writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject); +} try { diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/WASTTestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/WASTTestBase.java index 79aea78..bd7c416 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/WASTTestBase.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/WASTTestBase.java @@ -44,6 +44,8 @@ public class WASTTestBase extends ASTestBase { super.setUp(); +writer = ((IWASTBackend) backend).createWriterBuffer(royaleWASTProject); + asEmitter = backend.createEmitter(writer); asBlockWalker = ((IWASTBackend) backend).createWalker(royaleWASTProject, errors, asEmitter); } -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] branch feature/as2wasm updated (839ceb8 -> bae45cc)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 839ceb8 Merge branch 'develop' into as2wasm new e91caf6 Make project compile again. Clean up project files… new ac44c11 Make first test work again new bae45cc Baby steps toward actual AS -> WAT transpiling The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: compiler-jx/.classpath | 18 ++-- compiler-jx/.project | 26 ++ .../internal/codegen/wast/WASTEmitter.java | 102 - .../WASTEmitterTokens.java}| 8 +- .../internal/codegen/wast/TestWASTClass.java | 4 +- .../codegen/wast/TestWASTMethodMember.java | 17 .../royale/compiler/internal/test/TestBase.java| 4 +- .../compiler/internal/test/WASTTestBase.java | 2 + compiler/.classpath| 27 +++--- compiler/.project | 40 +--- 10 files changed, 184 insertions(+), 64 deletions(-) copy compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/{js/JSDocEmitterTokens.java => wast/WASTEmitterTokens.java} (83%) create mode 100644 compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTMethodMember.java -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 01/03: Make project compile again. Clean up project files…
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit e91caf6894988495d901146f3e498d802378c0a2 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Dec 19 11:58:25 2017 +0100 Make project compile again. Clean up project files… Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/.classpath | 18 +++--- compiler-jx/.project | 26 ++ compiler/.classpath| 27 ++- compiler/.project | 40 ++-- 4 files changed, 57 insertions(+), 54 deletions(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index ae64092..0fd0343 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -1,24 +1,20 @@ - - - - - + + + + - - - - - - + + + diff --git a/compiler-jx/.project b/compiler-jx/.project index c7393cf..5b17a2c 100644 --- a/compiler-jx/.project +++ b/compiler-jx/.project @@ -17,30 +17,24 @@ - COMPILER_BUILD_TOOLS + COMPILER_COMMON 2 - COMPILER_BUILD_TOOLS + COMPILER_COMMON - COMPILER_TEST_UTILS + COMPILER_EXTERNC 2 - /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java - - - compiler-common - 2 - /Users/erik/Documents/git/royale-compiler/compiler-common - - - java - 2 - /Users/erik/Documents/git/royale-compiler/compiler-externc/src/test/java + COMPILER_EXTERNC - COMPILER_BUILD_TOOLS - file:/Users/erik/Documents/git/royale-compiler/compiler-build-tools/src/main/java + COMPILER_COMMON + file:/Users/erik/Documents/git/royale-compiler/compiler-common/src/main/java + + + COMPILER_EXTERNC + file:/Users/erik/Documents/git/royale-compiler/compiler-externc/src/test/java COMPILER_TEST_UTILS diff --git a/compiler/.classpath b/compiler/.classpath index 2bab346..55ca723 100644 --- a/compiler/.classpath +++ b/compiler/.classpath @@ -1,29 +1,30 @@ - - - + + + - - + + + + + + + + + + - - - - - - - - + diff --git a/compiler/.project b/compiler/.project index 3ce7e76..ebc1ec5 100644 --- a/compiler/.project +++ b/compiler/.project @@ -16,43 +16,55 @@ - COMPILER_BUILD_TOOLS + COMPILER_COMMON 2 - COMPILER_BUILD_TOOLS + COMPILER_COMMON - COMPILER_JBURG_TYPES + COMPILER_EXTERNC 2 - /Users/erik/Documents/git/royale-compiler/compiler-jburg-types/src/main/java + COMPILER_EXTERNC - COMPILER_TEST_UTILS + COMPILER_JBURG_TYPES 2 - /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java + COMPILER_JBURG_TYPES - compiler-test-utils + COMPILER_TEST_UTILS 2 - /Users/erik/Documents/git/royale-compiler/compiler-test-utils + COMPILER_TEST_UTILS - royale-ant-tasks + ROYALE_ANT_TASKS 2 - /Users/aharui/git/royale/ant/royale-compiler/royale-ant-tasks/src/main/java + ROYALE_ANT_TASKS - COMPILER_BUILD_TOOLS - file:/
[royale-compiler] 03/03: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 839ceb8c7d171e7e4e8d1468e0c078191f6b3d0b Merge: 1eff836 741c8ff Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Dec 15 10:05:50 2017 +0100 Merge branch 'develop' into as2wasm build.xml | 36 +--- compiler-jx/build.xml | 2 +- 2 files changed, 34 insertions(+), 4 deletions(-) diff --cc compiler-jx/build.xml index 7891931,3bfa292..e002e67 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@@ -111,29 -105,8 +111,29 @@@ - + + + + + + + + + + + + + + + + + + + + .
[royale-compiler] branch feature/as2wasm updated (66d82ab -> 839ceb8)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 66d82ab Merge branch 'develop' into as2wasm new d1d1655 Getting all my paths “straight” new 1eff836 Fixed some merge issues add aa75db8 missed some folders add 51ff038 use base NOTICE add 741c8ff comment out tar-gzip so it doesn't conflict with the one in royale-asjs when called from royale-asjs new 839ceb8 Merge branch 'develop' into as2wasm The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 36 +-- compiler-jx/.classpath | 12 --- compiler-jx/.project | 10 ++ compiler-jx/build.xml | 2 +- .../codegen/js/royale/TestRoyaleGlobalClasses.java | 6 ++-- .../royale/compiler/internal/test/TestBase.java| 41 -- compiler/.classpath| 4 +-- compiler/.project | 5 +++ 8 files changed, 83 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 01/03: Getting all my paths “straight”
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit d1d16550388335f947389d606f5103dd6300a1d7 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 11:54:00 2017 +0100 Getting all my paths “straight” Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/.classpath | 12 +++- compiler-jx/.project | 10 ++ compiler/.classpath| 4 ++-- compiler/.project | 5 + 4 files changed, 24 insertions(+), 7 deletions(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index 9c9ddc7..ae64092 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -1,22 +1,24 @@ - + + + - + - - - + + + diff --git a/compiler-jx/.project b/compiler-jx/.project index bcdd822..c7393cf 100644 --- a/compiler-jx/.project +++ b/compiler-jx/.project @@ -26,6 +26,16 @@ 2 /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java + + compiler-common + 2 + /Users/erik/Documents/git/royale-compiler/compiler-common + + + java + 2 + /Users/erik/Documents/git/royale-compiler/compiler-externc/src/test/java + diff --git a/compiler/.classpath b/compiler/.classpath index 5e26dcd..2bab346 100644 --- a/compiler/.classpath +++ b/compiler/.classpath @@ -22,8 +22,8 @@ - - + + diff --git a/compiler/.project b/compiler/.project index 7c6ccaa..3ce7e76 100644 --- a/compiler/.project +++ b/compiler/.project @@ -31,6 +31,11 @@ /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java + compiler-test-utils + 2 + /Users/erik/Documents/git/royale-compiler/compiler-test-utils + + royale-ant-tasks 2 /Users/aharui/git/royale/ant/royale-compiler/royale-ant-tasks/src/main/java -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] 02/03: Fixed some merge issues
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 1eff836025da25704eeba3dda11a73f064475bcf Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 12:47:28 2017 +0100 Fixed some merge issues Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../codegen/js/royale/TestRoyaleGlobalClasses.java | 6 ++-- .../royale/compiler/internal/test/TestBase.java| 41 -- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java index 6e7352e..1084cd2 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java @@ -45,9 +45,9 @@ public class TestRoyaleGlobalClasses extends TestGoogGlobalClasses public void setUp() { backend = createBackend(); - project = new RoyaleJSProject(workspace, backend); - project.config = new JSGoogConfiguration(); - project.setProxyBaseClass("custom.TestProxy"); + royaleJSProject = new RoyaleJSProject(workspace, backend); + royaleJSProject.config = new JSGoogConfiguration(); + royaleJSProject.setProxyBaseClass("custom.TestProxy"); super.setUp(); } diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java index 0f49239..9e728bf 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java @@ -46,9 +46,11 @@ import org.apache.royale.compiler.codegen.as.IASEmitter; import org.apache.royale.compiler.codegen.mxml.IMXMLEmitter; import org.apache.royale.compiler.config.Configurator; import org.apache.royale.compiler.driver.IBackend; +import org.apache.royale.compiler.driver.js.IJSBackend; import org.apache.royale.compiler.internal.codegen.as.ASFilterWriter; import org.apache.royale.compiler.internal.projects.RoyaleJSProject; import org.apache.royale.compiler.internal.projects.RoyaleProjectConfigurator; +import org.apache.royale.compiler.internal.projects.RoyaleWASTProject; import org.apache.royale.compiler.internal.projects.ISourceFileHandler; import org.apache.royale.compiler.internal.targets.JSTarget; import org.apache.royale.compiler.internal.tree.as.FunctionNode; @@ -85,7 +87,8 @@ public class TestBase implements ITestBase protected static EnvProperties env = EnvProperties.initiate(); protected static Workspace workspace = new Workspace(); -protected RoyaleJSProject project; +protected RoyaleJSProject royaleJSProject; +protected RoyaleWASTProject royaleWASTProject; protected IBackend backend; protected ASFilterWriter writer; @@ -111,23 +114,23 @@ public class TestBase implements ITestBase { errors = new ArrayList(); -if (project == null) +if (royaleJSProject == null) { backend = createBackend(); - project = new RoyaleJSProject(workspace, backend); - project.setProxyBaseClass("custom.TestProxy"); + royaleJSProject = new RoyaleJSProject(workspace, backend); + royaleJSProject.setProxyBaseClass("custom.TestProxy"); } -project.setProblems(errors); -RoyaleProjectConfigurator.configure(project); +royaleJSProject.setProblems(errors); +RoyaleProjectConfigurator.configure(royaleJSProject); try { Configurator projectConfigurator = backend.createConfigurator(); - project.setTargetSettings(projectConfigurator.getTargetSettings(null)); + royaleJSProject.setTargetSettings(projectConfigurator.getTargetSettings(null)); } catch (UnsupportedOperationException e) { } -writer = backend.createWriterBuffer(project); +writer = ((IJSBackend) backend).createWriterBuffer(royaleJSProject); try { @@ -317,7 +320,7 @@ public class TestBase implements ITestBase .normalize(tempFile.getAbsolutePath()); Collection mainFileCompilationUnits = workspace -.getCompilationUnits(normalizedMainFileName, project); +.getCompilationUnits(normalizedMainFileName, royaleJSProject); ICompilationUnit cu = null; for (ICompilationUnit cu2 : mainFileCompilationUnits) @@ -338,7
[royale-asjs] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit d1b0d3c7f214bbf87a0b298db00ef5e2f73fb30b Merge: 94fd828 8a1528d Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 11:42:42 2017 +0100 Merge branch 'develop' into as2wasm ApproveRoyale.xml | 62 ++ LICENSE.bin| 74 ++ build.xml | 4 ++ .../royale/org/apache/royale/svg/GraphicShape.as | 4 +- releasemgr/LICENSE | 2 +- releasemgr/README | 4 ++ releasemgr/RELEASE_NOTES | 2 +- 7 files changed, 148 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] branch feature/as2wasm updated (94fd828 -> d1b0d3c)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from 94fd828 Merge branch 'develop' into as2wasm add 0e185ef tune up new release package add e4b82f7 more improvements to ApproveRoyale add f8ff4bf even more tuning of release package add 8a1528d left and top got reversed new d1b0d3c Merge branch 'develop' into as2wasm The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ApproveRoyale.xml | 62 ++ LICENSE.bin| 74 ++ build.xml | 4 ++ .../royale/org/apache/royale/svg/GraphicShape.as | 4 +- releasemgr/LICENSE | 2 +- releasemgr/README | 4 ++ releasemgr/RELEASE_NOTES | 2 +- 7 files changed, 148 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch feature/as2wasm updated (317d3fa -> 66d82ab)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 317d3fa Merge branch 'develop' into as2wasm add 87c7a15 use correct license for args4j add b3ccc94 add label for GCC's Rhino MPL new 66d82ab Merge branch 'develop' into as2wasm The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README | 5 + compiler-jx/src/main/resources/downloads.xml | 2 ++ 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 66d82abd0859aa2322df178d066b512bc25484b9 Merge: 317d3fa b3ccc94 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 09:49:26 2017 +0100 Merge branch 'develop' into as2wasm README | 5 + compiler-jx/src/main/resources/downloads.xml | 2 ++ 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-typedefs] branch feature/wast updated (2fd00a9 -> 631d28f)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git. from 2fd00a9 replace references to Falcon per royale-compiler/#15 add 00def6f use 'typedefs' for tag name instead of 'external' because the files are externs but not external add 5ab8dfc Revert "use 'typedefs' for tag name instead of 'external' because the files are externs but not external" add a92bfdf use 'typedefs' for tag name instead of 'external' because the files are externs but not external add 5c6d4b6 Merge branch 'feature/rename' into develop add 6cd54e3 prepare for packaging all 3 repos into one source package new 631d28f Merge branch 'develop' into wast The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: LICENSE| 222 + NOTICE | 5 + README | 137 +++ RELEASE_NOTES | 24 +++ cordova/src/main/config/externc-config.xml | 4 +- createjs/src/main/config/externc-config.xml| 4 +- google_maps/src/main/config/externc-config.xml | 4 +- jasmine/src/main/config/externc-config.xml | 4 +- jquery/src/main/config/externc-config.xml | 4 +- js/src/main/config/externc-config.xml | 4 +- node/src/main/config/externc-config.xml| 4 +- 11 files changed, 402 insertions(+), 14 deletions(-) create mode 100644 LICENSE create mode 100644 NOTICE create mode 100644 README create mode 100644 RELEASE_NOTES -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-typedefs] 01/01: 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-typedefs.git commit 631d28f2d92b3f3fa738e36e9fd125f33bfa5b72 Merge: 2fd00a9 6cd54e3 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 09:09:58 2017 +0100 Merge branch 'develop' into wast LICENSE| 222 + NOTICE | 5 + README | 137 +++ RELEASE_NOTES | 24 +++ cordova/src/main/config/externc-config.xml | 4 +- createjs/src/main/config/externc-config.xml| 4 +- google_maps/src/main/config/externc-config.xml | 4 +- jasmine/src/main/config/externc-config.xml | 4 +- jquery/src/main/config/externc-config.xml | 4 +- js/src/main/config/externc-config.xml | 4 +- node/src/main/config/externc-config.xml| 4 +- 11 files changed, 402 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] branch feature/as2wasm updated (edd6198 -> 94fd828)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from edd6198 Make sure we copy this vital bit of code as well (Friday…) add f158d8f Fixed svg x/y setters add 887af31 Use fixed version in pom instead property for CreateJSExample add 7f12795 Bring back variable for typedefs version in CreateJSExample add 695bfa3 Fix binding warnings in ToDoListSampleApp example (closes #45) add 7e3eeb5 Removed some extra zeros add a6c194f The check was wrong becaue we’re using ingore coercion add 6dd1416 isHeightSizedToContent is a method, not a prop add 93febf1 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop add 28a3a8d Merge branch 'develop' of https://github.com/apache/royale-asjs into develop add dff9840 prevent minimization renaming add fd20ef5 more rename prevention add 9715509 Need as coercion here add 1689270 Changed default as coercion in HTML project add 723d1e8 Default in HTML should be JS output for code intelligence add a549c39 Cleaned up TextNode add d73adb9 skipAsCoercions for Maven build in HTML module add 7c9ea56 Moved HTMLText to Basic add ea21cdf Merge branch 'develop' of https://github.com/apache/royale-asjs into develop add df72e1a Make rect transformable add 5e50b22 Fix urls for Dialog in MDL and update dialog polyfill to 0.4.9 add bbb55af Fix open tag of flex-sdk-description template in Maven distribution add 2b6c7b0 Assigned the wrong variable add 6711a8d Fixed event dispatching on tba view change add ae6da3c Added failing test for MD5 add 02bb8d7 Declare the event type add 087bd60 Use proper setData function so subclasses can override and provide their own functionality (such as DataItemRendererForHierarchicalData). add 9b9f2a0 No default text for Radio Button add f23f2f0 Fix selectedItem set in ListSingleSelectionMouseController add 409df57 Add MDL TableRowItemMouseRenderer which allow to notify about selection changes in MDL Table add ad2c5d2 Cleaned up RadioButton add a84af91 Cleaned up GraphicShape add e0bcb89 Single selection of MDL Table row implementation add 74d19e0 Fix name of the item renderer in MDL mdl-manifest.xml file add f07931b Fix omitted references to FlexJS add 6b6efa6 Renamed HTML namespace to library://ns.apache.org/royale/html add fb1ceb9 Added HTMLElements example add 3931c21 Changed namespace in pom add b8214c3 Fixed html namespace refs add a71193c Merge branch 'develop' into feature/html-namespace add 8c199cb Merge branch 'develop' into feature/html-namespace add aec5e73 Merge branch 'develop' into feature/html-namespace add b45cecc InnerHTML should be useable with the basic namespace too. add 4e6b66e Forgot to commit add 80f930f Changed element paths add a5da50b Fixed namespaces add 668c760 Fixed the manifest add 36801a6 Elements should subclass group for better mxml support add 16b69f8 Fix to TextNode was lost add 45e51ad Merge branch 'feature/html-namespace' into develop add fa8ecba Missed some Div and Span cases add 4df823f There should not be a need to check for element add b7a2125 P slipped by add cb5cdf2 Cleaned up elements add bcdb188 Em, Hr, S, Small and Strong add 6ec2831 Fixed RoyaleTeamPage_MDL add d3339b6 Added Img add 75610ec Table, Tbody, Tfoot, Thead, Tr add 33ab0cd Added Col and Colgroup add 1698d74 Added basic properties to Input add d6d04cb Added Button add d29bc56 Hopefully these template fixes help add 35e2aaf Added Form add 4327148 Fixed SWF build add 4b207a3 Added Label add 7f81515 Hopefully this is the last one I missed add 280243a Caption, B, Textarea and U add ac81374 Updated NOTICE add 1fc66fc handle no GOOG_HOME in checkintests add 6ad6758 no more all target in royale-compiler add 1fb8e0c Merge branch 'feature/rename' into develop add 171f38d update build instructions add 9e8fc81 Added IToggleButton add a55609e Added ISelectable add 81fb1f0 Merge branch 'develop' into feature/togglebuttonbar add 098962b Changed signature of ValueEvent add b488b63 Code Cleanup add 6bc311e Made childrenAdded and childrenRemoved ValueEvents add b25a48c Added SingleSelectionContainerBead add 56aa849 Added rangeCheck add 70ba34b And reference add 285dd6c Index handling add 14918d2 Merge branch 'feature/togglebuttonbar' into develop add 16f3de0 Number of rows increases, event if there's one extra, so Math.ceil() is a more appropriate function add c1360d6 Merge branch 'develop' of https
[royale-asjs] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 94fd8287e7a6e556e302515e6fb7462ca68e632e Merge: edd6198 8417457 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 09:07:38 2017 +0100 Merge branch 'develop' into as2wasm Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> # Conflicts: # build.xml .gitignore | 1 + ApproveRoyale.xml | 166 ++- NOTICE | 4 + README.md | 8 +- .../src/main/resources/flex-sdk-description.xml| 2 +- .../asconfig.json} | 23 +- examples/royale/HTMLElements/build.xml | 54 examples/royale/HTMLElements/pom.xml | 58 .../HTMLElements/src/main/royale/HTMLElements.mxml | 53 .../ListExample/src/main/royale/MyInitialView.mxml | 39 ++- .../src/main/royale/models/ProductsModel.as| 14 +- .../src/main/royale/BlogTemplate.mxml | 95 --- .../royale/MDLExample/src/main/royale/Badges.mxml | 17 +- .../royale/MDLExample/src/main/royale/Cards.mxml | 13 +- .../royale/MDLExample/src/main/royale/Grids.mxml | 47 +-- .../royale/MDLExample/src/main/royale/Tabs.mxml| 39 +-- .../MDLExample/src/main/royale/TestDialog.mxml | 3 +- .../ActorNameAndIconListItemRenderer.mxml | 5 +- .../itemRenderers/ActorNameListItemRenderer.mxml | 5 +- .../AvatarAndActionListItemRenderer.mxml | 9 +- .../AvatarAndActionThreeLineListItemRenderer.mxml | 19 +- .../AvatarAndActionTwoLineListItemRenderer.mxml| 23 +- .../itemRenderers/CustomListItemRenderer.mxml | 5 +- .../FooterMiniLinkListItemRenderer.mxml| 3 +- .../royale/itemRenderers/MemberItemRenderer.mxml | 3 +- .../src/main/royale/MemberItemRenderer.mxml| 2 +- .../royale/sample/todo/models/TodoListModel.as | 7 +- .../sample/todo/renderers/TodoItemRenderer.mxml| 12 +- .../src/main/royale/sample/todo/vo/ToDoVO.as} | 19 +- frameworks/asdoc-config.xml| 4 +- frameworks/build.xml | 2 +- frameworks/downloads.xml | 2 +- frameworks/flex-config-template.xml| 4 +- frameworks/js/build.xml| 5 + .../src/main/config/compile-js-config.xml | 5 + frameworks/js/projects/HTMLJS/build.xml| 1 + .../HTMLJS/src/main/config/compile-js-config.xml | 5 + .../Basic/src/main/resources/basic-manifest.xml| 3 + .../projects/Basic/src/main/royale/BasicClasses.as | 13 +- .../royale/org/apache/royale/core/ContainerBase.as | 16 +- .../org/apache/royale/core/DataContainerBase.as| 21 +- .../royale/org/apache/royale/core/GroupBase.as | 20 +- .../royale/org/apache/royale/core/LayoutBase.as| 12 +- .../royale/org/apache/royale/html/CSSCheckBox.as | 5 +- .../main/royale/org/apache/royale/html/CheckBox.as | 4 +- .../main/royale/org/apache/royale/html/HTMLText.as | 0 .../royale/org/apache/royale/html/RadioButton.as | 26 +- .../org/apache/royale/html/ToggleTextButton.as | 3 +- .../beads/DataItemRendererFactoryForArrayList.as | 5 +- .../DataItemRendererFactoryForHierarchicalData.as | 8 +- .../royale/html/beads/DisableChildrenBead.as | 2 +- .../DynamicItemsRendererFactoryForArrayListData.as | 76 +++-- .../DynamicRemoveItemRendererForArrayListData.as | 136 + .../html/beads/SingleSelectionContainerBead.as | 316 + .../ListSingleSelectionMouseController.as | 1 + .../html/beads/layouts/RemovableBasicLayout.as | 102 +++ .../apache/royale/html/beads/layouts/TileLayout.as | 8 +- .../apache/royale/html/supportClasses/DataGroup.as | 19 ++ .../main/royale/org/apache/royale/svg/Circle.as| 4 +- .../main/royale/org/apache/royale/svg/Ellipse.as | 4 +- .../org/apache/royale/svg/GraphicContainer.as | 7 +- .../royale/org/apache/royale/svg/GraphicShape.as | 74 +++-- .../src/main/royale/org/apache/royale/svg/Path.as | 5 +- .../src/main/royale/org/apache/royale/svg/Rect.as | 6 +- .../src/main/royale/org/apache/royale/svg/Text.as | 4 +- .../projects/Basic/src/test/royale/build.xml | 2 +- .../royale/charts/optimized/SVGChartDataGroup.as | 20 +- .../org/apache/royale/collections/ArrayList.as | 5 + .../projects/Core/src/main/royale/CoreClasses.as | 2 + .../org/apache/royale/core/AllCSSValuesImpl.as | 4 +- .../org/apache/royale/core/IItemRendererParent.as | 1 + .../royale/org/apache/royale/core/ISelectable.as | 32 ++- .../org/apache/royale/core/SimpleCSSValuesImpl.as | 4
[royale-compiler] branch feature/as2wasm updated (eaadf5b -> 317d3fa)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from eaadf5b We’re going to get it eventually add ba1f6c0 down to 32 errors refactoring externc into one project, and trying to find a minimal set of common files add 1e1512c added ICompilationUnit to common files with some tweaking of interfaces and new interfaces add 6d7b9e4 no errors in compiler-common add 42b5f89 create compiler-common.jar add e5e6d6f no errors on compiler-common and compiler-externc. Now to get everything to build and run add a5b23f6 Fix merge issue during renaming add 87472e6 no errors compiling swf compiler add d7528f3 no errors compiling compiler-jx add 7a7c45d everything compiles except tests add 5cbf58d no errors in tests for externc add c195a29 eliminate warnings in output add 4cb9995 rename Externals to Typedefs and get tests to pass with no warnings add dc5a910 externc passes tests without dependency on royale-typedefs, and generates a pile of .as files for other tests add b7fc5bf use ordered map so SWFs use same local registers on each compile add f3b9887 use RoyaleProjectConfigurator add 050a597 let AntTestAdapter tolerate not having Flash SDK around add 4a50f7e fix up class paths for compiler-common add 415ca43 need to handle exact match of paths add 320a3df allow use of SWFDump for testing add f4b8814 add more test classes add e367530 get tests to pass without Flash add 34eaef3 get compiler-jx tests to pass without Flash add 685dc16 fix build after wipe-all add 4b6f513 compiler passes for maven. Ant build will need working dir changed for tests add 4fcfc5a compiler-jx maven build success add d2d037b fix ant build after changing test working dir to the project dir add e1dd084 factor in swfutils add 6eac63e factor in swfutils add d5c0c03 swfutils was ignored add 52157b3 ignore paths when comparing swfdumps add 1cb34aa fix temp folder add a9273f2 use 'typedefs' for tag name add bfd8dd4 Eclipse projects add 130da59 create a dummy project for now add b2c7872 this was changed to debug something and wasn't working add 5b2a780 need RoyaleProjectConfigurator add 0694681 my Eclipse projects. Yours may need different paths add 49c6ced hack so release target passes. Will need to figure out how to handle typedefs later add d1f309b fix royale-typedefs maven build add ae91c85 more RoyaleProjectConfigurator add 49304a3 use target/test-classes like maven build add f0c0d27 add comment add 6cf3287 use target/test-classes add d564716 fix where we look for env.properties add b9abcfc get tests to pass if Flash is available add 0c06266 handle windows paths add 099f95c more windows path fixing add 02b44d2 handle missing AIR_HOME add 7019ffb Merge branch 'feature/rename' into develop add acef24f Revert "fix typedefs" We later switched tool groups directly to the swf compiler add 90e650b update readme with new build instructions add 4253485 prep for packaging all 3 repos into one source package add 2f81d9c try replacing line endings add 3393dfd move that fix and try again new 317d3fa Merge branch 'develop' into as2wasm The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore |3 - LICENSE| 20 - README | 196 +- build.xml | 217 +- compiler-build-tools/pom.xml |2 +- compiler-common/.classpath | 15 + {compiler => compiler-common}/.project | 14 +- compiler-common/build.xml | 118 + {compiler-jburg-types => compiler-common}/pom.xml | 46 +- .../java/org/apache/royale/abc/ABCConstants.java |0 .../java/org/apache/royale/abc/semantics/Name.java |0 .../org/apache/royale/abc/semantics/Namespace.java |0 .../org/apache/royale/abc/semantics/Nsset.java |0 .../java/org/apache/royale/compiler/Messages.java |0 .../royale/compiler/asdoc/IASDocComment.java |0 .../royale/compiler/asdoc/IASDocDelegate.java | 12 +- .../apache/royale/compiler/asdoc/IASDocTag.java|0 .../compiler/asdoc/IASParserASDocDelegate.java | 20 +- .../asdoc/IMetadataParserASDocDelegate.java| 13 +- .../royale/compiler/a
[royale-compiler] 01/01: Merge branch 'develop' into as2wasm
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git commit 317d3fa0ec43c338097095b36d5fa843d5d19f8d Merge: eaadf5b 3393dfd Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Mon Dec 11 08:59:39 2017 +0100 Merge branch 'develop' into as2wasm Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> # Conflicts: # compiler-jx/.classpath # compiler-jx/.project # compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleGlobalClasses.java # compiler-jx/src/test/java/org/apache/royale/compiler/internal/test/TestBase.java # compiler/.project .gitignore |3 - LICENSE| 20 - README | 196 +- build.xml | 217 +- compiler-build-tools/pom.xml |2 +- compiler-common/.classpath | 15 + {compiler => compiler-common}/.project | 14 +- compiler-common/build.xml | 118 + {compiler-jburg-types => compiler-common}/pom.xml | 46 +- .../java/org/apache/royale/abc/ABCConstants.java |0 .../java/org/apache/royale/abc/semantics/Name.java |0 .../org/apache/royale/abc/semantics/Namespace.java |0 .../org/apache/royale/abc/semantics/Nsset.java |0 .../java/org/apache/royale/compiler/Messages.java |0 .../royale/compiler/asdoc/IASDocComment.java |0 .../royale/compiler/asdoc/IASDocDelegate.java | 12 +- .../apache/royale/compiler/asdoc/IASDocTag.java|0 .../compiler/asdoc/IASParserASDocDelegate.java | 20 +- .../asdoc/IMetadataParserASDocDelegate.java| 13 +- .../royale/compiler/asdoc/IPackageDITAParser.java |3 +- .../royale/compiler/caches/IAssetTagCache.java |9 +- .../royale/compiler/caches/ICSSDocumentCache.java |9 +- .../royale/compiler/caches/IFileScopeCache.java|8 +- .../apache/royale/compiler/caches/ISWFCache.java |9 +- .../clients/problems/CodeGenErrorFilter.java |6 +- .../problems/CompilerProblemCategorizer.java |0 .../compiler/clients/problems/IProblemFilter.java |0 .../problems/ProblemFilterClassCriteria.java |0 .../clients/problems/ProblemFormatter.java |0 .../compiler/clients/problems/ProblemPrinter.java |0 .../compiler/clients/problems/ProblemQuery.java| 14 +- .../clients/problems/ProblemSettingsFilter.java|0 .../apache/royale/compiler/common/ASModifier.java |0 .../royale/compiler/common/DependencyType.java |4 +- .../royale/compiler/common/DependencyTypeSet.java |0 .../apache/royale/compiler/common/IDecoration.java |0 .../compiler/common/IDefinitionPriority.java |0 .../compiler/common/IFileSpecificationGetter.java |3 +- .../royale/compiler/common/IImportTarget.java |0 .../apache/royale/compiler/common/IMetaInfo.java |0 .../royale/compiler/common/IPathResolver.java |0 .../royale/compiler/common/ISourceLocation.java|0 .../royale/compiler/common/ModifiersSet.java |4 +- .../royale/compiler/common/MutablePrefixMap.java |0 .../apache/royale/compiler/common/PrefixMap.java |0 .../royale/compiler/common/SourceLocation.java |0 .../apache/royale/compiler/common/VersionInfo.java |0 .../org/apache/royale/compiler/common/XMLName.java |0 .../compiler/config/ApplicationDomainTarget.java |0 .../compiler/config/CommandLineConfigurator.java |0 .../royale/compiler/config/Configuration.java |2 +- .../compiler/config/ConfigurationBuffer.java |0 .../royale/compiler/config/ConfigurationInfo.java |0 .../compiler/config/ConfigurationPathResolver.java |0 .../royale/compiler/config/ConfigurationValue.java |0 .../royale/compiler/config/Configurator.java | 259 +- .../compiler/config/ICompilerProblemSettings.java |0 .../config/ICompilerSettingsConstants.java |0 .../apache/royale/compiler/config/RSLSettings.java |0 .../compiler/constants/IASKeywordConstants.java|0 .../compiler/constants/IASLanguageConstants.java |0 .../compiler/constants/IASWarningConstants.java|0 .../royale/compiler/definitions/IDefinition.java |3 +- .../definitions/IDocumentableDefinition.java |0 .../compiler/definitions/IFunctionDefinition.java |0 .../compiler/definitions/IInterfaceDefinition.java |0 .../compiler/definitions/IMemberedDefinition.java |0 .../compiler/definitions/INamespaceDefinition.java |0 .../compiler/definitions/IParameterDefinition.java |0 .../royale/compiler/definitions/IQualifiers.java |0 .../co
[royale-asjs] branch feature/as2wasm updated: Ok, ok, it’s Friday… :-( Accuracy is a virtue!
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/feature/as2wasm by this push: new 661aa15 Ok, ok, it’s Friday… :-( Accuracy is a virtue! 661aa15 is described below commit 661aa1594d4ae02529f910d1d80e004f7284 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 15:18:57 2017 +0100 Ok, ok, it’s Friday… :-( Accuracy is a virtue! Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- as2wasm/dev-build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml index 41a375c..1f386ab 100644 --- a/as2wasm/dev-build.xml +++ b/as2wasm/dev-build.xml @@ -36,7 +36,7 @@ Copying 'as2wasm' transpiler and related jars from compiler build dir - + -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch feature/as2wasm updated: Make build scripts fetch the jars from the proper location
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/feature/as2wasm by this push: new 4b02899 Make build scripts fetch the jars from the proper location 4b02899 is described below commit 4b0289954c10074ba44aedffcdf35fc723556002 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 15:16:31 2017 +0100 Make build scripts fetch the jars from the proper location Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- as2wasm/dev-build.xml | 42 +++--- build.xml | 22 -- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml index 3b824e6..41a375c 100644 --- a/as2wasm/dev-build.xml +++ b/as2wasm/dev-build.xml @@ -20,20 +20,32 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + +Copying 'as2wasm' transpiler and related jars from compiler build dir + + + + + + + + + + + + + diff --git a/build.xml b/build.xml index 460db39..9e0bca2 100644 --- a/build.xml +++ b/build.xml @@ -427,24 +427,6 @@ - - -Copying 'as2wasm' transpiler and related jars from 'js/lib' - - - - - - - - - - - - - - - @@ -548,10 +530,6 @@ - - - - -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] 07/08: Make sure to pass along the location and version of playerglobal.swc
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 13d86e38725657daef8ed2738e6bcfd7cefe Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 14:10:28 2017 +0100 Make sure to pass along the location and version of playerglobal.swc Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- as2wasm/create.js | 94 +++--- as2wasm/download.js| 21 ++- as2wasm/package.json | 2 +- as2wasm/resources/build.js | 10 + 4 files changed, 70 insertions(+), 57 deletions(-) diff --git a/as2wasm/create.js b/as2wasm/create.js index c5708ec..f5a3898 100644 --- a/as2wasm/create.js +++ b/as2wasm/create.js @@ -19,8 +19,8 @@ 'use strict'; -let args, createFile, dir, fs, playerHome, playerVersion, projectName, -projectPath, projectSrcPath, royaleHome, wastcJar; +let args, copyFile, createFile, dir, fs, playerGlobalVersion, projectName, +projectPath, projectSrcPath, royaleHome, tgtDir; @@ -28,6 +28,10 @@ fs = require('fs'); +copyFile = function (file, srcDir, tgtDir) { + fs.createReadStream(srcDir + file).pipe(fs.createWriteStream(tgtDir + file)); +}; + createFile = function (file, content) { fs.writeFile(file, content, function(error) { if (error) { @@ -59,61 +63,61 @@ process.argv.slice(2).forEach(function (value) { royaleHome = process.argv[1].split('/'); royaleHome.pop(); // remove 'create.js' -royaleHome.pop(); // remove 'wast' +royaleHome.pop(); // remove 'as2wasm' royaleHome = royaleHome.join('/'); -wastcJar = royaleHome + '/wast/lib/wastc.jar'; -if (!fs.existsSync(wastcJar)) { - console.log('Transpiler \'wastc\' not found. This sdk appears not to be an sdk that is compatible with this project.'); +dir = args['dir']; +if (!fs.existsSync(dir)) { + console.log(`The intended target directory ('${dir}') does not exist.`); process.exit(); } -playerHome = args['playerglobal-home']; -if (!playerHome || '' === playerHome) { - playerHome = process.env.PLAYERGLOBAL_HOME; - if (!playerHome || '' === playerHome) { -console.log('PLAYERGLOBAL_HOME is not defined. Create an environment variable (PLAYERGLOBAL_HOME) and point it to the skd dir, or use \'npm run build -- -playerglobal-home=[playerglobal dir]\'.'); - -process.exit(); - } +projectName = args['name']; +projectPath = dir + '/' + projectName; +if (!fs.existsSync(projectPath)) { + fs.mkdirSync(projectPath); } -playerVersion = args['player-version']; -if (!playerVersion || '' === playerVersion) { - playerVersion = process.env.PLAYERGLOBAL_VERSION; +playerGlobalVersion = args['playerglobal-version']; +if (!playerGlobalVersion || '' === playerGlobalVersion) { + playerGlobalVersion = process.env.PLAYERGLOBAL_VERSION; } -if (!playerVersion || '' === playerVersion) { - playerVersion = '11.1'; +if (!playerGlobalVersion || '' === playerGlobalVersion) { + playerGlobalVersion = '25'; - console.log('PLAYERGLOBAL_VERSION was undefined. It is now set to \'11.1\'. To override this default, create an environment variable (PLAYERGLOBAL_VERSION) and set it to required version, or use \'npm run build -- -player-version=[version]\'.'); + console.log(`PLAYERGLOBAL_VERSION was undefined. It is now set to '${playerGlobalVersion}'. To override this default, create an environment variable (PLAYERGLOBAL_VERSION) and set it to required version, or use 'npm run build -- -player-version=[version]'.`); } else { - console.log('PLAYERGLOBAL_VERSION is ' + playerVersion + '.'); + console.log('PLAYERGLOBAL_VERSION is ' + playerGlobalVersion + '.'); } -if (!fs.existsSync(playerHome + '/' + playerVersion + '/playerglobal.swc')) { - console.log('\'playerglobal.swc\' could not be found. Make sure you have set PLAYERGLOBAL_HOME to a correctly downloaded and stored playerglobal.swc'); - process.exit(); -} +fs.mkdirSync(projectPath + '/lib/'); -dir = args['dir']; -if (!fs.existsSync(dir)) { - console.log(`The intended target directory ('${dir}') does not exist.`); +tgtDir = projectPath + 'lib/compiler/'; +fs.mkdirSync(tgtDir); +copyFile('wastc.jar', royaleHome + '/as2wasm/lib/', tgtDir); +copyFile('compiler.jar', royaleHome + '/as2wasm/lib/', tgtDir); - process.exit(); -} +tgtDir = projectPath + 'lib/compiler/external/'; +fs.mkdirSync(tgtDir); +copyFile('antlr-LICENSE.html', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('antlr.jar', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('commons-cli.jar', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('commons-io.jar', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('flex-tool-api-LICENSE.html', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('flex-tool-api.jar', royaleHome + '/as2wasm/lib/external/', tgtDir); +copyFile('guava-LICENSE.html', royaleHome + '/as2wasm/
[royale-asjs] 05/08: Automate much of the tool chain initialization
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 137474c814936506182bba472ac5ef4188367ef2 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 13:28:25 2017 +0100 Automate much of the tool chain initialization Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .gitignore | 3 ++ as2wasm/dev-build.xml | 2 +- as2wasm/download.js| 93 ++ as2wasm/package.json | 19 ++ as2wasm/resources/build.js | 1 - 5 files changed, 108 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a32c5ce..c77544a 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,6 @@ vf2js/frameworks/js/ #FlexJS generated files frameworks/js/FlexJS/generated-sources manualtests/FlexJSTest_SVG/bin + +#NPM +node_modules diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml index e229477..6a3e853 100644 --- a/as2wasm/dev-build.xml +++ b/as2wasm/dev-build.xml @@ -23,7 +23,7 @@ - + diff --git a/as2wasm/download.js b/as2wasm/download.js new file mode 100644 index 000..2457520 --- /dev/null +++ b/as2wasm/download.js @@ -0,0 +1,93 @@ +'use strict'; + +const promptText = '\n\ +\n\ +Apache FlexJS SDK uses the Adobe Flash Player\'s playerglobal.swc to build\n\ +Adobe Flash applications. The playerglobal.swc file is subject to and governed\n\ +by the Adobe Flex SDK License Agreement specified here:\n\ +\n\ +http://www.adobe.com/products/eulas/pdfs/adobe_flex_software_development_kit-combined-20110916_0930.pdf\n\ +\n\ +By downloading, modifying, distributing, using and/or accessing the\n\ +playerglobal.swc fileyou agree to the terms and conditions of the applicable\n\ +end user license agreement.\n\ +\n\ +In addition to the Adobe license terms, you also agree to be bound by the\n\ +third-party terms specified here:\n\ +\n\ +http://www.adobe.com/products/eula/third_party/.\n\ +\n\ +Adobe recommends that you review these third-party terms. This license is not\n\ +compatible with the Apache v2 license.\n\ +\n\ +Adobe Flash Player\'s playerglobal.swc is a required component.\n\ +\n\ +Do you want to download and install the playerglobal.swc? (y/n)'; + +let fs, fileData, prompt, request, schema; + + + +fs = require('fs'); +prompt = require('prompt'); +request = require('request'); + + + +fileData = { + fileName: 'playerglobal', + fileExtension: '.swc', + url: 'http://download.macromedia.com/get/flashplayer/updaters', + version: '25' +}; + + +schema = { + properties: { +accept: { + description: promptText.cyan, + pattern: /^[YNyn\s]$/, + message: 'Please respond with either y or n'.red, + required: true +} + } +}; + +prompt.start(); +prompt.get(schema, function (err, result) { + if('y' === result.accept.toLowerCase()) { +let url; + +url = `${fileData.url}/${fileData.version}/${fileData.fileName}${fileData.version}_0${fileData.fileExtension}`; + +console.log(`Downloading: ${url}`); + +request +.get(url) +.on('response', function (response) { + if(200 !== response.statusCode) { +console.log(`Download failed with status code: ${response.statusCode}`); + } else { +let destination = `lib/player/${fileData.version}.0/`; + +if (!fs.existsSync('lib')) { + fs.mkdirSync('lib'); +} +if (!fs.existsSync('lib/player')) { + fs.mkdirSync('lib/player'); +} +if (!fs.existsSync(destination)) { + fs.mkdirSync(destination); +} + + response.pipe(fs.createWriteStream(`${destination}${fileData.fileName}${fileData.fileExtension}`) +.on('close', function(){ + console.log(`Finished downloading: ${destination}${fileData.fileName}${fileData.fileExtension}`); +}) +); + } +}); + } else { +console.log('Aborting installation'); + } +}); diff --git a/as2wasm/package.json b/as2wasm/package.json index f23ca01..5f6bd20 100644 --- a/as2wasm/package.json +++ b/as2wasm/package.json @@ -1,18 +1,21 @@ { - "author": "erikdebr...@apache.org", - + "dependencies": { +"prompt": "^0.2.14", +"request": "^2.67.0", +"unzip": "^0.1.11" + }, "description": "A Actionscript/MXML to WebAssembly transpiler", - "license": "Apache-2.0", - "name": "as2wasm", - "scripts": { -"dev-build": "ant -f ./dev-build.xml", +"as2wasm-jars": "ant -f ./dev-build.xml", +"build": "npm install; npm run build-wat2wasm; npm run build-compiler; npm run as2wasm-jars; node download.js", +"build-compiler&q
[royale-asjs] 04/08: Some more renaming
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit efe96afb54865ccb5b7b0c2b3088ed16026285e8 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 10:07:38 2017 +0100 Some more renaming Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- as2wasm/dev-build.xml | 9 +- build.xml | 398 +- 2 files changed, 204 insertions(+), 203 deletions(-) diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml index b1ef9b3..e229477 100644 --- a/as2wasm/dev-build.xml +++ b/as2wasm/dev-build.xml @@ -17,9 +17,10 @@ limitations under the License. --> + - + @@ -28,10 +29,10 @@ - + - - + + diff --git a/build.xml b/build.xml index c38c142..460db39 100644 --- a/build.xml +++ b/build.xml @@ -21,7 +21,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -77,10 +77,10 @@ - + - + @@ -213,29 +213,29 @@ - - - - - - - + - + - + @@ -245,32 +245,32 @@ - - - + - + - - + - + - + @@ -283,33 +283,33 @@ - + - + - + - + - + - + basedir is ${basedir} - + @@ -345,7 +345,7 @@ /flex-sdk-description - + @@ -390,7 +390,7 @@ /* generated by build script */ - + @@ -400,7 +400,7 @@ - + Copying Compiler from ${ROYALE_COMPILER_REPO} @@ -426,14 +426,14 @@ - - - -Copying WAST Transpiler and related jars from 'js/lib' - - - - + + + +Copying 'as2wasm' transpiler and related jars from 'js/lib' + + + + @@ -444,34 +444,34 @@ - + - + - + - - + - + - + @@ -505,10 +505,10 @@ - + - + @@ -548,8 +548,8 @@ - - + + - + ?xml version="1.0"? !-- - + Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - + -- flashbuilder-config express-install-swfexpressInstall.swf/express-install-swf @@ -625,44 +625,44 @@ ?xml version="1.0"? !-- - + Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either e
[royale-asjs] 03/08: Rename project root to ‘as2wasm’
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 2718dee46473366df37b353c29e920cf7b4766a5 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 10:01:34 2017 +0100 Rename project root to ‘as2wasm’ Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- {wast => as2wasm}/.eslintrc.json | 0 {wast => as2wasm}/README | 0 {wast => as2wasm}/create.js| 0 {wast => as2wasm}/dev-build.xml| 0 {wast => as2wasm}/package.json | 0 {wast => as2wasm}/resources/build.js | 0 {wast => as2wasm}/resources/glue.js| 0 {wast => as2wasm}/resources/install.js | 0 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/wast/.eslintrc.json b/as2wasm/.eslintrc.json similarity index 100% rename from wast/.eslintrc.json rename to as2wasm/.eslintrc.json diff --git a/wast/README b/as2wasm/README similarity index 100% rename from wast/README rename to as2wasm/README diff --git a/wast/create.js b/as2wasm/create.js similarity index 100% rename from wast/create.js rename to as2wasm/create.js diff --git a/wast/dev-build.xml b/as2wasm/dev-build.xml similarity index 100% rename from wast/dev-build.xml rename to as2wasm/dev-build.xml diff --git a/wast/package.json b/as2wasm/package.json similarity index 100% rename from wast/package.json rename to as2wasm/package.json diff --git a/wast/resources/build.js b/as2wasm/resources/build.js similarity index 100% rename from wast/resources/build.js rename to as2wasm/resources/build.js diff --git a/wast/resources/glue.js b/as2wasm/resources/glue.js similarity index 100% rename from wast/resources/glue.js rename to as2wasm/resources/glue.js diff --git a/wast/resources/install.js b/as2wasm/resources/install.js similarity index 100% rename from wast/resources/install.js rename to as2wasm/resources/install.js -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] branch feature/as2wasm updated: ‘wat2wasm’ is installed globally, no need to specify it’s path
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/feature/as2wasm by this push: new cc15111 ‘wat2wasm’ is installed globally, no need to specify it’s path cc15111 is described below commit cc1574ad62ac17d701732cd6cad3190909fd Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 14:39:30 2017 +0100 ‘wat2wasm’ is installed globally, no need to specify it’s path Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../royale/compiler/internal/codegen/wast/WASTPublisher.java | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java index fa2c182..94465ba 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java @@ -29,7 +29,6 @@ import org.apache.royale.compiler.clients.problems.ProblemQuery; import org.apache.royale.compiler.codegen.wast.IWASTPublisher; import org.apache.royale.compiler.config.Configuration; import org.apache.royale.compiler.internal.projects.RoyaleWASTProject; -import org.apache.royale.utils.EnvProperties; public class WASTPublisher implements IWASTPublisher { @@ -45,8 +44,6 @@ public class WASTPublisher implements IWASTPublisher { private File outputFolder; private File outputParentFolder; - - private EnvProperties env; @@ -72,9 +69,7 @@ public class WASTPublisher implements IWASTPublisher { String targetWatFilePath = targetPath + "/" + mainProjectFileName + ".wat"; - env = EnvProperties.initiate(); - - String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/" + mainProjectFileName + ".wasm" }; + String[] cmd = { "wat2wasm", targetWatFilePath, "-o", targetPath + "/" + mainProjectFileName + ".wasm" }; Process p = new ProcessBuilder(cmd).redirectError(Redirect.INHERIT) .redirectOutput(Redirect.INHERIT) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new df7f8d3 Updated User Manual AS2WASM (markdown) df7f8d3 is described below commit df7f8d3baa07f786a3606abafeb080cd57ab86e5 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 14:34:46 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 1 + 1 file changed, 1 insertion(+) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 670bd9d..50091f1 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -3,6 +3,7 @@ Your system will need to have the following tools available/installed: - [Java](https://github.com/apache/royale-asjs#java) - [Ant](https://github.com/apache/royale-asjs#ant) +- [git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) - [Node and npm](https://docs.npmjs.com/getting-started/installing-node) - [make](https://www.google.com/search?q=install+make) - [Cmake](https://cmake.org/download/) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 83b1f17 Updated User Manual AS2WASM (markdown) 83b1f17 is described below commit 83b1f177f29f6fd2493bf5a7b5f4fb3cfd2f94f3 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 13:27:14 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 0e9ef5f..670bd9d 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -36,7 +36,7 @@ npm run build ## Create a project ```bash -cd royale-asjs/wast +cd royale-asjs/as2wasm npm run create-project -- -dir=[root dir] -name=[project name] ``` -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 9f00a2a Updated User Manual AS2WASM (markdown) 9f00a2a is described below commit 9f00a2a32a7388f0e4a7fb81e1cd496ea9408713 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 13:26:26 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index f01589a..0e9ef5f 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -1,5 +1,4 @@ -# Prepare -## Set up your system +# Set up your system Your system will need to have the following tools available/installed: - [Java](https://github.com/apache/royale-asjs#java) @@ -17,7 +16,7 @@ Your system will need to have the following tools available/installed: ``` -## Get and build the code +# Get and build the code To use *as2wasm* you need to get and partially build a git repo: -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 62b0e48 Updated User Manual AS2WASM (markdown) 62b0e48 is described below commit 62b0e484f72df5005b71f05be3eb6079ef44f881 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 13:24:50 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 26 +- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 06d8d06..acd7ea3 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -5,28 +5,20 @@ Your system will need to have the following tools available/installed: - [Java](https://github.com/apache/royale-asjs#java) - [Ant](https://github.com/apache/royale-asjs#ant) - [Node and npm](https://docs.npmjs.com/getting-started/installing-node) -- [playerglobal.swc](https://github.com/apache/royale-asjs#playerglobalswc) +- [mak](https://www.google.com/search?q=install+make) +- [Cmake](https://cmake.org/download/) + - **PATH** -### *make* and *CMake* +Add the bin directory of CMake to the PATH: -The build of *wat2wasm* requires *make* and *CMake* to be installed on your computer: - -make: <https://www.google.com/search?q=install+make> - -Cmake: <https://cmake.org/download/> - -- **PATH** - - Add the bin directory of CMake to the PATH: - - On a Mac, set PATH to - ```bash - export PATH=/Applications/CMake.app/Contents/bin:$PATH - ``` +On a Mac, set PATH to +```bash +export PATH=/Applications/CMake.app/Contents/bin:$PATH +``` ## Get and build the code -To use *as2wasm* you need - for now - to get and partially build a git repo: +To use *as2wasm* you need to get and partially build a git repo: ```bash git clone https://github.com/apache/royale-asjs.git -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 35192d3 Updated User Manual AS2WASM (markdown) 35192d3 is described below commit 35192d3436fb512e799ac29f17101f5dd3c13a42 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 11:02:44 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 508931d..06d8d06 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -36,7 +36,7 @@ cd as2wasm npm run build ``` -> Note: this will take a considerable amount of time to finish! +> Note: the build will take a long time to finish! # Your first *as2wasm* project -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new fb4b224 Updated User Manual AS2WASM (markdown) fb4b224 is described below commit fb4b224b35c16679f5d73e8c4cbeb09b22e9df72 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Fri Nov 17 11:01:12 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index bcee806..2b1f3a2 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -46,7 +46,7 @@ cd as2wasm npm run build ``` -# Your first Royale AS2WASM project +# Your first *as2wasm* project ## Create a project -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch feature/as2wasm created (now b17978d)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/as2wasm in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. at b17978d Use actual source name instead of fixed string No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new c2bbd3a Updated User Manual AS2WASM (markdown) c2bbd3a is described below commit c2bbd3a05dfc45bc02180e2c278aea984fbbe9d2 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Thu Nov 16 12:11:38 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 5340576..935d7af 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -12,7 +12,8 @@ Your system will need to have the following tools available/installed: The build of *wat2wasm* requires *make* and *CMake* to be installed on your computer: make: <https://www.google.com/search?q=install+make> -cmake: <https://cmake.org/download/> + +Cmake: <https://cmake.org/download/> - **PATH** -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 210f3e0 Updated User Manual AS2WASM (markdown) 210f3e0 is described below commit 210f3e03d004f9e9b699751463c822e6cd88f2e2 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Thu Nov 16 12:00:04 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 58a26ec..0c240c0 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -7,7 +7,7 @@ Your system will need to have the following tools available/installed: - [Node and npm](https://docs.npmjs.com/getting-started/installing-node) - [playerglobal.swc](https://github.com/apache/royale-asjs#playerglobalswc) -### Make and CMake +### *make* and *CMake* The build of *wat2wasm* requires *make* and *CMake* to be installed on your computer: @@ -23,7 +23,7 @@ cmake: <https://cmake.org/download/> export PATH=/Applications/CMake.app/Contents/bin:$PATH ``` -### WAT2WASM +### *wat2wasm* The compiler puts out '.wat' files (WebAssembly Text format). In order to compile these files into the binary '.wasm', we have to use the *wat2wasm* tool. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new f79768e Updated User Manual AS2WASM (markdown) f79768e is described below commit f79768edbab86c86ac4b46e75f8a6288caa83056 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Thu Nov 16 11:59:14 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index de02dd2..58a26ec 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -11,10 +11,10 @@ Your system will need to have the following tools available/installed: The build of *wat2wasm* requires *make* and *CMake* to be installed on your computer: -- make: <https://www.google.com/search?q=install+make> -- cmake: <https://cmake.org/download/> +make: <https://www.google.com/search?q=install+make> +cmake: <https://cmake.org/download/> -**PATH** +- **PATH** Add the bin directory of CMake to the PATH: -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new bb180b2 Updated User Manual AS2WASM (markdown) bb180b2 is described below commit bb180b23ce49985e23ea8e8b5e050198da8aa5f1 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Thu Nov 16 11:57:31 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 68605d7..58aa102 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -9,7 +9,7 @@ Your system will need to have the following tools available/installed: ### Make and CMake -The build of *wat2wasm* requires make and CMake to be installed on your computer: +The build of *wat2wasm* requires *make* and *CMake* to be installed on your computer: - make: <https://www.google.com/search?q=install+make> - cmake: <https://cmake.org/download/> -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch feature/wast updated (5ef9077 -> cab80bf)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from 5ef9077 Merge branch 'feature/wast' of https://github.com/apache/royale-asjs into wast add 19f457f propertyName can be a string Setting stringables should not replace the existing xml or you lose the attributes. add cb62cec Setting stringables a second time caused bad things to happen. new cab80bf Merge branch 'develop' into wast The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: frameworks/projects/XML/src/main/royale/XML.as | 27 ++ frameworks/projects/XML/src/main/royale/XMLList.as | 13 --- manualtests/XMLTest/src/MyInitialView.mxml | 8 +++ 3 files changed, 41 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual AS2WASM (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 76baad0 Updated User Manual AS2WASM (markdown) 76baad0 is described below commit 76baad0d1dbbb53b8cc40511105e915fe55c8153 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 19:55:37 2017 +0100 Updated User Manual AS2WASM (markdown) --- User-Manual-AS2WASM.md | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/User-Manual-AS2WASM.md b/User-Manual-AS2WASM.md index 5660d89..054b8af 100644 --- a/User-Manual-AS2WASM.md +++ b/User-Manual-AS2WASM.md @@ -27,10 +27,10 @@ Now we build all the projects in the repos by running: ant super-clean all ``` -Note: I get build fails during some of the asjs framework project tests. I locally commented out or removed these bits of code: - -- comment out the ant task in the 'CoreTest' target in *frameworks/build.xml* -- remove the 'test' dependency from the 'main' target in *frameworks/projects/Basic/build.xml* +> Note: I get build fails during some of the asjs framework project tests. I locally commented out or removed these bits of code: +> +> - comment out the ant task in the 'CoreTest' target in *frameworks/build.xml* +> - remove the 'test' dependency from the 'main' target in *frameworks/projects/Basic/build.xml* ## WAT2WASM @@ -42,7 +42,7 @@ This tool is currently only available as source code. This means that it will ha npm install -g webassembly-binary-toolkit ``` -Note: this will take a considerable time to finish! +> Note: this will take a considerable time to finish! # Your first Royale AS2WASM project -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated _Sidebar (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 0f393a4 Updated _Sidebar (markdown) new 9d16323 Merge branch 'master' of https://github.com/apache/royale-asjs.wiki 0f393a4 is described below commit 0f393a40bad4193f0e387fa76dcbd8f7aa4d51d9 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 19:51:31 2017 +0100 Updated _Sidebar (markdown) --- _Sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Sidebar.md b/_Sidebar.md index f85e321..eddb83a 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -25,4 +25,4 @@ ## User Manual - [User Manual](User-Manual) - [Tips](Tips) -- [wastc (Actionscript -> WebAssembly)](User-Manual-WAST) +- [AS2WASM (Actionscript -> WebAssembly)](User-Manual-AS2WASM) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated _Sidebar (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 0f393a4 Updated _Sidebar (markdown) 0f393a4 is described below commit 0f393a40bad4193f0e387fa76dcbd8f7aa4d51d9 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 19:51:31 2017 +0100 Updated _Sidebar (markdown) --- _Sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Sidebar.md b/_Sidebar.md index f85e321..eddb83a 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -25,4 +25,4 @@ ## User Manual - [User Manual](User-Manual) - [Tips](Tips) -- [wastc (Actionscript -> WebAssembly)](User-Manual-WAST) +- [AS2WASM (Actionscript -> WebAssembly)](User-Manual-AS2WASM) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: First attempt at explaining the WASM tooling
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 2242425 First attempt at explaining the WASM tooling 2242425 is described below commit 2242425a8c8bc447edc95fa0df34cc06757cf2ee Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 19:49:16 2017 +0100 First attempt at explaining the WASM tooling Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- User-Manual-WAST.md | 72 ++--- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/User-Manual-WAST.md b/User-Manual-WAST.md index 6a518a6..5660d89 100644 --- a/User-Manual-WAST.md +++ b/User-Manual-WAST.md @@ -1,4 +1,68 @@ -get royale-compiler and royale-asjs repos -set up system requirements -switch to 'wast' branch in both -in asjs run 'ant super-clean all' +# Prepare +## Set up your system + +Install [Node.js and NPM](https://nodejs.org/en/download/). + +Next, set up the requirements for the Royale ASJS SDK, following [these instructions](https://github.com/apache/royale-asjs#prerequisites). + +## Get the code + +To use Royale WAST you need - for now - to get and set up 2 git repos: + +```bash +git clone https://github.com/apache/royale-compiler.git royale-compiler +cd royale-compiler +git checkout feature/wast +cd .. +git clone https://github.com/apache/royale-asjs.git royale-asjs +cd royale-asjs +git checkout feature/wast +``` + +## Build the code + +Now we build all the projects in the repos by running: + +```bash +ant super-clean all +``` + +Note: I get build fails during some of the asjs framework project tests. I locally commented out or removed these bits of code: + +- comment out the ant task in the 'CoreTest' target in *frameworks/build.xml* +- remove the 'test' dependency from the 'main' target in *frameworks/projects/Basic/build.xml* + +## WAT2WASM + +The compiler puts out '.wat' files (WebAssembly Text format). In order to compile these files into the binary '.wasm', we have to use the *wat2wasm* tool. + +This tool is currently only available as source code. This means that it will have to be compiled on your system. For this you'll need to have the following tools installed: [make](https://www.google.com/search?q=install+make) and [CMAKE](https://cmake.org/download/). Make sure that CMAKE is on your PATH ("export PATH=/Applications/CMake.app/Contents/bin:$PATH"), then run: + +```bash +npm install -g webassembly-binary-toolkit +``` + +Note: this will take a considerable time to finish! + +# Your first Royale AS2WASM project + +## Build the 'wastc' compiler + +```bash +cd royale-asjs/wast +npm run dev-build +``` + +## Create a project + +```bash +cd royale-asjs/wast +npm run create-project -- -dir=[root dir] -name=[project name] +``` + +## Build your project + +```bash +cd [root dir] /[project name] +npm run build +``` -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch feature/wast updated: FLEX_HOME != PLAYERGLOBAL_HOME
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-asjs.git The following commit(s) were added to refs/heads/feature/wast by this push: new ae2e360 FLEX_HOME != PLAYERGLOBAL_HOME ae2e360 is described below commit ae2e360cf0b8fff06ac82bb4e53da462a702b06e Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 19:18:47 2017 +0100 FLEX_HOME != PLAYERGLOBAL_HOME Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- wast/resources/build.js | 19 +++ 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/wast/resources/build.js b/wast/resources/build.js index b56a753..64d360b 100644 --- a/wast/resources/build.js +++ b/wast/resources/build.js @@ -19,7 +19,7 @@ 'use strict'; -let args, cmd, exec, fs, playerVersion, royaleHome, wastc; +let args, cmd, exec, fs, playerHome, playerVersion, royaleHome, wastc; @@ -63,6 +63,17 @@ if (!fs.existsSync(wastc)) { process.exit(); } +playerHome = args['playerglobal-home']; +if (!playerHome || '' === playerHome) { + playerHome = process.env.PLAYERGLOBAL_HOME; + if (!playerHome || '' === playerHome) { +console.log('PLAYERGLOBAL_HOME is not defined. Create an environment variable (PLAYERGLOBAL_HOME) and point it to the skd dir, or use \'npm run build -- -playerglobal-home=[playerglobal dir]\'.'); + +process.exit(); + } +} +console.log('PLAYERGLOBAL_HOME is ' + playerHome); + playerVersion = args['player-version']; if (!playerVersion || '' === playerVersion) { playerVersion = process.env.PLAYERGLOBAL_VERSION; @@ -75,13 +86,13 @@ if (!playerVersion || '' === playerVersion) { console.log('PLAYERGLOBAL_VERSION is ' + playerVersion + '.'); } -if (!fs.existsSync(royaleHome + '/frameworks/libs/player/' + playerVersion + '/playerglobal.swc')) { - console.log('\'playerglobal.swc\' could not be found. Make sure you have set ROYALE_HOME to a fully built sdk.'); +if (!fs.existsSync(playerHome + '/' + playerVersion + '/playerglobal.swc')) { + console.log('\'playerglobal.swc\' could not be found. Make sure you have set PLAYERGLOBAL_HOME to a correctly downloaded and stored playerglobal.swc'); process.exit(); } -cmd = `/usr/bin/java -Xmx384m -Dsun.io.useCanonCaches=false -jar "${wastc}" -external-library-path="${royaleHome}/frameworks/libs/player/${playerVersion}/playerglobal.swc" ${args['src']}`; +cmd = `/usr/bin/java -Xmx384m -Dsun.io.useCanonCaches=false -jar "${wastc}" -external-library-path="${playerHome}/frameworks/libs/player/${playerVersion}/playerglobal.swc" ${args['src']}`; exec(cmd, function (error, stdout, stderr) { console.log(stdout); -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] 01/01: 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-asjs.git commit 0eab7891e5d10f8c8a9992961bdcf6ed683b5fad Merge: cc27858 cc46631 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 18:27:38 2017 +0100 Merge branch 'develop' into wast Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> # Conflicts: # wast/resources/glue.js .gitignore | 3 --- InstallAdobeSDKs.xml | 6 ++ 2 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] branch feature/wast updated (cc27858 -> 0eab789)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from cc27858 Add build scripts add ce4a197 Revert "Add license" add 41688bc Revert "Add ‘glue’ utility script to allow WASM to be loaded in HTML" add 7832f47 Revert "[WAST] batch script for WASTC and an early example project" add cc46631 Modified InstallAdobeSDKs.xml to update flex-config.xml (and template) for Flash Builder. new 0eab789 Merge branch 'develop' into wast The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 3 --- InstallAdobeSDKs.xml | 6 ++ 2 files changed, 6 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Updated User Manual WAST (markdown)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 54ab3b5 Updated User Manual WAST (markdown) 54ab3b5 is described below commit 54ab3b50b6d531cf8052660b09efe55d6281c874 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 16:16:38 2017 +0100 Updated User Manual WAST (markdown) --- User-Manual-WAST.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/User-Manual-WAST.md b/User-Manual-WAST.md index 70c379b..6a518a6 100644 --- a/User-Manual-WAST.md +++ b/User-Manual-WAST.md @@ -1 +1,4 @@ -Hello world \ No newline at end of file +get royale-compiler and royale-asjs repos +set up system requirements +switch to 'wast' branch in both +in asjs run 'ant super-clean all' -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 01/02: Fix build scripts; ignore WASTC test
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 6830ee55299dc18cbf2b88f44f468aced180f30f Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 11:12:11 2017 +0100 Fix build scripts; ignore WASTC test Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/.classpath | 12 ++-- compiler-jx/build.xml| 11 +++ .../royale/compiler/internal/codegen/wast/TestWASTClass.java | 2 ++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index e730144..2bc1f74 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -6,12 +6,12 @@ - - - - - - + + + + + + diff --git a/compiler-jx/build.xml b/compiler-jx/build.xml index 793bf02..a031506 100644 --- a/compiler-jx/build.xml +++ b/compiler-jx/build.xml @@ -97,6 +97,11 @@ + + + + + @@ -107,6 +112,11 @@ + + + + + @@ -223,6 +233,7 @@ + diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java index eab8957..bf178e6 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java @@ -21,6 +21,7 @@ package org.apache.royale.compiler.internal.codegen.wast; import org.apache.royale.compiler.internal.test.WASTTestBase; import org.apache.royale.compiler.tree.as.IClassNode; +import org.junit.Ignore; import org.junit.Test; /** @@ -30,6 +31,7 @@ import org.junit.Test; */ public class TestWASTClass extends WASTTestBase { +@Ignore @Test public void testClassSimple() { -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] 02/02: Use actual source name instead of fixed string
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 b17978dd13f2b931ec0ee078d6e8d21b7a7c6bbb Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 15:55:33 2017 +0100 Use actual source name instead of fixed string Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../compiler/internal/codegen/wast/WASTPublisher.java | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java index f1fb81b..fa2c182 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java @@ -40,6 +40,8 @@ public class WASTPublisher implements IWASTPublisher { private Configuration configuration; + + private String mainProjectFileName; private File outputFolder; private File outputParentFolder; @@ -47,6 +49,7 @@ public class WASTPublisher implements IWASTPublisher { private EnvProperties env; + @Override public File getOutputFolder() { outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile(); @@ -65,11 +68,13 @@ public class WASTPublisher implements IWASTPublisher { try { String targetPath = getOutputFolder().getPath(); - String targetWatFilePath = targetPath + "/HelloWorld.wat"; + mainProjectFileName = configuration.getMainDefinition(); + + String targetWatFilePath = targetPath + "/" + mainProjectFileName + ".wat"; env = EnvProperties.initiate(); - String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/HelloWorld.wasm" }; + String[] cmd = { env.WAT2WASM + "/wat2wasm", targetWatFilePath, "-o", targetPath + "/" + mainProjectFileName + ".wasm" }; Process p = new ProcessBuilder(cmd).redirectError(Redirect.INHERIT) .redirectOutput(Redirect.INHERIT) @@ -138,7 +143,7 @@ public class WASTPublisher implements IWASTPublisher { htmlFile.append(" \n"); htmlFile.append(" \n"); htmlFile.append("\n"); - htmlFile.append(" Royale WASM\n"); + htmlFile.append(" " + mainProjectFileName + " - Royale WAST\n"); htmlFile.append("\n"); htmlFile.append(" \n"); htmlFile.append("\n"); @@ -150,7 +155,7 @@ public class WASTPublisher implements IWASTPublisher { htmlFile.append("\n"); htmlFile.append("
[royale-asjs] 04/04: Add build scripts
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-asjs.git commit cc2785830b9e791c4f5c889ee8e17168b05f0a98 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 15:57:30 2017 +0100 Add build scripts Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- wast/README | 15 +++ wast/create.js | 113 wast/package.json | 48 wast/resources/build.js | 96 4 files changed, 272 insertions(+) diff --git a/wast/README b/wast/README new file mode 100644 index 000..6d17c12 --- /dev/null +++ b/wast/README @@ -0,0 +1,15 @@ +To create a new Royale WAST project, use: + +npm run create-project -- -dir=[root dir] -name=[project name] + +This will create the following project structure: + +[root dir] + | + /src + | | + | - [project name].as + | + - build.js + - package.json + - README diff --git a/wast/create.js b/wast/create.js new file mode 100644 index 000..1d5b23c --- /dev/null +++ b/wast/create.js @@ -0,0 +1,113 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +'use strict'; + +let args, createFile, dir, fs, projectName, projectPath, projectSrcPath, royaleHome; + + + +fs = require('fs'); + + + +createFile = function (file, content) { + fs.writeFile(file, content, function(error) { +if (error) { + return console.log(`Error writing file ('${file}'): ` + error + '.'); +} else { + console.log(`Created file ('${file}').`); +} + }); +}; + + + +args = {}; +process.argv.slice(2).forEach(function (value) { + let valueArray; + + valueArray = value.split('='); + if (1 < valueArray.length) { +let name, value; + +name = valueArray[0].substr(1); +value = valueArray[1]; + +args[name] = value; + +console.log('Set arg \'' + name + '\' to \'' + value + '\''); + } +}); + +royaleHome = process.argv[1].split('/'); +royaleHome.pop(); // remove 'create.js' +royaleHome.pop(); // remove 'wast' +royaleHome = royaleHome.join('/'); + +dir = args['dir']; +if (!fs.existsSync(dir)) { + console.log(`The intended target directory ('${dir}') does not exist.`); + + process.exit(); +} + +projectName = args['name']; +projectPath = dir + '/' + projectName; +if (!fs.existsSync(projectPath)) { + fs.mkdirSync(projectPath); +} + +projectSrcPath = projectPath + '/src'; +if (!fs.existsSync(projectSrcPath)) { + fs.mkdirSync(projectSrcPath); +} + +createFile(projectPath + '/README', `To build and run this project, use: + +cd [project dir] +npm run build +`); + +fs.createReadStream('resources/build.js') +.pipe(fs.createWriteStream(projectPath + '/build.js')); + +createFile(projectPath + '/package.json', `{ + "dependencies": { +"http-server" : "0.10.0" + }, + + "scripts": { +"build": "npm install; node build.js -royale-home=${royaleHome} -src=src/${projectName}.as; http-server bin/ -s -o -p3546" + } + +} +`); + +createFile(projectSrcPath + '/' + projectName + '.as', `package { + + public class ${projectName} { + +public function main():void { + trace('Hello world ;-)'); +} + + } + +}`); diff --git a/wast/package.json b/wast/package.json new file mode 100644 index 000..7b5faa9 --- /dev/null +++ b/wast/package.json @@ -0,0 +1,48 @@ +{ + + "author": "e...@ixsoftware.nl", + + "description": "A Actionscript/MXML to WebAssembly transpiler", + + "eslintConfig": { +"env": { + "browser": true, + "es6": true, + "node": true +}, + +"extends": "eslint:recommended", + +"globals": { + "WebAssembly": true +}, + +"rules": { + "eqeqeq": [ "error", "always" ], + "indent": [ "error", 2, { +"FunctionDeclaration": { "body": 1, "paramet
[royale-asjs] branch feature/wast updated (c469fd7 -> cc27858)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from c469fd7 Add license new 2ab742d Prep and build compiler-jx from the ‘wast’ root new 9c16b42 Remove obsolete files (things move fast :-)) new 57b2606 Minor refactoring to keep the linter and my esthetics satisfied new cc27858 Add build scripts The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: build.xml | 22 wast/README| 15 +++ wast/bin/wastc | 72 - wast/create.js | 113 + .../express-as-manifest.xml => wast/dev-build.xml | 18 +++- wast/examples/HelloWorld/src/HelloWorld.as | 29 -- wast/package.json | 48 + wast/resources/build.js| 96 + wast/resources/glue.js | 11 +- 9 files changed, 317 insertions(+), 107 deletions(-) create mode 100644 wast/README delete mode 100755 wast/bin/wastc create mode 100644 wast/create.js copy frameworks/projects/Express/src/main/resources/express-as-manifest.xml => wast/dev-build.xml (59%) delete mode 100644 wast/examples/HelloWorld/src/HelloWorld.as create mode 100644 wast/package.json create mode 100644 wast/resources/build.js -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] 01/04: Prep and build compiler-jx from the ‘wast’ root
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-asjs.git commit 2ab742d30eca4ea7a62962ac3416bdc4560c95a0 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 11:11:40 2017 +0100 Prep and build compiler-jx from the ‘wast’ root Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- build.xml | 22 ++ wast/dev-build.xml | 38 ++ 2 files changed, 60 insertions(+) diff --git a/build.xml b/build.xml index 0a9573b..c38c142 100644 --- a/build.xml +++ b/build.xml @@ -427,6 +427,24 @@ + + +Copying WAST Transpiler and related jars from 'js/lib' + + + + + + + + + + + + + + + @@ -530,6 +548,10 @@ + + + + diff --git a/wast/dev-build.xml b/wast/dev-build.xml new file mode 100644 index 000..b1ef9b3 --- /dev/null +++ b/wast/dev-build.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] 02/04: Remove obsolete files (things move fast :-))
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-asjs.git commit 9c16b422747ad5852eed547b1630c5cc929c8fb8 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 15:56:10 2017 +0100 Remove obsolete files (things move fast :-)) Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- wast/bin/wastc | 72 -- wast/examples/HelloWorld/src/HelloWorld.as | 29 2 files changed, 101 deletions(-) diff --git a/wast/bin/wastc b/wast/bin/wastc deleted file mode 100755 index fd77d19..000 --- a/wast/bin/wastc +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - - -## -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - - - -# -# wastc shell script to launch wastc.jar on OSX, Unix, or Cygwin. -# - -SCRIPT_HOME=`dirname "$0"` - -test "$FLEX_HOME" = "" && { -FLEX_HOME=`dirname "$0"`/../.. -} - -for i in "$@" -do -case $i in --t=*|--target-player=*) -TARGET_PLAYER="${i#*=}" -shift -;; -*) # unknown option -;; -esac -done - -test "$TARGET_PLAYER" = "" && { -TARGET_PLAYER=11.1 -} - -case `uname` in - CYGWIN*) - OS="Windows" - ;; - *) - OS=Unix -esac - -D32='' - -if [ $OS = "Unix" ]; then - -check64="`java -version 2>&1 | grep -i 64-Bit`" -isOSX="`uname | grep -i Darwin`" -javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`" - -if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then -D32='-d32' -fi -fi - -VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false" - -java $VMARGS $D32 -jar "${SCRIPT_HOME}/../lib/wastc.jar" -external-library-path="${FLEX_HOME}/frameworks/libs/player/${TARGET_PLAYER}/playerglobal.swc" "$@" diff --git a/wast/examples/HelloWorld/src/HelloWorld.as b/wast/examples/HelloWorld/src/HelloWorld.as deleted file mode 100644 index b2d2c36..000 --- a/wast/examples/HelloWorld/src/HelloWorld.as +++ /dev/null @@ -1,29 +0,0 @@ - -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - - -package -{ - public class HelloWorld - { - public function HelloWorld() - { - trace('Hello world ;-)'); - } - } -} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] 02/03: Revert "Add ‘glue’ utility script to allow WASM to be loaded in HTML"
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 41688bc5624c06857071f922542b76c5588dc3eb Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 07:46:27 2017 +0100 Revert "Add ‘glue’ utility script to allow WASM to be loaded in HTML" This reverts commit 3dc37ceb90c20be37639068061dba14b79e9461b. --- .gitignore | 3 --- wast/resources/glue.js | 11 --- 2 files changed, 14 deletions(-) diff --git a/.gitignore b/.gitignore index 64c80a8..a32c5ce 100644 --- a/.gitignore +++ b/.gitignore @@ -141,6 +141,3 @@ vf2js/frameworks/js/ #FlexJS generated files frameworks/js/FlexJS/generated-sources manualtests/FlexJSTest_SVG/bin - -#WAST generated files -/wast/examples/HelloWorld/bin diff --git a/wast/resources/glue.js b/wast/resources/glue.js deleted file mode 100644 index fe66877..000 --- a/wast/resources/glue.js +++ /dev/null @@ -1,11 +0,0 @@ -function fetchAndInstantiate(url, importObject) { - return fetch(url).then(response => -response.arrayBuffer() - ) - .then(bytes => -WebAssembly.instantiate(bytes, importObject) - ) - .then(results => -results.instance - ); -} -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] branch develop updated (c469fd7 -> 7832f47)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. from c469fd7 Add license new ce4a197 Revert "Add license" new 41688bc Revert "Add ‘glue’ utility script to allow WASM to be loaded in HTML" new 7832f47 Revert "[WAST] batch script for WASTC and an early example project" The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 3 -- wast/bin/wastc | 72 -- wast/examples/HelloWorld/src/HelloWorld.as | 29 wast/resources/glue.js | 30 - 4 files changed, 134 deletions(-) delete mode 100755 wast/bin/wastc delete mode 100644 wast/examples/HelloWorld/src/HelloWorld.as delete mode 100644 wast/resources/glue.js -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] 01/03: Revert "Add license"
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit ce4a197893eca09f687bd8fc936cb0f1d7b95817 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 07:46:15 2017 +0100 Revert "Add license" This reverts commit c469fd7401e8f9ccf75381927e0ba84db89c2de0. --- wast/resources/glue.js | 19 --- 1 file changed, 19 deletions(-) diff --git a/wast/resources/glue.js b/wast/resources/glue.js index 0a14ece..fe66877 100644 --- a/wast/resources/glue.js +++ b/wast/resources/glue.js @@ -1,22 +1,3 @@ -/* - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - function fetchAndInstantiate(url, importObject) { return fetch(url).then(response => response.arrayBuffer() -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-asjs] 03/03: Revert "[WAST] batch script for WASTC and an early example project"
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git commit 7832f47520d0a6964271cdb6efb8ae16f35b83da Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 15 07:46:37 2017 +0100 Revert "[WAST] batch script for WASTC and an early example project" This reverts commit e036dd345ba0c37b80bef09798c9c957a6088ee7. --- wast/bin/wastc | 72 -- wast/examples/HelloWorld/src/HelloWorld.as | 29 2 files changed, 101 deletions(-) diff --git a/wast/bin/wastc b/wast/bin/wastc deleted file mode 100755 index fd77d19..000 --- a/wast/bin/wastc +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/sh - - -## -## Licensed to the Apache Software Foundation (ASF) under one or more -## contributor license agreements. See the NOTICE file distributed with -## this work for additional information regarding copyright ownership. -## The ASF licenses this file to You under the Apache License, Version 2.0 -## (the "License"); you may not use this file except in compliance with -## the License. You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - - - -# -# wastc shell script to launch wastc.jar on OSX, Unix, or Cygwin. -# - -SCRIPT_HOME=`dirname "$0"` - -test "$FLEX_HOME" = "" && { -FLEX_HOME=`dirname "$0"`/../.. -} - -for i in "$@" -do -case $i in --t=*|--target-player=*) -TARGET_PLAYER="${i#*=}" -shift -;; -*) # unknown option -;; -esac -done - -test "$TARGET_PLAYER" = "" && { -TARGET_PLAYER=11.1 -} - -case `uname` in - CYGWIN*) - OS="Windows" - ;; - *) - OS=Unix -esac - -D32='' - -if [ $OS = "Unix" ]; then - -check64="`java -version 2>&1 | grep -i 64-Bit`" -isOSX="`uname | grep -i Darwin`" -javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`" - -if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then -D32='-d32' -fi -fi - -VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false" - -java $VMARGS $D32 -jar "${SCRIPT_HOME}/../lib/wastc.jar" -external-library-path="${FLEX_HOME}/frameworks/libs/player/${TARGET_PLAYER}/playerglobal.swc" "$@" diff --git a/wast/examples/HelloWorld/src/HelloWorld.as b/wast/examples/HelloWorld/src/HelloWorld.as deleted file mode 100644 index b2d2c36..000 --- a/wast/examples/HelloWorld/src/HelloWorld.as +++ /dev/null @@ -1,29 +0,0 @@ - -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - - -package -{ - public class HelloWorld - { - public function HelloWorld() - { - trace('Hello world ;-)'); - } - } -} \ No newline at end of file -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-typedefs] branch feature/wast created (now 2fd00a9)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git. at 2fd00a9 replace references to Falcon per royale-compiler/#15 No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch feature/wast created (now c469fd7)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-asjs.git. at c469fd7 Add license No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch feature/wast updated: Make sure we pick up ‘glue.js’ from the correct location
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 The following commit(s) were added to refs/heads/feature/wast by this push: new 5459191 Make sure we pick up ‘glue.js’ from the correct location 5459191 is described below commit 5459191663cb729c595fd0c165a8a184276c52b2 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 17:03:06 2017 +0100 Make sure we pick up ‘glue.js’ from the correct location Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../apache/royale/compiler/internal/codegen/wast/WASTPublisher.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java index 3732894..f1fb81b 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java @@ -108,11 +108,13 @@ public class WASTPublisher implements IWASTPublisher { String flexHomePath = flexHome.getPath(); if (!flexHomePath.substring(flexHomePath.length() - 4).equals(".jar")) { - flexHomePath = new File(flexHome, "../../../../royale-asjs/wast/lib").getPath(); + flexHomePath = new File(flexHome, "../../../../royale-asjs/wast/resources").getPath(); } else { - flexHomePath = flexHome.getParentFile().getPath(); + flexHomePath = new File(flexHome.getParentFile().getPath(), "../resources").getPath(); } + System.out.println(flexHomePath); + copyFile(new File(flexHomePath, "glue.js"), new File(getOutputFolder().getPath(), "glue.js")); } -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch develop updated: Add license
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new c469fd7 Add license c469fd7 is described below commit c469fd7401e8f9ccf75381927e0ba84db89c2de0 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 16:57:21 2017 +0100 Add license Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- wast/resources/glue.js | 19 +++ 1 file changed, 19 insertions(+) diff --git a/wast/resources/glue.js b/wast/resources/glue.js index fe66877..0a14ece 100644 --- a/wast/resources/glue.js +++ b/wast/resources/glue.js @@ -1,3 +1,22 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + function fetchAndInstantiate(url, importObject) { return fetch(url).then(response => response.arrayBuffer() -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch develop updated: Add ‘glue’ utility script to allow WASM to be loaded in HTML
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new 3dc37ce Add ‘glue’ utility script to allow WASM to be loaded in HTML 3dc37ce is described below commit 3dc37ceb90c20be37639068061dba14b79e9461b Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 16:54:13 2017 +0100 Add ‘glue’ utility script to allow WASM to be loaded in HTML Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .gitignore | 3 +++ wast/resources/glue.js | 11 +++ 2 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index a32c5ce..64c80a8 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,6 @@ vf2js/frameworks/js/ #FlexJS generated files frameworks/js/FlexJS/generated-sources manualtests/FlexJSTest_SVG/bin + +#WAST generated files +/wast/examples/HelloWorld/bin diff --git a/wast/resources/glue.js b/wast/resources/glue.js new file mode 100644 index 000..fe66877 --- /dev/null +++ b/wast/resources/glue.js @@ -0,0 +1,11 @@ +function fetchAndInstantiate(url, importObject) { + return fetch(url).then(response => +response.arrayBuffer() + ) + .then(bytes => +WebAssembly.instantiate(bytes, importObject) + ) + .then(results => +results.instance + ); +} -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch feature/wast updated (69cbbf1 -> eb97e48)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 69cbbf1 Clean up the ‘main’ class a bit; fake functional output new 9b4d6f2 Minor code reformat new f6c7739 Output ‘.wat’ to ‘[project root]/bin/‘ new 6d4bd7e Not sure why this was excluded… new eb97e48 Add WAT2WASM_HOME env property; publish nice project The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: compiler-jx/.classpath | 2 +- .../org/apache/royale/compiler/clients/WASTC.java | 54 +++ .../internal/codegen/wast/WASTPublisher.java | 157 +++-- .../org/apache/royale/utils/EnvProperties.java | 9 +- 4 files changed, 148 insertions(+), 74 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] 02/04: Output ‘.wat’ to ‘[project root]/bin/‘
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 f6c77397e8e72f236d754a6a8f8ea7cc407b0520 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 13:53:14 2017 +0100 Output ‘.wat’ to ‘[project root]/bin/‘ Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../internal/codegen/wast/WASTPublisher.java | 67 +++--- 1 file changed, 21 insertions(+), 46 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java index 120e174..74e5786 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/wast/WASTPublisher.java @@ -22,7 +22,6 @@ package org.apache.royale.compiler.internal.codegen.wast; import java.io.File; import java.io.IOException; -import org.apache.commons.io.FilenameUtils; import org.apache.royale.compiler.clients.problems.ProblemQuery; import org.apache.royale.compiler.codegen.wast.IWASTPublisher; import org.apache.royale.compiler.config.Configuration; @@ -30,60 +29,36 @@ import org.apache.royale.compiler.internal.projects.RoyaleWASTProject; public class WASTPublisher implements IWASTPublisher { -public WASTPublisher(RoyaleWASTProject project, Configuration config) -{ -this.project = project; -this.configuration = config; -} + public WASTPublisher(RoyaleWASTProject project, Configuration config) { + this.project = project; + this.configuration = config; + } -protected Configuration configuration; + protected Configuration configuration; -protected File outputFolder; -protected File outputParentFolder; + protected File outputFolder; + protected File outputParentFolder; -protected RoyaleWASTProject project; + protected RoyaleWASTProject project; @Override -public File getOutputFolder() -{ -outputFolder = new File(getOutputFilePath()); -if (!outputFolder.isDirectory()) { -outputFolder = outputFolder.getParentFile(); -} + public File getOutputFolder() { + outputParentFolder = new File(configuration.getTargetFileDirectory()).getParentFile(); + ; -outputParentFolder = outputFolder; + outputFolder = new File(outputParentFolder, "bin"); -setupOutputFolder(); + if (!outputFolder.exists()) { + outputFolder.mkdirs(); + } -return outputFolder; -} - -protected void setupOutputFolder() -{ -if (!outputFolder.exists()) { -outputFolder.mkdirs(); -} -} - -private String getOutputFilePath() -{ -if (configuration.getOutput() == null) -{ -final String extension = "." + project.getBackend().getOutputExtension(); -return FilenameUtils.removeExtension(configuration.getTargetFile()) -.concat(extension); -} -else { -return configuration.getOutput(); -} -} + return outputFolder; + } @Override -public boolean publish(ProblemQuery problems) throws IOException -{ -System.out -.println("The project has been successfully compiled and optimized."); -return true; -} + public boolean publish(ProblemQuery problems) throws IOException { + System.out.println("The project has been successfully compiled and optimized."); + return true; + } } -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] 03/04: Not sure why this was excluded…
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 6d4bd7ec30334c42cd5b819b22e0139058334f90 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 16:14:55 2017 +0100 Not sure why this was excluded… Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/.classpath | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index 085a7d5..e730144 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -1,7 +1,7 @@ - + -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[royale-compiler] 01/04: Minor code reformat
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 9b4d6f20cc2c6662d16ec28b065971590fccc719 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 14 13:52:45 2017 +0100 Minor code reformat Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../org/apache/royale/compiler/clients/WASTC.java | 54 +- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/WASTC.java b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/WASTC.java index 254b215..02df03b 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/clients/WASTC.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/clients/WASTC.java @@ -67,31 +67,29 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; public class WASTC { - + public static void main(final String[] args) { long startTime = System.nanoTime(); System.out.println("WASTC"); - + for (String arg : args) { System.out.println(arg); } - + WASTC wastc = new WASTC(new WASTBackend()); - + List problems = new ArrayList(); - + int exitCode = wastc.mainNoExit(args, problems); long endTime = System.nanoTime(); - + System.out.println((endTime - startTime) / 1e9 + " seconds"); - + System.exit(exitCode); } - - static enum ExitCode { SUCCESS(0), PRINT_HELP(1), FAILED_WITH_PROBLEMS(2), FAILED_WITH_ERRORS(3), FAILED_WITH_EXCEPTIONS( 4), FAILED_WITH_CONFIG_PROBLEMS(5); @@ -102,19 +100,15 @@ public class WASTC { final int code; } - - public WASTC(IWASTBackend backend) { workspace = new Workspace(); project = new RoyaleWASTProject(workspace, backend); - + problems = new ProblemQuery(); // this gets replaced in configure(). Do we need it here? } - - private Configuration config; private ICompilationUnit mainCU; private ProblemQuery problems; @@ -123,22 +117,20 @@ public class WASTC { private ITarget target; private Workspace workspace; - - public int mainNoExit(final String[] args, List theProblems) { int result = -1; - + try { ExitCode exitCode = ExitCode.SUCCESS; - + try { final boolean continueCompilation = configure(ArgumentUtil.fixArgs(args)); if (continueCompilation) { project.setProblems(problems.getProblems()); - + compile(); - + if (problems.hasFilteredProblems()) { if (problems.hasErrors()) exitCode = ExitCode.FAILED_WITH_ERRORS; @@ -160,7 +152,7 @@ public class WASTC { exitCode = ExitCode.FAILED_WITH_EXCEPTIONS; } finally { workspace.startIdleState(); - + try { workspace.close(); } finally { @@ -173,7 +165,7 @@ public class WASTC { } } } - + result = exitCode.code; } catch (Exception e) { System.err.println(e.toString()); @@ -184,7 +176,7 @@ public class WASTC { printer.printProblems(theProblems); } } - + return result; } @@ -199,18 +191,18 @@ public class WASTC { List problemsBuildingSWF = new ArrayList(); project.mainCU = mainCU; - + IJSApplication jsTarget = null; - + Collection fatalProblems = project.getFatalProblems(); - + if (!fatalProblems.isEmpty()) {
[royale-compiler] branch feature/wast updated (015d08e -> 7422905)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. from 015d08e Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored) add 8f24f4f FLEX-35359 fixed issue where absolute path for output compiler option on windows could result in empty source map file add 6df7251 Change url to the repository in main pom to check whether it influence Maven compiler build add f3c09ec Generates a commentary.json file from ASDoc tags. add b10908b remove most references to 'falcon' and rewrite README and RELEASE_NOTES add 9a80dfe no more Falcon references I think. In theory we don't need FALCON_HOME and FALCONJX_HOME since the transpiler can launch the SWF compiler add bfe233b remove references to Falcon per #15 add e6887fc don't need this add 3c9c1b8 replace even more references to Flex add 8d91da3 fix release script add 2065ff4 Merge branch 'feature/rename' into develop add 5a4434a clean up Maven build add cd4c152 fix typedefs add 97d9e8e make sure this folder exists add 8418727 fix jar name new d832c41 Merge branch 'develop' into wast new 7422905 Make test pass for now The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: 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 ++--
[royale-compiler] 02/02: Make test pass for now
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 7422905e8fa179f52fd95391f344368791a6f704 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Nov 8 10:28:10 2017 +0100 Make test pass for now Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- .../apache/royale/compiler/internal/codegen/wast/TestWASTClass.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java index 958feab..d604d58 100644 --- a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java +++ b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/wast/TestWASTClass.java @@ -21,6 +21,7 @@ package org.apache.royale.compiler.internal.codegen.wast; import org.apache.royale.compiler.internal.test.WASTTestBase; import org.apache.royale.compiler.tree.as.IClassNode; +import org.junit.Ignore; import org.junit.Test; /** @@ -35,7 +36,7 @@ public class TestWASTClass extends WASTTestBase { { IClassNode node = (IClassNode) getNode("public class A{}", IClassNode.class, WRAP_LEVEL_PACKAGE); asBlockWalker.visitClass(node); -assertOut("Ola!"); +assertOut("Hoi "); } } -- To stop receiving notification emails like this one, please contact "commits@royale.apache.org" <commits@royale.apache.org>.
[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 <e...@ixsoftware.nl> AuthorDate: Wed Nov 8 08:21:40 2017 +0100 Merge branch 'develop' into wast Signed-off-by: Erik de Bruin <e...@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-compiler] branch feature/wast created (now 015d08e)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch feature/wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. at 015d08e Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch wast deleted (was 015d08e)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. was 015d08e Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch wast updated: Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git The following commit(s) were added to refs/heads/wast by this push: new 015d08e Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored) 015d08e is described below commit 015d08e86dcd550338df8fa0b7775e7246215a99 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Nov 7 15:27:35 2017 +0100 Ok, not cool… but very convenient: comitting project files with my local paths (for some reason these are not ignored) Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- compiler-jx/.classpath | 4 ++-- compiler-jx/.project | 7 --- compiler/.project | 12 ++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/compiler-jx/.classpath b/compiler-jx/.classpath index 35c205d..085a7d5 100644 --- a/compiler-jx/.classpath +++ b/compiler-jx/.classpath @@ -12,7 +12,7 @@ - - + + diff --git a/compiler-jx/.project b/compiler-jx/.project index f6d9327..bcdd822 100644 --- a/compiler-jx/.project +++ b/compiler-jx/.project @@ -3,6 +3,7 @@ compiler-jx + compiler @@ -23,17 +24,17 @@ COMPILER_TEST_UTILS 2 - /Users/aharui/git/royale/ant/royale-compiler/compiler-test-utils/src/main/java + /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java COMPILER_BUILD_TOOLS - file:/Users/aharui/git/flex/master/flex-falcon/compiler-build-tools/src/main/java + file:/Users/erik/Documents/git/royale-compiler/compiler-build-tools/src/main/java COMPILER_TEST_UTILS - file:/Users/aharui/git/flex/master/flex-falcon/compiler-test-utils/src/main/java + file:/Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java diff --git a/compiler/.project b/compiler/.project index 04c13cc..4733fee 100644 --- a/compiler/.project +++ b/compiler/.project @@ -23,31 +23,31 @@ COMPILER_JBURG_TYPES 2 - /Users/aharui/git/royale/ant/royale-compiler/compiler-jburg-types/src/main/java + /Users/erik/Documents/git/royale-compiler/compiler-jburg-types/src/main/java COMPILER_TEST_UTILS 2 - COMPILER_TEST_UTILS + /Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java royale-ant-tasks 2 - /Users/aharui/git/royale/ant/royale-compiler/royale-ant-tasks/src/main/java + /Users/erik/Documents/git/royale-compiler/royale-ant-tasks/src/main/java COMPILER_BUILD_TOOLS - file:/Users/aharui/git/royale/ant/royale-compiler/compiler-build-tools/src/main/java + file:/Users/erik/Documents/git/royale-compiler/compiler-build-tools/src/main/java COMPILER_JBURG_TYPES - file:/Users/aharui/git/royale/ant/royale-compiler/compiler-jx/src/main/java + file:/Users/erik/Documents/git/royale-compiler/compiler-jx/src/main/java COMPILER_TEST_UTILS - file:/Users/aharui/git/royale/ant/royale-compiler/compiler-test-utils/src/main/java + file:/Users/erik/Documents/git/royale-compiler/compiler-test-utils/src/main/java -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-compiler] branch wast created (now e336021)
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a change to branch wast in repository https://gitbox.apache.org/repos/asf/royale-compiler.git. at e336021 Get first test to run to completion on WAST configured code; test fails -> must create emitters This branch includes the following new commits: new e336021 Get first test to run to completion on WAST configured code; test fails -> must create emitters The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Add a bit of structure to the Quick Start section
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 7274df2 Add a bit of structure to the Quick Start section 7274df2 is described below commit 7274df26182859f2758c8433feac416f2e912205 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Oct 4 11:21:57 2017 +0200 Add a bit of structure to the Quick Start section Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- Quick-Start.md => Quick-Start-VSC.md | 7 +++-- Quick-Start.md | 52 _Sidebar.md | 10 ++- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/Quick-Start.md b/Quick-Start-VSC.md similarity index 82% copy from Quick-Start.md copy to Quick-Start-VSC.md index 5c0ff7d..ef9529e 100644 --- a/Quick-Start.md +++ b/Quick-Start-VSC.md @@ -1,5 +1,3 @@ -- Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) - - Download and install [Visual Studio Code](https://code.visualstudio.com/) - Install Josh Tynjala's [asconfigc](https://www.npmjs.com/package/asconfigc), a command line utility for compiling AS/MXML projects @@ -25,6 +23,7 @@ ```json { "compilerOptions": { +"source-map": true, "targets": [ "JSFlex" ] @@ -48,6 +47,6 @@ ``` -- Select the Debug panel in VSCode and hit the green arrow ('run') to build and run the application. +- Select the Debug panel in VSCode and hit the green arrow to build and run the application. -- Hello World! +- Et voila: "Hello World" in your browser! diff --git a/Quick-Start.md b/Quick-Start.md index 5c0ff7d..f3e20f1 100644 --- a/Quick-Start.md +++ b/Quick-Start.md @@ -1,53 +1 @@ - Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) - -- Download and install [Visual Studio Code](https://code.visualstudio.com/) - -- Install Josh Tynjala's [asconfigc](https://www.npmjs.com/package/asconfigc), a command line utility for compiling AS/MXML projects - -- Install the [AS/MXML VSCode Extension](https://nextgenactionscript.com) by the same author - -- Select a workspace in VSCode - -- Select SDK for workspace - -- Set up project: - - project - | - + -- src - || - |\ -- HelloFlexJS.mxml - | - + -- asconfig.json - - - in '*asconfig.json*': - -```json -{ - "compilerOptions": { - "targets": [ - "JSFlex" - ] - }, - "files": [ - "src/HelloFlexJS.mxml" - ] -} -``` - - - in '*src/HelloFlexJS.mxml*' - -```xml - -http://ns.adobe.com/mxml/2009; xmlns:js="library://ns.apache.org/flexjs/express"> - - - - - - -``` - -- Select the Debug panel in VSCode and hit the green arrow ('run') to build and run the application. - -- Hello World! diff --git a/_Sidebar.md b/_Sidebar.md index 11ec516..ef177ad 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -1,3 +1,11 @@ -- [Home](https://github.com/apache/royale-asjs/wiki) +[Home](https://github.com/apache/royale-asjs/wiki) + +## Tutorials - [Quick Start](https://github.com/apache/royale-asjs/wiki/Quick-Start) + +- [Visual Studio Code](https://github.com/apache/royale-asjs/wiki/Quick-Start-VSC) + +- Moonshine + +- IntelliJ -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Add a bit of structure to the Quick Start section
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 7274df2 Add a bit of structure to the Quick Start section 7274df2 is described below commit 7274df26182859f2758c8433feac416f2e912205 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Wed Oct 4 11:21:57 2017 +0200 Add a bit of structure to the Quick Start section Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- Quick-Start.md => Quick-Start-VSC.md | 7 +++-- Quick-Start.md | 52 _Sidebar.md | 10 ++- 3 files changed, 12 insertions(+), 57 deletions(-) diff --git a/Quick-Start.md b/Quick-Start-VSC.md similarity index 82% copy from Quick-Start.md copy to Quick-Start-VSC.md index 5c0ff7d..ef9529e 100644 --- a/Quick-Start.md +++ b/Quick-Start-VSC.md @@ -1,5 +1,3 @@ -- Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) - - Download and install [Visual Studio Code](https://code.visualstudio.com/) - Install Josh Tynjala's [asconfigc](https://www.npmjs.com/package/asconfigc), a command line utility for compiling AS/MXML projects @@ -25,6 +23,7 @@ ```json { "compilerOptions": { +"source-map": true, "targets": [ "JSFlex" ] @@ -48,6 +47,6 @@ ``` -- Select the Debug panel in VSCode and hit the green arrow ('run') to build and run the application. +- Select the Debug panel in VSCode and hit the green arrow to build and run the application. -- Hello World! +- Et voila: "Hello World" in your browser! diff --git a/Quick-Start.md b/Quick-Start.md index 5c0ff7d..f3e20f1 100644 --- a/Quick-Start.md +++ b/Quick-Start.md @@ -1,53 +1 @@ - Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) - -- Download and install [Visual Studio Code](https://code.visualstudio.com/) - -- Install Josh Tynjala's [asconfigc](https://www.npmjs.com/package/asconfigc), a command line utility for compiling AS/MXML projects - -- Install the [AS/MXML VSCode Extension](https://nextgenactionscript.com) by the same author - -- Select a workspace in VSCode - -- Select SDK for workspace - -- Set up project: - - project - | - + -- src - || - |\ -- HelloFlexJS.mxml - | - + -- asconfig.json - - - in '*asconfig.json*': - -```json -{ - "compilerOptions": { - "targets": [ - "JSFlex" - ] - }, - "files": [ - "src/HelloFlexJS.mxml" - ] -} -``` - - - in '*src/HelloFlexJS.mxml*' - -```xml - -http://ns.adobe.com/mxml/2009; xmlns:js="library://ns.apache.org/flexjs/express"> - - - - - - -``` - -- Select the Debug panel in VSCode and hit the green arrow ('run') to build and run the application. - -- Hello World! diff --git a/_Sidebar.md b/_Sidebar.md index 11ec516..ef177ad 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -1,3 +1,11 @@ -- [Home](https://github.com/apache/royale-asjs/wiki) +[Home](https://github.com/apache/royale-asjs/wiki) + +## Tutorials - [Quick Start](https://github.com/apache/royale-asjs/wiki/Quick-Start) + +- [Visual Studio Code](https://github.com/apache/royale-asjs/wiki/Quick-Start-VSC) + +- Moonshine + +- IntelliJ -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Give it a bit more body
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 456a558 Give it a bit more body 456a558 is described below commit 456a5584140dd707e68eec61649d48a9042bf275 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 11:22:42 2017 +0200 Give it a bit more body Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- Quick-Start.md | 54 ++ 1 file changed, 50 insertions(+), 4 deletions(-) diff --git a/Quick-Start.md b/Quick-Start.md index f4d1dce..5c0ff7d 100644 --- a/Quick-Start.md +++ b/Quick-Start.md @@ -1,7 +1,53 @@ -1) Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) +- Set prerequisites; get and build source ([Project README](https://github.com/apache/royale-asjs)) -2) Download and install Visual Studio Code +- Download and install [Visual Studio Code](https://code.visualstudio.com/) -3) Do more stuff +- Install Josh Tynjala's [asconfigc](https://www.npmjs.com/package/asconfigc), a command line utility for compiling AS/MXML projects -4) Test editing using GitHub Wiki edit tool +- Install the [AS/MXML VSCode Extension](https://nextgenactionscript.com) by the same author + +- Select a workspace in VSCode + +- Select SDK for workspace + +- Set up project: + + project + | + + -- src + || + |\ -- HelloFlexJS.mxml + | + + -- asconfig.json + + - in '*asconfig.json*': + +```json +{ + "compilerOptions": { + "targets": [ + "JSFlex" + ] + }, + "files": [ + "src/HelloFlexJS.mxml" + ] +} +``` + + - in '*src/HelloFlexJS.mxml*' + +```xml + +http://ns.adobe.com/mxml/2009; xmlns:js="library://ns.apache.org/flexjs/express"> + + + + + + +``` + +- Select the Debug panel in VSCode and hit the green arrow ('run') to build and run the application. + +- Hello World! -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Test edit on GitHub Wiki
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new bc1cdf1 Test edit on GitHub Wiki bc1cdf1 is described below commit bc1cdf1fceae91c7cc5b6af045912201e090a215 Author: erikdebruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:59:46 2017 +0200 Test edit on GitHub Wiki --- Quick Start.md => Quick-Start.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Quick Start.md b/Quick-Start.md similarity index 78% rename from Quick Start.md rename to Quick-Start.md index a842499..f4d1dce 100644 --- a/Quick Start.md +++ b/Quick-Start.md @@ -3,3 +3,5 @@ 2) Download and install Visual Studio Code 3) Do more stuff + +4) Test editing using GitHub Wiki edit tool -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch develop updated: Updated README with Quick Start link and rewrite of ‘dependencies’ bits
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/develop by this push: new c29cc78 Updated README with Quick Start link and rewrite of ‘dependencies’ bits c29cc78 is described below commit c29cc78c96eb649deac7154e833300ba45a27169 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:55:31 2017 +0200 Updated README with Quick Start link and rewrite of ‘dependencies’ bits Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dc51452..4c9cd6d 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ After you download the AIR SDK, unzip it and place it in a directory of your cho ## Building the source -FlexJS is a large project. It requires some build tools which must be installed prior to building the SDK. Some of these have different licenses. See the **Software Dependencies** section for more information on the external dependencies below. +FlexJS is a large project. It requires some build tools, such as Google Closure Tools, which must be installed prior to building the SDK. Some of these may have different licenses. You will be prompted during the build to acknowledge these licenses. Linux support is currently experimental and while it is possible to compile the SDK it has not been fully tested. @@ -183,8 +183,8 @@ If you want SWF output, use NPM. Run: sudo npm install flexjs -g ``` -# Software Dependencies +# Using FlexJS -FlexJS depends on the Google Closure Library. +In order to get started using FlexJS, you are invited to follow along with the [Quick Start Guide](https://github.com/apache/royale-asjs/wiki/Quick-Start). ### Thanks for using [Apache Royale](http://royale.apache.org). Enjoy! -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Fix link in Sidebar; rename for better display?
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new a9431e2 Fix link in Sidebar; rename for better display? a9431e2 is described below commit a9431e2f12a5b63b5bc3b003d5f5d5323540e08e Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:38:58 2017 +0200 Fix link in Sidebar; rename for better display? Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- QuickStart.md => Quick Start.md | 0 _Sidebar.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/QuickStart.md b/Quick Start.md similarity index 100% rename from QuickStart.md rename to Quick Start.md diff --git a/_Sidebar.md b/_Sidebar.md index bc648a0..5f2a681 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -1,3 +1,3 @@ - [Home](https://github.com/apache/royale-asjs/wiki) -- [Quick Start](https://github.com/apache/royale-asjs/wiki) +- [Quick Start](https://github.com/apache/royale-asjs/wiki/QuickStart) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Add Quick Start page
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 46748fe Add Quick Start page 46748fe is described below commit 46748fe03195069a7ab8f9b2649fffafdd943b24 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:37:14 2017 +0200 Add Quick Start page Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- QuickStart.md | 1 + _Sidebar.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/QuickStart.md b/QuickStart.md new file mode 100644 index 000..26bd6fd --- /dev/null +++ b/QuickStart.md @@ -0,0 +1 @@ +**Hello World** diff --git a/_Sidebar.md b/_Sidebar.md index 88ada50..bc648a0 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -1 +1,3 @@ - [Home](https://github.com/apache/royale-asjs/wiki) + +- [Quick Start](https://github.com/apache/royale-asjs/wiki) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Add Quick Start page
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new 46748fe Add Quick Start page 46748fe is described below commit 46748fe03195069a7ab8f9b2649fffafdd943b24 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:37:14 2017 +0200 Add Quick Start page Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- QuickStart.md | 1 + _Sidebar.md | 2 ++ 2 files changed, 3 insertions(+) diff --git a/QuickStart.md b/QuickStart.md new file mode 100644 index 000..26bd6fd --- /dev/null +++ b/QuickStart.md @@ -0,0 +1 @@ +**Hello World** diff --git a/_Sidebar.md b/_Sidebar.md index 88ada50..bc648a0 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -1 +1,3 @@ - [Home](https://github.com/apache/royale-asjs/wiki) + +- [Quick Start](https://github.com/apache/royale-asjs/wiki) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs.wiki] branch master updated: Added Sidebar
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git The following commit(s) were added to refs/heads/master by this push: new df7a3ab Added Sidebar df7a3ab is described below commit df7a3abb500ba3a6745a6c37ef5b23cddaeea3b4 Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Tue Oct 3 09:34:51 2017 +0200 Added Sidebar Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- _Sidebar.md | 1 + 1 file changed, 1 insertion(+) diff --git a/_Sidebar.md b/_Sidebar.md new file mode 100644 index 000..88ada50 --- /dev/null +++ b/_Sidebar.md @@ -0,0 +1 @@ +- [Home](https://github.com/apache/royale-asjs/wiki) -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].
[royale-asjs] branch packaging updated: Minor adjustments
This is an automated email from the ASF dual-hosted git repository. erikdebruin pushed a commit to branch packaging in repository https://gitbox.apache.org/repos/asf/royale-asjs.git The following commit(s) were added to refs/heads/packaging by this push: new c897ab4 Minor adjustments c897ab4 is described below commit c897ab4d617a0f222b457b02add7d45b5773755e Author: Erik de Bruin <e...@ixsoftware.nl> AuthorDate: Fri Sep 29 14:08:18 2017 +0200 Minor adjustments Signed-off-by: Erik de Bruin <e...@ixsoftware.nl> --- README.md | 17 - 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 24564a9..dc51452 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ FlexJS requires Java SDK 1.6 or greater to be installed on your computer. For mo FlexJS requires Ant 1.7.1 or greater to be installed on your computer. -If you are using Java SDK 1.7 or greater on a Mac you must use Ant 1.8 or greater. If you use Java 1.7 with Ant 1.7 you will get compile errors. +Note: if you are using Java SDK 1.7 or greater on a Mac you must use Ant 1.8 or greater. If you use Java 1.7 with Ant 1.7 you will get compile errors. For more information on installing Ant, see: @@ -80,7 +80,7 @@ For more information on installing Ant, see: export PATH="$PATH:$ANT_HOME/bin" ``` -### playerglobal.swc +### *playerglobal.swc* The Adobe Flash Player *playerglobal.swc* (version 11.1) can be downloaded from: @@ -96,7 +96,7 @@ Next, rename the downloaded SWC to '*playerglobal.swc*' and place it in the abov Set **PLAYERGLOBAL_HOME** environment variable to the absolute path of the player directory, not including the version subdirectory (i.e. '*[root directory]/player*'). -Other, more recent versions of Adobe Flash Player playerglobal.swc can be downloaded from http://download.macromedia.com/get/flashplayer/updaters/[version.major]/playerglobal[version.major]\_[version.minor].swc (e.g. <http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc>). These versions can be used with FlexJS, but not all have been fully tested. +Other, more recent versions of Adobe Flash Player *playerglobal.swc* can be downloaded from http://download.macromedia.com/get/flashplayer/updaters/[version.major]/playerglobal[version.major]\_[version.minor].swc (e.g. <http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc>). These versions can be used with FlexJS, but not all have been fully tested. ### Flash Player Content Debugger @@ -109,11 +109,11 @@ This version of FlexJS was certified for use with Flash Player 11.1, and is comp - **Environment variable** - On Windows, set **FLASHPLAYER_DEBUGGER** to the absolute path including the filename of the Flash Player Content Debugger executable (e.g. 'FlashPlayerDebugger.exe'). Note: the filename of Flash Player Content Debugger can differ slightly between versions. Adjust your path accordingly. + On Windows, set **FLASHPLAYER_DEBUGGER** to the absolute path including the filename of the Flash Player Content Debugger executable (e.g. '*FlashPlayerDebugger.exe*'). Note: the filename of Flash Player Content Debugger can differ slightly between versions. Adjust your path accordingly. - On the Mac, set **FLASHPLAYER_DEBUGGER** to the absolute path of 'Flash Player.app/Contents/MacOS/Flash Player Debugger' + On the Mac, set **FLASHPLAYER_DEBUGGER** to the absolute path of '*Flash Player.app/Contents/MacOS/Flash Player Debugger*' - On Linux, set **FLASHPLAYER_DEBUGGER** to the absolute path of 'flashplayerdebugger'. + On Linux, set **FLASHPLAYER_DEBUGGER** to the absolute path of '*flashplayerdebugger*'. ### Adobe AIR Integration Kit (optional, for SWF output only) @@ -133,14 +133,13 @@ After you download the AIR SDK, unzip it and place it in a directory of your cho ## Building the source -FlexJS is a large project. It requires some build tools which must be installed prior to building the SDK. Some of these have different licenses. See the *Software Dependencies* section for more information on the external dependencies below. +FlexJS is a large project. It requires some build tools which must be installed prior to building the SDK. Some of these have different licenses. See the **Software Dependencies** section for more information on the external dependencies below. Linux support is currently experimental and while it is possible to compile the SDK it has not been fully tested. -FlexJS requires code from several other Apache Royale git repositories. To get these repositories, run: +FlexJS requires code from several other Apache Royale git repositories. To get these repositories, change to the repository root ('*royale-asjs*') and run: ```bash -cd ant all ``` -- To stop receiving notification emails like this one, please contact ['"commits@royale.apache.org" <commits@royale.apache.org>'].