This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch examples/TDJ_localresources in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 41ffc96581113a2d14a27cd5a62bf2a5b7a173d5 Author: Josh Tynjala <[email protected]> AuthorDate: Mon Mar 31 14:47:05 2025 -0700 TourDeJewel: js-includes can't be in src/main/resources because they will be copied by Maven/Ant builds Move them back into src/main/assembly, but keep library scripts/styles/assets together instead of separating them. uses a third-party directory for clarity. --- examples/jewel/TourDeJewel/asconfig.json | 7 +++++++ examples/jewel/TourDeJewel/pom.xml | 14 +++++++------- examples/jewel/TourDeJewel/rat-excludes.txt | 4 ++-- .../third-party}/highlight.js/9.12.0/LICENSE-highlightjs | 0 .../highlight.js/9.12.0/atom-one-dark.min.css | 0 .../third-party}/highlight.js/9.12.0/highlight.min.js | 0 .../assets => assembly/third-party}/lato/LICENSE-lato | 0 .../assets => assembly/third-party}/lato/Lato-Bold.ttf | Bin .../third-party}/lato/Lato-BoldItalic.ttf | Bin .../assets => assembly/third-party}/lato/Lato-Italic.ttf | Bin .../assets => assembly/third-party}/lato/Lato-Regular.ttf | Bin .../assets => assembly/third-party}/lato/Lato.css | 0 .../TourDeJewel/src/main/config/compile-app-config.xml | 14 +++++++------- 13 files changed, 23 insertions(+), 16 deletions(-) diff --git a/examples/jewel/TourDeJewel/asconfig.json b/examples/jewel/TourDeJewel/asconfig.json index fb137b2f1e..1e31114bbb 100644 --- a/examples/jewel/TourDeJewel/asconfig.json +++ b/examples/jewel/TourDeJewel/asconfig.json @@ -32,6 +32,13 @@ "copySourcePathAssets": true, "additionalOptions": [ "-js-dynamic-access-unknown-members=true", + "-js-include-script+=src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js", + "-js-include-css+=src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css", + "-js-include-css+=src/main/assembly/third-party/lato/Lato.css", + "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Regular.ttf", + "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Bold.ttf", + "-js-include-asset+=src/main/assembly/third-party/lato/Lato-Italic.ttf", + "-js-include-asset+=src/main/assembly/third-party/lato/Lato-BoldItalic.ttf" ], "files": [ diff --git a/examples/jewel/TourDeJewel/pom.xml b/examples/jewel/TourDeJewel/pom.xml index d0bbc9cc30..20b843c112 100644 --- a/examples/jewel/TourDeJewel/pom.xml +++ b/examples/jewel/TourDeJewel/pom.xml @@ -959,13 +959,13 @@ -prevent-rename-public-instance-methods=false -source-map=true; - -js-include-script+=${basedir}/src/main/resources/assets/highlight.js/9.12.0/highlight.min.js; - -js-include-css+=${basedir}/src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css; - -js-include-css+=${basedir}/src/main/resources/assets/lato/Lato.css; - -js-include-asset+=${basedir}/src/main/resources/assets/lato/Lato-Regular.ttf; - -js-include-asset+=${basedir}/src/main/resources/assets/lato/Lato-Bold.ttf; - -js-include-asset+=${basedir}/src/main/resources/assets/lato/Lato-Italic.ttf; - -js-include-asset+=${basedir}/src/main/resources/assets/lato/Lato-BoldItalic.ttf; + -js-include-script+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js; + -js-include-css+=${basedir}/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css; + -js-include-css+=${basedir}/src/main/assembly/third-party/lato/Lato.css; + -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Regular.ttf; + -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Bold.ttf; + -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-Italic.ttf; + -js-include-asset+=${basedir}/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf; </additionalCompilerOptions> <!-- At command line use -Droyalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven/frameworks --> </configuration> diff --git a/examples/jewel/TourDeJewel/rat-excludes.txt b/examples/jewel/TourDeJewel/rat-excludes.txt index 3a9e0259c1..16395e18e7 100644 --- a/examples/jewel/TourDeJewel/rat-excludes.txt +++ b/examples/jewel/TourDeJewel/rat-excludes.txt @@ -18,5 +18,5 @@ ################################################################################ # highlight.js is BSD-3-Clause -src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css -src/main/resources/assets/highlight.js/9.12.0/highlight.min.js \ No newline at end of file +src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css +src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js \ No newline at end of file diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/LICENSE-highlightjs b/examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/LICENSE-highlightjs similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/LICENSE-highlightjs rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/LICENSE-highlightjs diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css b/examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/highlight.min.js b/examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/highlight.min.js rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/highlight.js/9.12.0/highlight.min.js diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/LICENSE-lato b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/LICENSE-lato similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/LICENSE-lato rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/LICENSE-lato diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Bold.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Bold.ttf similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Bold.ttf rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Bold.ttf diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-BoldItalic.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-BoldItalic.ttf rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-BoldItalic.ttf diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Italic.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Italic.ttf similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Italic.ttf rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Italic.ttf diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Regular.ttf b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Regular.ttf similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Regular.ttf rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato-Regular.ttf diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato.css b/examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato.css similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato.css rename to examples/jewel/TourDeJewel/src/main/assembly/third-party/lato/Lato.css diff --git a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml index 4980778084..3a8da05cc9 100644 --- a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml +++ b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml @@ -33,16 +33,16 @@ </compiler> <js-include-script> - <path-element>../resources/assets/highlight.js/9.12.0/highlight.min.js</path-element> + <path-element>../assembly/third-party/highlight.js/9.12.0/highlight.min.js</path-element> </js-include-script> <js-include-css> - <path-element>../resources/assets/highlight.js/9.12.0/atom-one-dark.min.css</path-element> - <path-element>../resources/assets/lato/Lato.css</path-element> + <path-element>../assembly/third-party/highlight.js/9.12.0/atom-one-dark.min.css</path-element> + <path-element>../assembly/third-party/lato/Lato.css</path-element> </js-include-css> <js-include-asset> - <path-element>../resources/assets/lato/Lato-Regular.ttf</path-element> - <path-element>../resources/assets/lato/Lato-Bold.ttf</path-element> - <path-element>../resources/assets/lato/Lato-Italic.ttf</path-element> - <path-element>../resources/assets/lato/Lato-BoldItalic.ttf</path-element> + <path-element>../assembly/third-party/lato/Lato-Regular.ttf</path-element> + <path-element>../assembly/third-party/lato/Lato-Bold.ttf</path-element> + <path-element>../assembly/third-party/lato/Lato-Italic.ttf</path-element> + <path-element>../assembly/third-party/lato/Lato-BoldItalic.ttf</path-element> </js-include-asset> </royale-config>
