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 e14fd19 maven-distribution: fix compilation for Moonshine IDE (and
still works for VSCode)
e14fd19 is described below
commit e14fd1936bea613d524e68d5cb552a747f5b78aa
Author: Carlos Rovira <[email protected]>
AuthorDate: Thu Feb 6 00:41:43 2020 +0100
maven-distribution: fix compilation for Moonshine IDE (and still works for
VSCode)
---
distribution/jars/compiler-compjsc/pom.xml | 2 +-
distribution/jars/compiler-mxmljsc/pom.xml | 2 +-
distribution/pom.xml | 37 ++++++++++++++++++++++
.../src/main/assembly/component-royale.xml | 6 +++-
4 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/distribution/jars/compiler-compjsc/pom.xml
b/distribution/jars/compiler-compjsc/pom.xml
index ac9d678..5b5f26f 100644
--- a/distribution/jars/compiler-compjsc/pom.xml
+++ b/distribution/jars/compiler-compjsc/pom.xml
@@ -44,7 +44,7 @@
<mainClass>org.apache.royale.compiler.clients.COMPJSC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>compiler-jx-0.9.7-SNAPSHOT.jar</Class-Path>
+ <Class-Path>jsc.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/jars/compiler-mxmljsc/pom.xml
b/distribution/jars/compiler-mxmljsc/pom.xml
index 96f090a..1f864a5 100644
--- a/distribution/jars/compiler-mxmljsc/pom.xml
+++ b/distribution/jars/compiler-mxmljsc/pom.xml
@@ -44,7 +44,7 @@
<mainClass>org.apache.royale.compiler.clients.MXMLJSC</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>args4j.jar org.json.jar
compiler-jx-0.9.7-SNAPSHOT.jar</Class-Path>
+ <Class-Path>args4j.jar org.json.jar jsc.jar</Class-Path>
</manifestEntries>
</archive>
</configuration>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index c9c0cf1..d748618 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -423,6 +423,43 @@
<version>2.10</version>
<executions>
<execution>
+ <id>copy-compiler-jx</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.royale.compiler</groupId>
+ <artifactId>compiler-jx</artifactId>
+ <version>${royale.compiler.version}</version>
+ <type>jar</type>
+ <destFileName>jsc.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/jsc</outputDirectory>
+ </configuration>
+ </execution>
+ <!-- <execution>
+ <id>copy-compiler-jx</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.royale.compiler</groupId>
+ <artifactId>compiler-jx</artifactId>
+ <version>${royale.compiler.version}</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/jsc</outputDirectory>
+ </configuration>
+ </execution> -->
+ <execution>
<id>unpack-closure-compiler</id>
<phase>process-resources</phase>
<goals>
diff --git a/distribution/src/main/assembly/component-royale.xml
b/distribution/src/main/assembly/component-royale.xml
index 00eb02c..c5a2a56 100644
--- a/distribution/src/main/assembly/component-royale.xml
+++ b/distribution/src/main/assembly/component-royale.xml
@@ -73,7 +73,7 @@ under the License.
<useProjectArtifact>false</useProjectArtifact>
<outputDirectory>js/lib</outputDirectory>
<includes>
- <include>org.apache.royale.compiler:compiler-jx:jar</include>
+ <!-- <include>org.apache.royale.compiler:compiler-jx:jar</include> -->
<include>*:args4j:jar</include>
<include>*:commons-io:*</include>
<include>*:flex-tool-api:*</include>
@@ -237,6 +237,10 @@ under the License.
<outputDirectory>js/lib</outputDirectory>
<destName>compc.jar</destName>
</file>
+ <file>
+ <source>${project.build.directory}/jsc/jsc.jar</source>
+ <outputDirectory>js/lib</outputDirectory>
+ </file>
<!-- Copy the manifests -->
<file>
