You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by hi...@apache.org on 2025/03/31 13:13:33 UTC
(royale-asjs) 19/20: Merge branch 'examples/TDJ_localresources' of https://github.com/apache/royale-asjs into examples/TDJ_localresources
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 ed43cd6877650dc96625388e4193d65343449ef8
Merge: adb82f8cdc 00e9288cd2
Author: mjesteve <mj...@iest.com>
AuthorDate: Mon Mar 31 15:10:45 2025 +0200
Merge branch 'examples/TDJ_localresources' of https://github.com/apache/royale-asjs into examples/TDJ_localresources
examples/jewel/TourDeJewel/README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --cc examples/jewel/TourDeJewel/README.md
index 8a5f0d2534,a4d4b5e9e2..c12af85427
--- a/examples/jewel/TourDeJewel/README.md
+++ b/examples/jewel/TourDeJewel/README.md
@@@ -21,18 -21,13 +21,15 @@@
Tour De Jewel is a Component Explorer for Apache Royale Jewel UI Set.
-Jewel is a new UI component set, created with design and responsiveness in mind.
-Apache Royale provides themes to use with Jewel out of the box.
-Jewel themes support up to 12 colors, light/dark, and flat/normal modes.
+Jewel is a new UI component set for JavaScript, created with design and
+responsiveness in mind.
-This App shows all Jewel components and different use cases and is still in development
-as we continue to make it grow and improve.
+Apache Royale provides themes to use with Jewel out of the box. Jewel themes
+support up to 12 colors, light/dark, and flat/normal modes.
+
+This App shows all Jewel components and different use cases and is still in
+development as we continue make it grow and improve.
- This App shows all Jewel components and different use cases and is still in development
- as we continue to make it grow and improve.
-
## Typeface
### **Lato**
@@@ -57,29 -52,3 +54,32 @@@ See our LICENSE file for details
This library is included in our distribution for syntax highlighting.
++<<<<<<< HEAD
+HOW TO BUILD
+
+For convenience, this example includes build scripts, including a pom.xml file
+to build with Maven and a build.xml file to build with Ant.
+
+BUILD WITH MAVEN
+
+To build with Maven, run the following command in the project's root directory
+(which should be the same directory that contains this README file):
+
+ mvn compile
+
+The debug version of the app built with Maven can be found in the
+./target/javascript/bin/js-debug directory, and the optimized release version of
+the app can be found in the ./target/javascript/bin/js-release directory.
+
+BUILD WITH ANT
+
+To build with Ant, run the following command in this project's root directory
+(which should be the same directory that contains this README file):
+
+ ant
+
+The debug version of the app built with Ant can be found in the ./bin/js-debug
+directory, and the optimized release version of the app can be found in the
+./bin/js-release directory.
++=======
++>>>>>>> 00e9288cd243d153057ae975afae84d88a508e89