This is an automated email from the ASF dual-hosted git repository. hiedra pushed a commit to branch examples/TDJ_localresources in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit d296ae62671e1b404d5b5e94503bbdbe1e4a9bcc Author: Josh Tynjala <[email protected]> AuthorDate: Wed Mar 26 15:19:53 2025 -0700 TourDeJewel: reorganize assets a bit, fix asconfig.json and Ant build --- examples/jewel/TourDeJewel/asconfig.json | 22 ++++- examples/jewel/TourDeJewel/pom.xml | 11 ++- examples/jewel/TourDeJewel/rat-excludes.txt | 31 +++++-- .../highlight.js/9.12.0/LICENSE-highlightjs.txt | 29 ------- .../src/main/config/compile-app-config.xml | 14 ++++ .../highlight.js/9.12.0/LICENSE-highlightjs} | 0 .../highlight.js/9.12.0}/atom-one-dark.min.css | 0 .../assets}/highlight.js/9.12.0/highlight.min.js | 0 .../src/main/resources/assets/lato/LICENSE-lato | 93 +++++++++++++++++++++ .../src/main/resources/assets/lato/Lato-Bold.ttf | Bin 0 -> 73332 bytes .../main/resources/assets/lato/Lato-BoldItalic.ttf | Bin 0 -> 77732 bytes .../src/main/resources/assets/lato/Lato-Italic.ttf | Bin 0 -> 75792 bytes .../main/resources/assets/lato/Lato-Regular.ttf | Bin 0 -> 75152 bytes .../assets/lato/Lato.css} | 12 +-- examples/jewel/TourDeJewel/src/main/royale/hljs.as | 19 ----- 15 files changed, 159 insertions(+), 72 deletions(-) diff --git a/examples/jewel/TourDeJewel/asconfig.json b/examples/jewel/TourDeJewel/asconfig.json index 314982857e..fb137b2f1e 100644 --- a/examples/jewel/TourDeJewel/asconfig.json +++ b/examples/jewel/TourDeJewel/asconfig.json @@ -1,3 +1,19 @@ +/* + * 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. + */ { "config": "royale", "compilerOptions": { @@ -6,6 +22,9 @@ "source-path": [ "src/main/resources" ], + "load-config": [ + "src/main/config/compile-app-config.xml" + ], "source-map": true, "html-template": "src/main/resources/jewel-example-index-template.html", "theme": "${royalelib}/themes/JewelTheme/src/main/resources/defaults.css" @@ -13,9 +32,6 @@ "copySourcePathAssets": true, "additionalOptions": [ "-js-dynamic-access-unknown-members=true", - "-js-include-script+=src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js", - "-js-include-css+=src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css", - "-js-include-css+=src/main/assembly/css/Lato400_700.css" ], "files": [ diff --git a/examples/jewel/TourDeJewel/pom.xml b/examples/jewel/TourDeJewel/pom.xml index 96ae799acb..d0bbc9cc30 100644 --- a/examples/jewel/TourDeJewel/pom.xml +++ b/examples/jewel/TourDeJewel/pom.xml @@ -959,10 +959,13 @@ -prevent-rename-public-instance-methods=false -source-map=true; - -js-include-script+=${basedir}/src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js; - <!-- Required commit https://github.com/apache/royale-compiler/commit/08160d2639e0bd88c705111d8ee49c4f16396183 --> - -js-include-css+=${basedir}/src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css; - -js-include-css+=${basedir}/src/main/assembly/css/Lato400_700.css; + -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; </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 fa2568754c..3a9e0259c1 100644 --- a/examples/jewel/TourDeJewel/rat-excludes.txt +++ b/examples/jewel/TourDeJewel/rat-excludes.txt @@ -1,9 +1,22 @@ -src/main/assembly/css/highlight.js/9.12.0/styles/LICENSE-highlightjs.txt -src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css -src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js -src/main/assembly/scripts/highlight.js/9.12.0/LICENSE-highlightjs.txt -src/main/resources/assets/fonts/lato/LICENSE-Lato.txt -.vscode/launch.json -.vscode/tasks.json -asconfig.json -rat-excludes.txt \ No newline at end of file +################################################################################ +## +## 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. +## +################################################################################ + +# 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 diff --git a/examples/jewel/TourDeJewel/src/main/assembly/scripts/highlight.js/9.12.0/LICENSE-highlightjs.txt b/examples/jewel/TourDeJewel/src/main/assembly/scripts/highlight.js/9.12.0/LICENSE-highlightjs.txt deleted file mode 100644 index 2250cc7eca..0000000000 --- a/examples/jewel/TourDeJewel/src/main/assembly/scripts/highlight.js/9.12.0/LICENSE-highlightjs.txt +++ /dev/null @@ -1,29 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2006, Ivan Sagalaev. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -* Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 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 ce3103c27d..4980778084 100644 --- a/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml +++ b/examples/jewel/TourDeJewel/src/main/config/compile-app-config.xml @@ -31,4 +31,18 @@ <filename>../../../../../../frameworks/themes/Jewel-Light-NoFlat-Emphasized-Emerald-Theme/src/main/resources/defaults.css</filename> </theme> </compiler> + + <js-include-script> + <path-element>../resources/assets/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> + </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> + </js-include-asset> </royale-config> diff --git a/examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/LICENSE-highlightjs.txt b/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/LICENSE-highlightjs similarity index 100% rename from examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/LICENSE-highlightjs.txt rename to examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/LICENSE-highlightjs diff --git a/examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css b/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css similarity index 100% rename from examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css rename to examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/atom-one-dark.min.css diff --git a/examples/jewel/TourDeJewel/src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js b/examples/jewel/TourDeJewel/src/main/resources/assets/highlight.js/9.12.0/highlight.min.js similarity index 100% rename from examples/jewel/TourDeJewel/src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js rename to examples/jewel/TourDeJewel/src/main/resources/assets/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/resources/assets/lato/LICENSE-lato new file mode 100644 index 0000000000..cb1d5af19a --- /dev/null +++ b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/LICENSE-lato @@ -0,0 +1,93 @@ +Copyright (c) 2010-2014 by tyPoland Lukasz Dziedzic ([email protected]) with Reserved Font Name "Lato" + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Bold.ttf b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Bold.ttf new file mode 100644 index 0000000000..016068b486 Binary files /dev/null and b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Bold.ttf differ diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-BoldItalic.ttf b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-BoldItalic.ttf new file mode 100644 index 0000000000..a05d503205 Binary files /dev/null and b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-BoldItalic.ttf differ diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Italic.ttf b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Italic.ttf new file mode 100644 index 0000000000..0d0f69ea03 Binary files /dev/null and b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Italic.ttf differ diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Regular.ttf b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Regular.ttf new file mode 100644 index 0000000000..bb2e8875a9 Binary files /dev/null and b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato-Regular.ttf differ diff --git a/examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato.css similarity index 95% rename from examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css rename to examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato.css index 9d5b5904b3..4b687ba435 100644 --- a/examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css +++ b/examples/jewel/TourDeJewel/src/main/resources/assets/lato/Lato.css @@ -19,31 +19,27 @@ //////////////////////////////////////////////////////////////////////////////// */ -/* latin-ext */ @font-face { font-family: 'Lato'; font-style: normal; font-weight: 400; src: url(../assets/fonts/lato/Lato-Regular.ttf) format('truetype'); - } -/* latin */ +} @font-face { font-family: 'Lato'; font-style: normal; font-weight: 400; src: url(../assets/fonts/lato/Lato-Italic.ttf) format('truetype'); - } -/* latin-ext */ +} @font-face { font-family: 'Lato'; font-style: normal; font-weight: 700; src: url(../assets/fonts/lato/Lato-Bold.ttf) format('truetype'); - } -/* latin */ +} @font-face { font-family: 'Lato'; font-style: normal; font-weight: 700; src: url(../assets/fonts/lato/Lato-BoldItalic.ttf) format('truetype'); - } +} diff --git a/examples/jewel/TourDeJewel/src/main/royale/hljs.as b/examples/jewel/TourDeJewel/src/main/royale/hljs.as index a30bf04783..7f192f0a40 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/hljs.as +++ b/examples/jewel/TourDeJewel/src/main/royale/hljs.as @@ -24,25 +24,6 @@ package COMPILE::JS public class hljs { - /* - * // <inject_script> - * // Js file included in the compilation, through the option - * // -js-include-script+=src/main/assembly/scripts/highlight.js/9.12.0/highlight.min.js - * // ----------------------------------------------------------------------------------------------------------- - * // var script = document.createElement("script"); - * // script.setAttribute("src", "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js";); - * // document.head.appendChild(script); - * // ----------------------------------------------------------------------------------------------------------- - * // Css file included in the compilation, through the option - * // -js-include-css+=src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css - * // ----------------------------------------------------------------------------------------------------------- - * // var link = document.createElement("link"); - * // link.setAttribute("rel", "stylesheet"); - * // link.setAttribute("type", "text/css"); - * // link.setAttribute("href", "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/atom-one-dark.min.css";); - * // document.head.appendChild(link); - * // </inject_script> - */ public function hljs(){} public static function highlightBlock(block:Element):void {}
