You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2020/10/09 00:36:01 UTC
[royale-asjs] branch develop updated: Fix some inconsistencies
between ant and maven for MXRoyale and SparkRoyale -some others still
remain, but this addresses namespace issues with SparkRoyale in particular
This is an automated email from the ASF dual-hosted git repository.
gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 757a3a2 Fix some inconsistencies between ant and maven for MXRoyale and SparkRoyale -some others still remain, but this addresses namespace issues with SparkRoyale in particular
757a3a2 is described below
commit 757a3a200d26e2df89f962a8393f7c1d1460b927
Author: greg-dove <gr...@gmail.com>
AuthorDate: Fri Oct 9 13:32:25 2020 +1300
Fix some inconsistencies between ant and maven for MXRoyale and SparkRoyale
-some others still remain, but this addresses namespace issues with SparkRoyale in particular
---
frameworks/projects/MXRoyale/pom.xml | 33 +++++++++++++++++++++
frameworks/projects/SparkRoyale/pom.xml | 9 +++++-
frameworks/projects/pom.xml | 51 +++++++++++++++++++--------------
3 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/frameworks/projects/MXRoyale/pom.xml b/frameworks/projects/MXRoyale/pom.xml
index 43f912c..761a728 100644
--- a/frameworks/projects/MXRoyale/pom.xml
+++ b/frameworks/projects/MXRoyale/pom.xml
@@ -54,6 +54,38 @@
<name>defaults.css</name>
<path>../src/main/resources/defaults.css</path>
</include-file>
+ <include-file>
+ <name>assets/icon_align_center.png</name>
+ <path>../src/main/resources/assets/icon_align_center.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_justify.png</name>
+ <path>../src/main/resources/assets/icon_align_justify.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_left.png</name>
+ <path>../src/main/resources/assets/icon_align_left.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_align_right.png</name>
+ <path>../src/main/resources/assets/icon_align_right.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_bullet.png</name>
+ <path>../src/main/resources/assets/icon_bullet.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_bold.png</name>
+ <path>../src/main/resources/assets/icon_style_bold.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_italic.png</name>
+ <path>../src/main/resources/assets/icon_style_italic.png</path>
+ </include-file>
+ <include-file>
+ <name>assets/icon_style_underline.png</name>
+ <path>../src/main/resources/assets/icon_style_underline.png</path>
+ </include-file>
</includeFiles>
<skipExtern>true</skipExtern>
<skipAS>${royale.skipAS}</skipAS>
@@ -72,6 +104,7 @@
</define>
</defines>
<allowSubclassOverrides>true</allowSubclassOverrides>
+ <includeLookupOnly>true</includeLookupOnly>
<additionalCompilerOptions>
${project.compiler.options};
-js-compiler-define=COMPILE::JS,true;
diff --git a/frameworks/projects/SparkRoyale/pom.xml b/frameworks/projects/SparkRoyale/pom.xml
index c96b7e4..ce56c4d 100644
--- a/frameworks/projects/SparkRoyale/pom.xml
+++ b/frameworks/projects/SparkRoyale/pom.xml
@@ -64,7 +64,14 @@
</define>
</defines>
<allowSubclassOverrides>true</allowSubclassOverrides>
- <additionalCompilerOptions>${project.compiler.options};-js-compiler-define=COMPILE::JS,true;-js-compiler-define=COMPILE::SWF,false;-js-compiler-define=GOOG::DEBUG,goog.DEBUG</additionalCompilerOptions>
+ <includeLookupOnly>true</includeLookupOnly>
+ <additionalCompilerOptions>
+ ${project.compiler.options};
+ -keep-as3-metadata+=SkinPart;
+ -js-compiler-define=COMPILE::JS,true;
+ -js-compiler-define=COMPILE::SWF,false;
+ -js-compiler-define=GOOG::DEBUG,goog.DEBUG;
+ </additionalCompilerOptions>
</configuration>
</plugin>
</plugins>
diff --git a/frameworks/projects/pom.xml b/frameworks/projects/pom.xml
index 6eee814..2b6f7b1 100644
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
+<!--
+
+ 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.
+
--><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>
@@ -30,7 +30,14 @@
<packaging>pom</packaging>
<properties>
- <project.compiler.options>${repo.compiler.options};-js-default-initializers=false;-source-map=${source.map};-js-complex-implicit-coercions=false;-js-vector-index-checks=false;-js-resolve-uncertain=false</project.compiler.options>
+ <project.compiler.options>
+ ${repo.compiler.options};
+ -js-default-initializers=false;
+ -source-map=${source.map};
+ -js-complex-implicit-coercions=false;
+ -js-vector-index-checks=false;
+ -js-resolve-uncertain=false;
+ </project.compiler.options>
</properties>
<name>Apache Royale: Framework: Libs</name>
@@ -97,10 +104,10 @@
<type>swc</type>
<classifier>typedefs</classifier>
</dependency>
- <!--
- By declaring this dependency here, we force the royale-externs-js to be
- added to the external library path of all modules. Without this it would
- have gone to the library path.
+ <!--
+ By declaring this dependency here, we force the royale-externs-js to be
+ added to the external library path of all modules. Without this it would
+ have gone to the library path.
-->
<dependency>
<groupId>org.apache.royale.typedefs</groupId>