You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pi...@apache.org on 2019/08/21 06:38:16 UTC
[royale-asjs] branch release/0.9.6 updated (31b94b6 -> 6ca209d)
This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a change to branch release/0.9.6
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 31b94b6 update flash url in npm
add 78c60c4 Make sure controller has state selected state ready before any external click event handlers are triggered.
add 2798153 Jewel CheckBoxValidator: Fix issue where validator added directly to checkbox doesn't work
add e99789f try using visibility instead of display=none so that offsetParent and offsetWidth/Height evaluate to something
add f62ff36 propagate systemManager property
add 08d7e91 handle measuredWidth without measuring non-UIComponent renderers
add bd65f3a RichTextEditor was using embeds and throwing exceptions. Probably a TODO around getting the assets into the output folders. Fixed #439
add 8c947c9 change UIComponent.component to UIComponent.mxmlDocument and get it to work better. Fixes #440
add 2b04c20 setters cannot assume that mxmlDocument is set because they can get set before the component is added to the document
add a0cfda8 set mxmldocument as early as possible
add afe77af don't assume you are the mxmldocument. It will get set elsewhere
add b7f56c7 Merge branch 'develop' of https://github.com/apache/royale-asjs into develop
add d580007 ensure end values if the update happens well after the duration expires
add 1dbee4e set the return type to Number because JS returns a number
add 4996a7e handle left/right and top/bottom sizing
add ef6466d Fixes #445
add 8a1eed2 bad comment
add d5556b3 Fixes #445 again
add 26f3302 well, if we're going to leverage explicitWidth/Height we also have to use _width/_height to support animations and layouts that don't fix the size of the component
add 1f05de4 try to get DG columns to behave better
add 4506b15 need another pixel to keep label from wrapping on Safari
add 317e9ee temporal fix for inject_html in @extern classes
add 580fea4 handle background with only a color specified. Fixes #449
add 48eb25c horizontalAlign in MX Container/Panel
add 9504cb1 Fixes #444
add cfcd1ad Bead for hiding drawer, not yet tested
add b56c1c2 manually apply 31b94b6 to develop branch
add 58f0317 changes to move to Selenium3. Requires geckodriver in path or specified as SystemProperty
add 90d3519 try to use correct geckodriver
add 77fbd1c close event when dropdown goes away
add 0de8bc9 jewel-button: New BasicButton to hold all basic functionality and left Button just with text/html property. Also clean and update code and docs to improve royale-docs.
add bcffaee Move example hljs @extern to demo apps and remove from Jewel library thanks to latest fix in compiler by josh tynjala
add 8dc949d jewel-alert: transfer inject_html to the place it always should be: dialogPolyfil @extern
add c27fdd0 jewel-button: uppercase docs
add f036484 jewel-basicbutton: improve event docs and remove unused import
add 95c56a6 mouseevent is not an event in SWF
add ce406f4 containers without mxml-defined properties were not setting mxmldocument correctly, so try to set it here
add c1168dc forgot to change this
add 2e6f8a5 make it possible to enable more diagnostics
add 8171f1e disable failing test while investigating
new 6ca209d Merge branch 'develop' into release/0.9.6
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:
build.xml | 172 +--------
.../src/main/royale/hljs.as | 0
.../src/main/royale/ButtonPlayGround.mxml | 2 +
.../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
.../royale/TourDeJewel}/src/main/royale/hljs.as | 0
.../src/main/config/compile-js-config.xml | 33 +-
.../main/royale/org/apache/royale/core/UIBase.as | 8 +-
.../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
.../CascadingMenuSelectionMouseController.as | 78 +++-
.../controllers/MenuSelectionMouseController.as | 19 +-
.../royale/html/beads/layouts/DataGridLayout.as | 19 +-
.../royale/html/supportClasses/DataGridColumn.as | 3 +-
.../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
.../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
.../main/royale/org/apache/royale/effects/Wipe.as | 8 +
.../Jewel/src/main/resources/jewel-manifest.xml | 3 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
.../Jewel/src/main/royale/dialogPolyfill.as | 8 +
.../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
.../main/royale/org/apache/royale/jewel/Button.as | 418 +++------------------
.../controls/drawer/HideDrawerOnMouseDown.as} | 47 +--
.../jewel/beads/validators/CheckBoxValidator.as | 30 +-
.../button/BasicButton.as} | 193 +++-------
.../src/main/config/compile-swf-config.xml | 32 ++
.../src/main/resources/assets/divider_vertical.png | Bin 27229 -> 27186 bytes
.../main/resources}/assets/icon_align_center.png | Bin
.../main/resources}/assets/icon_align_justify.png | Bin
.../src/main/resources}/assets/icon_align_left.png | Bin
.../main/resources}/assets/icon_align_right.png | Bin
.../src/main/resources}/assets/icon_bullet.png | Bin
.../src/main/resources}/assets/icon_style_bold.png | Bin
.../main/resources}/assets/icon_style_italic.png | Bin
.../resources}/assets/icon_style_underline.png | Bin
.../MXRoyale/src/main/resources/defaults.css | 7 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
.../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
.../main/royale/mx/containers/beads/PanelView.as | 3 +
.../src/main/royale/mx/controls/RadioButton.as | 60 ++-
.../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
.../beads/{AlertView.as => ComboBoxView.as} | 17 +-
.../controls}/beads/DataProviderChangeNotifier.as | 55 ++-
.../controllers/RadioButtonMouseController.as | 4 +-
.../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
.../mx/controls/listClasses/AdvancedListBase.as | 30 ++
.../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
.../src/main/royale/mx/core/IUIComponent.as | 4 +-
.../src/main/royale/mx/core/UIComponent.as | 85 +++--
.../src/main/royale/mx/managers/ISystemManager.as | 4 +-
.../src/main/royale/mx/managers/PopUpManager.as | 7 +-
.../src/main/royale/mx/managers/SystemManager.as | 28 +-
.../royale/spark/components/SkinnableContainer.as | 3 -
.../spark/components/supportClasses/GroupBase.as | 3 -
marmotinni/java/downloads.xml | 23 +-
.../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
.../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
.../halo/scripts/NumericStepperTestScript.mxml | 7 +-
59 files changed, 783 insertions(+), 876 deletions(-)
copy {frameworks/projects/Jewel => examples/blog/BE0012_Using_external_javascript_libraries_in_Apache_Royale}/src/main/royale/hljs.as (100%)
rename {frameworks/projects/Jewel => examples/royale/TourDeJewel}/src/main/royale/hljs.as (100%)
copy frameworks/projects/{Basic/src/main/royale/org/apache/royale/html/beads/HideComboPopupOnMouseDownBead.as => Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/drawer/HideDrawerOnMouseDown.as} (57%)
copy frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/{Button.as => supportClasses/button/BasicButton.as} (63%)
copy examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar/assets/icon_style_italic.png => frameworks/projects/MXRoyale/src/main/resources/assets/divider_vertical.png (68%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_align_center.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_align_justify.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_align_left.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_align_right.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_bullet.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_style_bold.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_style_italic.png (100%)
copy {examples/mxroyale/tourdeflexmodules/src/spark/tlf/textEditBar => frameworks/projects/MXRoyale/src/main/resources}/assets/icon_style_underline.png (100%)
copy frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/{AlertView.as => ComboBoxView.as} (75%)
copy frameworks/projects/{Basic/src/main/royale/org/apache/royale/html => MXRoyale/src/main/royale/mx/controls}/beads/DataProviderChangeNotifier.as (58%)
create mode 100644 frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/layouts/DataGridLayout.as
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Alex Harui <ah...@adobe.com.INVALID>.
There should have been new tag commits then. I did not see them. I could have missed them, but make sure they are what you need them to be.
-Alex
On 8/22/19, 8:00 AM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
Yes I have rerun release:prepare step once I merge develop to release tag
branch.
Ok I will try to figure out how to use JAVA_TOOL_OPTIONS.
czw., 22 sie 2019 o 16:48 Alex Harui <ah...@adobe.com.invalid> napisał(a):
> Responses inline...
>
> On 8/21/19, 11:55 PM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
>
> Alex,
>
> I'm aware about that, but I would like to have all of those changes.
> Steps
> are working good, so far I bump into rather problems on my PC.
>
> I did not see new tag commits, so I'm not sure you understood me. If you
> pull down new changes and just run release:perform, it will NOT pick up the
> changes because it uses the last tag from the release:prepare step. I'm
> pretty sure you get these changes in the artifacts you should have had to
> delete the tag and re-run the release:perform steps.
>
> Where I can setup that Java memory options if I'm using OpenJDK ? I
> remember I was doing it a long time ago, and in Intellij I can do this
> for
> each compilation in UI. I will try to google it of course.
>
> OpenJDK seems to use JAVA_TOOL_OPTIONS
>
> HTH,
> -Alex
>
>
>
--
Piotr Zarzycki
Patreon: *https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Cb3be9189a3634c73703808d727116a81%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637020828106542095&sdata=BZm37bfGyAldAQ9V6Cs3c3PxQruIfhwJtc1tidLHPL0%3D&reserved=0
<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7Cb3be9189a3634c73703808d727116a81%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637020828106542095&sdata=BZm37bfGyAldAQ9V6Cs3c3PxQruIfhwJtc1tidLHPL0%3D&reserved=0>*
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Piotr Zarzycki <pi...@gmail.com>.
Yes I have rerun release:prepare step once I merge develop to release tag
branch.
Ok I will try to figure out how to use JAVA_TOOL_OPTIONS.
czw., 22 sie 2019 o 16:48 Alex Harui <ah...@adobe.com.invalid> napisał(a):
> Responses inline...
>
> On 8/21/19, 11:55 PM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
>
> Alex,
>
> I'm aware about that, but I would like to have all of those changes.
> Steps
> are working good, so far I bump into rather problems on my PC.
>
> I did not see new tag commits, so I'm not sure you understood me. If you
> pull down new changes and just run release:perform, it will NOT pick up the
> changes because it uses the last tag from the release:prepare step. I'm
> pretty sure you get these changes in the artifacts you should have had to
> delete the tag and re-run the release:perform steps.
>
> Where I can setup that Java memory options if I'm using OpenJDK ? I
> remember I was doing it a long time ago, and in Intellij I can do this
> for
> each compilation in UI. I will try to google it of course.
>
> OpenJDK seems to use JAVA_TOOL_OPTIONS
>
> HTH,
> -Alex
>
>
>
--
Piotr Zarzycki
Patreon: *https://www.patreon.com/piotrzarzycki
<https://www.patreon.com/piotrzarzycki>*
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Alex Harui <ah...@adobe.com.INVALID>.
Responses inline...
On 8/21/19, 11:55 PM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
Alex,
I'm aware about that, but I would like to have all of those changes. Steps
are working good, so far I bump into rather problems on my PC.
I did not see new tag commits, so I'm not sure you understood me. If you pull down new changes and just run release:perform, it will NOT pick up the changes because it uses the last tag from the release:prepare step. I'm pretty sure you get these changes in the artifacts you should have had to delete the tag and re-run the release:perform steps.
Where I can setup that Java memory options if I'm using OpenJDK ? I
remember I was doing it a long time ago, and in Intellij I can do this for
each compilation in UI. I will try to google it of course.
OpenJDK seems to use JAVA_TOOL_OPTIONS
HTH,
-Alex
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Piotr Zarzycki <pi...@gmail.com>.
Alex,
I'm aware about that, but I would like to have all of those changes. Steps
are working good, so far I bump into rather problems on my PC.
Where I can setup that Java memory options if I'm using OpenJDK ? I
remember I was doing it a long time ago, and in Intellij I can do this for
each compilation in UI. I will try to google it of course.
Unfortunately I didn't grab console output.
Thanks,
Piotr
śr., 21 sie 2019 o 18:47 Alex Harui <ah...@adobe.com.invalid> napisał(a):
> There is no obligation that this release contain the latest from develop
> branch, so you don't really have to keep going back to pick up changes.
> The goal is to see if the steps work or not so others can cut a release and
> get their changes out, further reducing the pressure to release from the
> latest changes.
>
> Also note that you can't selectively re-run certain steps. The
> release:perform steps work from a tag, not the head, so it is probable that
> the artifacts did not actually contain the changes you tried to merge into
> develop.
>
> What steps are generating out of memory? What is the console output?
> You can see from the Jenkins setup that it is using Java memory options:
> -Xms384m -Xmx1g
>
> HTH,
> -Alex
>
> On 8/21/19, 7:54 AM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
>
> I will probably remove all of that and start from scratch. Good to
> know.
>
> For some reason I have out of memory exception during build themes for
> Jewel, so still cannot pass trough full process. It become again HUGE
> pain.
> I was thinking about setup stuff on Mac, but my frustration is to high
> on
> fighting with my Mac where I'm definitely not a power user. ;)
>
> Thanks,
> Piotr
>
> śr., 21 sie 2019 o 16:51 Alex Harui <ah...@adobe.com.invalid>
> napisał(a):
>
> > Are you using cherry-picking to do this? Be careful about merging
> version
> > numbers and snapshots from dev into release.
> >
> > IMO, it is a dangerous practice to merge develop into a release
> branch.
> >
> > -Alex
> >
> > On 8/20/19, 11:38 PM, "piotrz@apache.org" <pi...@apache.org> wrote:
> >
> > This is an automated email from the ASF dual-hosted git
> repository.
> >
> > piotrz pushed a commit to branch release/0.9.6
> > in repository
> >
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=dqwyKcfZB0iRxYZRSGRWU9pET9f1OKMbZ1kKF10Oy4U%3D&reserved=0
> >
> > commit 6ca209d3bdb11b9964954039c503509bce52e096
> > Merge: 31b94b6 8171f1e
> > Author: Piotr Zarzycki <pi...@gmail.com>
> > AuthorDate: Wed Aug 21 08:38:02 2019 +0200
> >
> > Merge branch 'develop' into release/0.9.6
> >
> > build.xml | 172
> +--------
> > .../src/main/royale/hljs.as | 0
> > .../src/main/royale/ButtonPlayGround.mxml | 2 +
> > .../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
> > .../royale/TourDeJewel}/src/main/royale/hljs.as | 0
> > .../src/main/config/compile-js-config.xml | 33 +-
> > .../main/royale/org/apache/royale/core/UIBase.as | 8 +-
> > .../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
> > .../CascadingMenuSelectionMouseController.as | 78 +++-
> > .../controllers/MenuSelectionMouseController.as | 19 +-
> > .../royale/html/beads/layouts/DataGridLayout.as | 19 +-
> > .../royale/html/supportClasses/DataGridColumn.as | 3 +-
> > .../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
> > .../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
> > .../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
> > .../main/royale/org/apache/royale/effects/Wipe.as | 8 +
> > .../Jewel/src/main/resources/jewel-manifest.xml | 3 +
> > .../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
> > .../Jewel/src/main/royale/dialogPolyfill.as | 8 +
> > .../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
> > .../main/royale/org/apache/royale/jewel/Button.as | 418
> > +++------------------
> > .../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++
> > .../jewel/beads/validators/CheckBoxValidator.as | 30 +-
> > .../button/BasicButton.as} | 193
> +++-------
> > .../src/main/config/compile-swf-config.xml | 32 ++
> > .../src/main/resources/assets/divider_vertical.png | Bin 0 ->
> 27186
> > bytes
> > .../main/resources/assets/icon_align_center.png | Bin 0 ->
> 27220
> > bytes
> > .../main/resources/assets/icon_align_justify.png | Bin 0 ->
> 27095
> > bytes
> > .../src/main/resources/assets/icon_align_left.png | Bin 0 ->
> 27210
> > bytes
> > .../src/main/resources/assets/icon_align_right.png | Bin 0 ->
> 27210
> > bytes
> > .../src/main/resources/assets/icon_bullet.png | Bin 0 ->
> 27234
> > bytes
> > .../src/main/resources/assets/icon_style_bold.png | Bin 0 ->
> 27205
> > bytes
> > .../main/resources/assets/icon_style_italic.png | Bin 0 ->
> 27229
> > bytes
> > .../main/resources/assets/icon_style_underline.png | Bin 0 ->
> 27197
> > bytes
> > .../MXRoyale/src/main/resources/defaults.css | 7 +-
> > .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
> > .../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
> > .../main/royale/mx/containers/beads/PanelView.as | 3 +
> > .../src/main/royale/mx/controls/RadioButton.as | 60 ++-
> > .../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
> > .../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
> > .../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++-
> > .../controls/beads/DataProviderChangeNotifier.as | 102 +++++
> > .../controllers/RadioButtonMouseController.as | 4 +-
> > .../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
> > .../mx/controls/listClasses/AdvancedListBase.as | 30 ++
> > .../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
> > .../src/main/royale/mx/core/IUIComponent.as | 4 +-
> > .../src/main/royale/mx/core/UIComponent.as | 85 +++--
> > .../src/main/royale/mx/managers/ISystemManager.as | 4 +-
> > .../src/main/royale/mx/managers/PopUpManager.as | 7 +-
> > .../src/main/royale/mx/managers/SystemManager.as | 28 +-
> > .../royale/spark/components/SkinnableContainer.as | 3 -
> > .../spark/components/supportClasses/GroupBase.as | 3 -
> > marmotinni/java/downloads.xml | 23 +-
> > .../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
> > .../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
> > mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
> > .../halo/scripts/NumericStepperTestScript.mxml | 7 +-
> > 59 files changed, 938 insertions(+), 846 deletions(-)
> >
> >
> >
> >
>
> --
>
> Piotr Zarzycki
>
> Patreon: *
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=cS9vWxieDrYrau9%2FI3o2TDK4D6hAk8T%2FrxGsNfLdXo4%3D&reserved=0
> <
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=cS9vWxieDrYrau9%2FI3o2TDK4D6hAk8T%2FrxGsNfLdXo4%3D&reserved=0
> >*
>
>
>
--
Piotr Zarzycki
Patreon: *https://www.patreon.com/piotrzarzycki
<https://www.patreon.com/piotrzarzycki>*
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Alex Harui <ah...@adobe.com.INVALID>.
There is no obligation that this release contain the latest from develop branch, so you don't really have to keep going back to pick up changes. The goal is to see if the steps work or not so others can cut a release and get their changes out, further reducing the pressure to release from the latest changes.
Also note that you can't selectively re-run certain steps. The release:perform steps work from a tag, not the head, so it is probable that the artifacts did not actually contain the changes you tried to merge into develop.
What steps are generating out of memory? What is the console output?
You can see from the Jenkins setup that it is using Java memory options: -Xms384m -Xmx1g
HTH,
-Alex
On 8/21/19, 7:54 AM, "Piotr Zarzycki" <pi...@gmail.com> wrote:
I will probably remove all of that and start from scratch. Good to know.
For some reason I have out of memory exception during build themes for
Jewel, so still cannot pass trough full process. It become again HUGE pain.
I was thinking about setup stuff on Mac, but my frustration is to high on
fighting with my Mac where I'm definitely not a power user. ;)
Thanks,
Piotr
śr., 21 sie 2019 o 16:51 Alex Harui <ah...@adobe.com.invalid> napisał(a):
> Are you using cherry-picking to do this? Be careful about merging version
> numbers and snapshots from dev into release.
>
> IMO, it is a dangerous practice to merge develop into a release branch.
>
> -Alex
>
> On 8/20/19, 11:38 PM, "piotrz@apache.org" <pi...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> piotrz pushed a commit to branch release/0.9.6
> in repository
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=dqwyKcfZB0iRxYZRSGRWU9pET9f1OKMbZ1kKF10Oy4U%3D&reserved=0
>
> commit 6ca209d3bdb11b9964954039c503509bce52e096
> Merge: 31b94b6 8171f1e
> Author: Piotr Zarzycki <pi...@gmail.com>
> AuthorDate: Wed Aug 21 08:38:02 2019 +0200
>
> Merge branch 'develop' into release/0.9.6
>
> build.xml | 172 +--------
> .../src/main/royale/hljs.as | 0
> .../src/main/royale/ButtonPlayGround.mxml | 2 +
> .../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
> .../royale/TourDeJewel}/src/main/royale/hljs.as | 0
> .../src/main/config/compile-js-config.xml | 33 +-
> .../main/royale/org/apache/royale/core/UIBase.as | 8 +-
> .../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
> .../CascadingMenuSelectionMouseController.as | 78 +++-
> .../controllers/MenuSelectionMouseController.as | 19 +-
> .../royale/html/beads/layouts/DataGridLayout.as | 19 +-
> .../royale/html/supportClasses/DataGridColumn.as | 3 +-
> .../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
> .../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
> .../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
> .../main/royale/org/apache/royale/effects/Wipe.as | 8 +
> .../Jewel/src/main/resources/jewel-manifest.xml | 3 +
> .../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
> .../Jewel/src/main/royale/dialogPolyfill.as | 8 +
> .../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
> .../main/royale/org/apache/royale/jewel/Button.as | 418
> +++------------------
> .../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++
> .../jewel/beads/validators/CheckBoxValidator.as | 30 +-
> .../button/BasicButton.as} | 193 +++-------
> .../src/main/config/compile-swf-config.xml | 32 ++
> .../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186
> bytes
> .../main/resources/assets/icon_align_center.png | Bin 0 -> 27220
> bytes
> .../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095
> bytes
> .../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210
> bytes
> .../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210
> bytes
> .../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234
> bytes
> .../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205
> bytes
> .../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229
> bytes
> .../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197
> bytes
> .../MXRoyale/src/main/resources/defaults.css | 7 +-
> .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
> .../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
> .../main/royale/mx/containers/beads/PanelView.as | 3 +
> .../src/main/royale/mx/controls/RadioButton.as | 60 ++-
> .../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
> .../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
> .../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++-
> .../controls/beads/DataProviderChangeNotifier.as | 102 +++++
> .../controllers/RadioButtonMouseController.as | 4 +-
> .../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
> .../mx/controls/listClasses/AdvancedListBase.as | 30 ++
> .../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
> .../src/main/royale/mx/core/IUIComponent.as | 4 +-
> .../src/main/royale/mx/core/UIComponent.as | 85 +++--
> .../src/main/royale/mx/managers/ISystemManager.as | 4 +-
> .../src/main/royale/mx/managers/PopUpManager.as | 7 +-
> .../src/main/royale/mx/managers/SystemManager.as | 28 +-
> .../royale/spark/components/SkinnableContainer.as | 3 -
> .../spark/components/supportClasses/GroupBase.as | 3 -
> marmotinni/java/downloads.xml | 23 +-
> .../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
> .../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
> mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
> .../halo/scripts/NumericStepperTestScript.mxml | 7 +-
> 59 files changed, 938 insertions(+), 846 deletions(-)
>
>
>
>
--
Piotr Zarzycki
Patreon: *https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=cS9vWxieDrYrau9%2FI3o2TDK4D6hAk8T%2FrxGsNfLdXo4%3D&reserved=0
<https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.patreon.com%2Fpiotrzarzycki&data=02%7C01%7Caharui%40adobe.com%7C3bf32b8bc5bf4054ed9e08d726476b17%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637019960492890912&sdata=cS9vWxieDrYrau9%2FI3o2TDK4D6hAk8T%2FrxGsNfLdXo4%3D&reserved=0>*
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Piotr Zarzycki <pi...@gmail.com>.
I will probably remove all of that and start from scratch. Good to know.
For some reason I have out of memory exception during build themes for
Jewel, so still cannot pass trough full process. It become again HUGE pain.
I was thinking about setup stuff on Mac, but my frustration is to high on
fighting with my Mac where I'm definitely not a power user. ;)
Thanks,
Piotr
śr., 21 sie 2019 o 16:51 Alex Harui <ah...@adobe.com.invalid> napisał(a):
> Are you using cherry-picking to do this? Be careful about merging version
> numbers and snapshots from dev into release.
>
> IMO, it is a dangerous practice to merge develop into a release branch.
>
> -Alex
>
> On 8/20/19, 11:38 PM, "piotrz@apache.org" <pi...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> piotrz pushed a commit to branch release/0.9.6
> in repository
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cbcf5b54d5bb04907c78208d7260227d8%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C1%7C637019663005699711&sdata=RFt66D0q7GnARG29qEn%2FTwbtefahoA%2BS4KGuBvTvCCs%3D&reserved=0
>
> commit 6ca209d3bdb11b9964954039c503509bce52e096
> Merge: 31b94b6 8171f1e
> Author: Piotr Zarzycki <pi...@gmail.com>
> AuthorDate: Wed Aug 21 08:38:02 2019 +0200
>
> Merge branch 'develop' into release/0.9.6
>
> build.xml | 172 +--------
> .../src/main/royale/hljs.as | 0
> .../src/main/royale/ButtonPlayGround.mxml | 2 +
> .../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
> .../royale/TourDeJewel}/src/main/royale/hljs.as | 0
> .../src/main/config/compile-js-config.xml | 33 +-
> .../main/royale/org/apache/royale/core/UIBase.as | 8 +-
> .../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
> .../CascadingMenuSelectionMouseController.as | 78 +++-
> .../controllers/MenuSelectionMouseController.as | 19 +-
> .../royale/html/beads/layouts/DataGridLayout.as | 19 +-
> .../royale/html/supportClasses/DataGridColumn.as | 3 +-
> .../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
> .../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
> .../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
> .../main/royale/org/apache/royale/effects/Wipe.as | 8 +
> .../Jewel/src/main/resources/jewel-manifest.xml | 3 +
> .../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
> .../Jewel/src/main/royale/dialogPolyfill.as | 8 +
> .../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
> .../main/royale/org/apache/royale/jewel/Button.as | 418
> +++------------------
> .../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++
> .../jewel/beads/validators/CheckBoxValidator.as | 30 +-
> .../button/BasicButton.as} | 193 +++-------
> .../src/main/config/compile-swf-config.xml | 32 ++
> .../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186
> bytes
> .../main/resources/assets/icon_align_center.png | Bin 0 -> 27220
> bytes
> .../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095
> bytes
> .../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210
> bytes
> .../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210
> bytes
> .../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234
> bytes
> .../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205
> bytes
> .../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229
> bytes
> .../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197
> bytes
> .../MXRoyale/src/main/resources/defaults.css | 7 +-
> .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
> .../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
> .../main/royale/mx/containers/beads/PanelView.as | 3 +
> .../src/main/royale/mx/controls/RadioButton.as | 60 ++-
> .../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
> .../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
> .../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++-
> .../controls/beads/DataProviderChangeNotifier.as | 102 +++++
> .../controllers/RadioButtonMouseController.as | 4 +-
> .../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
> .../mx/controls/listClasses/AdvancedListBase.as | 30 ++
> .../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
> .../src/main/royale/mx/core/IUIComponent.as | 4 +-
> .../src/main/royale/mx/core/UIComponent.as | 85 +++--
> .../src/main/royale/mx/managers/ISystemManager.as | 4 +-
> .../src/main/royale/mx/managers/PopUpManager.as | 7 +-
> .../src/main/royale/mx/managers/SystemManager.as | 28 +-
> .../royale/spark/components/SkinnableContainer.as | 3 -
> .../spark/components/supportClasses/GroupBase.as | 3 -
> marmotinni/java/downloads.xml | 23 +-
> .../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
> .../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
> mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
> .../halo/scripts/NumericStepperTestScript.mxml | 7 +-
> 59 files changed, 938 insertions(+), 846 deletions(-)
>
>
>
>
--
Piotr Zarzycki
Patreon: *https://www.patreon.com/piotrzarzycki
<https://www.patreon.com/piotrzarzycki>*
Re: [royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by Alex Harui <ah...@adobe.com.INVALID>.
Are you using cherry-picking to do this? Be careful about merging version numbers and snapshots from dev into release.
IMO, it is a dangerous practice to merge develop into a release branch.
-Alex
On 8/20/19, 11:38 PM, "piotrz@apache.org" <pi...@apache.org> wrote:
This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a commit to branch release/0.9.6
in repository https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cbcf5b54d5bb04907c78208d7260227d8%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C1%7C637019663005699711&sdata=RFt66D0q7GnARG29qEn%2FTwbtefahoA%2BS4KGuBvTvCCs%3D&reserved=0
commit 6ca209d3bdb11b9964954039c503509bce52e096
Merge: 31b94b6 8171f1e
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Wed Aug 21 08:38:02 2019 +0200
Merge branch 'develop' into release/0.9.6
build.xml | 172 +--------
.../src/main/royale/hljs.as | 0
.../src/main/royale/ButtonPlayGround.mxml | 2 +
.../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
.../royale/TourDeJewel}/src/main/royale/hljs.as | 0
.../src/main/config/compile-js-config.xml | 33 +-
.../main/royale/org/apache/royale/core/UIBase.as | 8 +-
.../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
.../CascadingMenuSelectionMouseController.as | 78 +++-
.../controllers/MenuSelectionMouseController.as | 19 +-
.../royale/html/beads/layouts/DataGridLayout.as | 19 +-
.../royale/html/supportClasses/DataGridColumn.as | 3 +-
.../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
.../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
.../main/royale/org/apache/royale/effects/Wipe.as | 8 +
.../Jewel/src/main/resources/jewel-manifest.xml | 3 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
.../Jewel/src/main/royale/dialogPolyfill.as | 8 +
.../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
.../main/royale/org/apache/royale/jewel/Button.as | 418 +++------------------
.../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++
.../jewel/beads/validators/CheckBoxValidator.as | 30 +-
.../button/BasicButton.as} | 193 +++-------
.../src/main/config/compile-swf-config.xml | 32 ++
.../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186 bytes
.../main/resources/assets/icon_align_center.png | Bin 0 -> 27220 bytes
.../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095 bytes
.../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234 bytes
.../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205 bytes
.../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229 bytes
.../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197 bytes
.../MXRoyale/src/main/resources/defaults.css | 7 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
.../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
.../main/royale/mx/containers/beads/PanelView.as | 3 +
.../src/main/royale/mx/controls/RadioButton.as | 60 ++-
.../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
.../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++-
.../controls/beads/DataProviderChangeNotifier.as | 102 +++++
.../controllers/RadioButtonMouseController.as | 4 +-
.../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
.../mx/controls/listClasses/AdvancedListBase.as | 30 ++
.../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
.../src/main/royale/mx/core/IUIComponent.as | 4 +-
.../src/main/royale/mx/core/UIComponent.as | 85 +++--
.../src/main/royale/mx/managers/ISystemManager.as | 4 +-
.../src/main/royale/mx/managers/PopUpManager.as | 7 +-
.../src/main/royale/mx/managers/SystemManager.as | 28 +-
.../royale/spark/components/SkinnableContainer.as | 3 -
.../spark/components/supportClasses/GroupBase.as | 3 -
marmotinni/java/downloads.xml | 23 +-
.../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
.../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
.../halo/scripts/NumericStepperTestScript.mxml | 7 +-
59 files changed, 938 insertions(+), 846 deletions(-)
[royale-asjs] 01/01: Merge branch 'develop' into release/0.9.6
Posted by pi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
piotrz pushed a commit to branch release/0.9.6
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 6ca209d3bdb11b9964954039c503509bce52e096
Merge: 31b94b6 8171f1e
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Wed Aug 21 08:38:02 2019 +0200
Merge branch 'develop' into release/0.9.6
build.xml | 172 +--------
.../src/main/royale/hljs.as | 0
.../src/main/royale/ButtonPlayGround.mxml | 2 +
.../ExampleAndSourceCodeTabbedSectionContent.as | 5 +-
.../royale/TourDeJewel}/src/main/royale/hljs.as | 0
.../src/main/config/compile-js-config.xml | 33 +-
.../main/royale/org/apache/royale/core/UIBase.as | 8 +-
.../org/apache/royale/html/beads/ComboBoxView.as | 2 +-
.../CascadingMenuSelectionMouseController.as | 78 +++-
.../controllers/MenuSelectionMouseController.as | 19 +-
.../royale/html/beads/layouts/DataGridLayout.as | 19 +-
.../royale/html/supportClasses/DataGridColumn.as | 3 +-
.../royale/org/apache/royale/core/IEffectTimer.as | 2 +-
.../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +-
.../royale/org/apache/royale/utils/EffectTimer.as | 2 +-
.../main/royale/org/apache/royale/effects/Wipe.as | 8 +
.../Jewel/src/main/resources/jewel-manifest.xml | 3 +
.../projects/Jewel/src/main/royale/JewelClasses.as | 2 -
.../Jewel/src/main/royale/dialogPolyfill.as | 8 +
.../main/royale/org/apache/royale/jewel/Alert.as | 7 +-
.../main/royale/org/apache/royale/jewel/Button.as | 418 +++------------------
.../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++
.../jewel/beads/validators/CheckBoxValidator.as | 30 +-
.../button/BasicButton.as} | 193 +++-------
.../src/main/config/compile-swf-config.xml | 32 ++
.../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186 bytes
.../main/resources/assets/icon_align_center.png | Bin 0 -> 27220 bytes
.../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095 bytes
.../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210 bytes
.../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234 bytes
.../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205 bytes
.../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229 bytes
.../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197 bytes
.../MXRoyale/src/main/resources/defaults.css | 7 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 +
.../main/royale/mx/containers/beads/BoxLayout.as | 12 +-
.../main/royale/mx/containers/beads/PanelView.as | 3 +
.../src/main/royale/mx/controls/RadioButton.as | 60 ++-
.../main/royale/mx/controls/RichTextEditor.mxml | 16 +-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +-
.../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++-
.../controls/beads/DataProviderChangeNotifier.as | 102 +++++
.../controllers/RadioButtonMouseController.as | 4 +-
.../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++
.../mx/controls/listClasses/AdvancedListBase.as | 30 ++
.../MXRoyale/src/main/royale/mx/core/Container.as | 20 +-
.../src/main/royale/mx/core/IUIComponent.as | 4 +-
.../src/main/royale/mx/core/UIComponent.as | 85 +++--
.../src/main/royale/mx/managers/ISystemManager.as | 4 +-
.../src/main/royale/mx/managers/PopUpManager.as | 7 +-
.../src/main/royale/mx/managers/SystemManager.as | 28 +-
.../royale/spark/components/SkinnableContainer.as | 3 -
.../spark/components/supportClasses/GroupBase.as | 3 -
marmotinni/java/downloads.xml | 23 +-
.../java/marmotinni/DispatchMouseClickEvent.java | 6 +-
.../src/main/java/marmotinni/MarmotinniRunner.java | 24 +-
mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
.../halo/scripts/NumericStepperTestScript.mxml | 7 +-
59 files changed, 938 insertions(+), 846 deletions(-)