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 82fafb77b8c00ea246f29b2a518ec04a710e9d20 Author: mjesteve <[email protected]> AuthorDate: Wed Mar 12 02:21:09 2025 +0100 TDJ: Files that are self-licensed and ASF-compliant are excluded from RAT scanning. Configure pom.xml and create the rat-excludes.txt file. --- examples/jewel/TourDeJewel/LICENSE | 4 +- examples/jewel/TourDeJewel/asconfig.json | 4 +- examples/jewel/TourDeJewel/pom.xml | 21 ++++- examples/jewel/TourDeJewel/rat-excludes.txt | 9 +++ .../src/main/assembly/css/Lato400_700.css | 49 ++++++++++++ .../9.12.0/styles}/LICENSE-highlightjs.txt | 0 .../9.12.0/styles/atom-one-dark.min.css | 0 .../src/main/resources/assets/css/LICENSE-Lato.txt | 93 ---------------------- .../src/main/resources/assets/css/Lato400_700.css | 42 ---------- .../resources/jewel-example-index-template.html | 1 - examples/jewel/TourDeJewel/src/main/royale/hljs.as | 20 ++--- 11 files changed, 92 insertions(+), 151 deletions(-) diff --git a/examples/jewel/TourDeJewel/LICENSE b/examples/jewel/TourDeJewel/LICENSE index b8d6b38119..67638c922f 100644 --- a/examples/jewel/TourDeJewel/LICENSE +++ b/examples/jewel/TourDeJewel/LICENSE @@ -211,7 +211,7 @@ under separate license terms. The following components are included: 1. **Lato Typeface** - Source: https://fonts.google.com/specimen/Lato - License: SIL Open Font License 1.1 (OFL-1.1) - - License text: See `src\main\resources\assets\css\LICENSE-Lato.txt` + - License text: See `src\main\resources\assets\fonts\lato\LICENSE-Lato.txt` - Lato is included in this distribution as a font resource for styling purposes in examples. It is distributed under the OFL-1.1 license, which permits use, modification, and redistribution under specific conditions. @@ -220,7 +220,7 @@ under separate license terms. The following components are included: 2. **Highlight.js** - Source: https://highlightjs.org/ - License: BSD-3-Clause License - - License text: See `src\main\resources\assets\css\highlight.js\9.12.0\LICENSE-highlightjs.txt` + - License text: See `src\main\assembly\css\highlight.js\9.12.0\LICENSE-highlightjs.txt` - Highlight.js is included for syntax highlighting in examples. The BSD-3-Clause license permits redistribution with proper attribution. For details, refer to the official license text. diff --git a/examples/jewel/TourDeJewel/asconfig.json b/examples/jewel/TourDeJewel/asconfig.json index b75c73ab1d..314982857e 100644 --- a/examples/jewel/TourDeJewel/asconfig.json +++ b/examples/jewel/TourDeJewel/asconfig.json @@ -13,7 +13,9 @@ "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-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 ca61713eb3..1b98904de2 100644 --- a/examples/jewel/TourDeJewel/pom.xml +++ b/examples/jewel/TourDeJewel/pom.xml @@ -16,7 +16,9 @@ See the License for the specific language governing permissions and limitations under the License. ---><project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +--> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> <parent> @@ -947,7 +949,7 @@ <targets>JSRoyale</targets> <debug>false</debug> <htmlTemplate>${basedir}/target/javascript/bin/js-debug/jewel-example-index-template.html</htmlTemplate> - <additionalCompilerOptions> + <additionalCompilerOptions> -js-dynamic-access-unknown-members=true -export-public-symbols=false @@ -958,10 +960,22 @@ -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; </additionalCompilerOptions> <!-- At command line use -Droyalelib=/Users/carlosrovira/Dev/Royale/Sdks/apache-royale-maven/frameworks --> </configuration> </plugin> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <version>0.13</version> + <configuration> + <excludesFile>${project.basedir}/rat-excludes.txt</excludesFile> + </configuration> + </plugin> + </plugins> </build> @@ -1906,4 +1920,5 @@ </profile> </profiles> -<properties /></project> + <properties /> +</project> diff --git a/examples/jewel/TourDeJewel/rat-excludes.txt b/examples/jewel/TourDeJewel/rat-excludes.txt new file mode 100644 index 0000000000..fa2568754c --- /dev/null +++ b/examples/jewel/TourDeJewel/rat-excludes.txt @@ -0,0 +1,9 @@ +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 diff --git a/examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css b/examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css new file mode 100644 index 0000000000..9d5b5904b3 --- /dev/null +++ b/examples/jewel/TourDeJewel/src/main/assembly/css/Lato400_700.css @@ -0,0 +1,49 @@ +/* +//////////////////////////////////////////////////////////////////////////////// +// +// 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. +// +//////////////////////////////////////////////////////////////////////////////// +*/ + +/* 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/resources/assets/css/highlight.js/9.12.0/LICENSE-highlightjs.txt b/examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/LICENSE-highlightjs.txt similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/css/highlight.js/9.12.0/LICENSE-highlightjs.txt rename to examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/LICENSE-highlightjs.txt diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/css/highlight.js/9.12.0/styles/atom-one-dark.min.css b/examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css similarity index 100% rename from examples/jewel/TourDeJewel/src/main/resources/assets/css/highlight.js/9.12.0/styles/atom-one-dark.min.css rename to examples/jewel/TourDeJewel/src/main/assembly/css/highlight.js/9.12.0/styles/atom-one-dark.min.css diff --git a/examples/jewel/TourDeJewel/src/main/resources/assets/css/LICENSE-Lato.txt b/examples/jewel/TourDeJewel/src/main/resources/assets/css/LICENSE-Lato.txt deleted file mode 100644 index cb1d5af19a..0000000000 --- a/examples/jewel/TourDeJewel/src/main/resources/assets/css/LICENSE-Lato.txt +++ /dev/null @@ -1,93 +0,0 @@ -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/css/Lato400_700.css b/examples/jewel/TourDeJewel/src/main/resources/assets/css/Lato400_700.css deleted file mode 100644 index 5153dba044..0000000000 --- a/examples/jewel/TourDeJewel/src/main/resources/assets/css/Lato400_700.css +++ /dev/null @@ -1,42 +0,0 @@ -/* -//////////////////////////////////////////////////////////////////////////////// -// -// Font: Lato -// License: SIL Open Font License (OFL) v1.1 -// Copyright: © 2010-2014 Łukasz Dziedzic -// URL: https://fonts.google.com/specimen/Lato -// License URL: https://scripts.sil.org/OFL -// You are free to use this font for personal and commercial projects, -// but you cannot sell or redistribute it as a standalone product. -// -//////////////////////////////////////////////////////////////////////////////// -*/ - -/* latin-ext */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: url(../fonts/lato/Lato-Regular.ttf) format('truetype'); - } -/* latin */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 400; - src: url(../fonts/lato/Lato-Italic.ttf) format('truetype'); - } -/* latin-ext */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: url(../fonts/lato/Lato-Bold.ttf) format('truetype'); - } -/* latin */ -@font-face { - font-family: 'Lato'; - font-style: normal; - font-weight: 700; - src: url(../fonts/lato/Lato-BoldItalic.ttf) format('truetype'); - } diff --git a/examples/jewel/TourDeJewel/src/main/resources/jewel-example-index-template.html b/examples/jewel/TourDeJewel/src/main/resources/jewel-example-index-template.html index 38a0c40d72..b0a6534ddd 100644 --- a/examples/jewel/TourDeJewel/src/main/resources/jewel-example-index-template.html +++ b/examples/jewel/TourDeJewel/src/main/resources/jewel-example-index-template.html @@ -21,7 +21,6 @@ <meta name="Custom Template for injecting custom style CSS"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <link rel="stylesheet" type="text/css" href="${application}.css"> - <link href="assets/css/Lato400_700.css" rel="stylesheet"> ${head} </head> <body> diff --git a/examples/jewel/TourDeJewel/src/main/royale/hljs.as b/examples/jewel/TourDeJewel/src/main/royale/hljs.as index b7723e32d8..a30bf04783 100644 --- a/examples/jewel/TourDeJewel/src/main/royale/hljs.as +++ b/examples/jewel/TourDeJewel/src/main/royale/hljs.as @@ -24,8 +24,8 @@ package COMPILE::JS public class hljs { - /** - * <inject_script> + /* + * // <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 * // ----------------------------------------------------------------------------------------------------------- @@ -33,13 +33,15 @@ package * // script.setAttribute("src", "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js";); * // document.head.appendChild(script); * // ----------------------------------------------------------------------------------------------------------- - * 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";); - * link.setAttribute("href", "assets/css/highlight.js/9.12.0/styles/atom-one-dark.min.css"); - * document.head.appendChild(link); - * </inject_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(){}
