You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2021/02/21 17:51:37 UTC
[royale-asjs] branch develop updated: maven-distribution: final fix
in classpaths to make it work with the new name strategy without version
number. Require latest changes in compiler
This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 4251d94 maven-distribution: final fix in classpaths to make it work with the new name strategy without version number. Require latest changes in compiler
4251d94 is described below
commit 4251d9403d0420bdba56573c961b00f636927bb3
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Feb 21 18:51:26 2021 +0100
maven-distribution: final fix in classpaths to make it work with the new name strategy without version number. Require latest changes in compiler
---
distribution/jars/compiler-asc/pom.xml | 2 +-
distribution/jars/compiler-compc/pom.xml | 2 +-
distribution/jars/compiler-mxmlc/pom.xml | 2 +-
distribution/jars/mxmlc/pom.xml | 2 +-
distribution/pom.xml | 9 ++++-----
distribution/src/main/assembly/component-royale.xml | 4 ++--
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/distribution/jars/compiler-asc/pom.xml b/distribution/jars/compiler-asc/pom.xml
index 7fbe168..9d5daa7 100644
--- a/distribution/jars/compiler-asc/pom.xml
+++ b/distribution/jars/compiler-asc/pom.xml
@@ -45,7 +45,7 @@
<mainClass>org.apache.royale.compiler.clients.ASC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>compc.jar compiler.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+ <Class-Path>compiler-common.jar compiler.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/jars/compiler-compc/pom.xml b/distribution/jars/compiler-compc/pom.xml
index 81bdb63..24a1d78 100644
--- a/distribution/jars/compiler-compc/pom.xml
+++ b/distribution/jars/compiler-compc/pom.xml
@@ -45,7 +45,7 @@
<mainClass>org.apache.royale.compiler.clients.COMPC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+ <Class-Path>compiler-common.jar compiler.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/jars/compiler-mxmlc/pom.xml b/distribution/jars/compiler-mxmlc/pom.xml
index 046124c..139b3d8 100644
--- a/distribution/jars/compiler-mxmlc/pom.xml
+++ b/distribution/jars/compiler-mxmlc/pom.xml
@@ -45,7 +45,7 @@
<mainClass>org.apache.royale.compiler.clients.MXMLC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar mxmlc.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+ <Class-Path>compiler-common.jar compiler.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/jars/mxmlc/pom.xml b/distribution/jars/mxmlc/pom.xml
index c3dc350..98b8132 100644
--- a/distribution/jars/mxmlc/pom.xml
+++ b/distribution/jars/mxmlc/pom.xml
@@ -45,7 +45,7 @@
<mainClass>org.apache.royale.compiler.clients.MXMLC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>compc.jar compiler.jar compiler-asc.jar compiler-common.jar compiler-compc.jar compiler-compjsc.jar compiler-externc.jar compiler-jburg-types.jar compiler-mxmlc.jar compiler-mxmljsc.jar compiler-optimizer.jar compiler-swfdump.jar debugger.jar flex-compiler-oem.jar royale-ant-tasks.jar swfutils.jar</Class-Path>
+ <Class-Path>compiler-common.jar compiler.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 6edf262..889a223 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -398,7 +398,7 @@
<version>${royale.compiler.version}</version>
</dependency>
- <!-- google closure compiler and library will be needed unpacked in js/lib/google -->
+ <!-- google closure compiler and library will be needed packed in js/lib/google -->
<dependency>
<groupId>com.google.javascript</groupId>
<artifactId>closure-compiler</artifactId>
@@ -449,9 +449,9 @@
</execution>
<execution>
<id>unpack-closure-compiler</id>
- <phase>process-resources</phase>
+ <phase>package</phase>
<goals>
- <goal>unpack</goal>
+ <goal>copy</goal>
</goals>
<configuration>
<artifactItems>
@@ -460,8 +460,7 @@
<artifactId>closure-compiler</artifactId>
<version>v20181210</version>
<type>jar</type>
- <outputDirectory>${project.build.directory}/closure-compiler-temp</outputDirectory>
- <includes>**</includes>
+ <destFileName>closure-compiler.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/distribution/src/main/assembly/component-royale.xml b/distribution/src/main/assembly/component-royale.xml
index d310e51..25a7cf3 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -194,13 +194,13 @@ under the License.
</fileSet>
<!-- Copy the unpacked closure-compiler -->
- <fileSet>
+ <!-- <fileSet>
<outputDirectory>js/lib/google/closure-compiler/compiler</outputDirectory>
<directory>target/closure-compiler-temp</directory>
<includes>
<include>**</include>
</includes>
- </fileSet>
+ </fileSet> -->
<!-- Copy all from the parent -->
<!-- <fileSet>
<directory>../js/lib/google/closure-compiler/compiler</directory>