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 2020/01/22 00:58:08 UTC
[royale-asjs] branch develop updated: [asjs] maven-distribution: if
we have GOOG_HOME, new maven distribution does not work,
so we need to unpack closure-compiler and closure-library in js/lib/google
to make it wotk without that env var. Note: There's no maven artifact for
closure-library v20180910, next one is 0.0-20190213-2033d5d9,
so we need to use that for maven.
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 baf5416 [asjs] maven-distribution: if we have GOOG_HOME, new maven distribution does not work, so we need to unpack closure-compiler and closure-library in js/lib/google to make it wotk without that env var. Note: There's no maven artifact for closure-library v20180910, next one is 0.0-20190213-2033d5d9, so we need to use that for maven.
baf5416 is described below
commit baf5416d5af5addb17d9545a6b147e2c458f90cd
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Jan 22 01:57:57 2020 +0100
[asjs] maven-distribution: if we have GOOG_HOME, new maven distribution does not work, so we need to unpack closure-compiler and closure-library in js/lib/google to make it wotk without that env var. Note: There's no maven artifact for closure-library v20180910, next one is 0.0-20190213-2033d5d9, so we need to use that for maven.
---
distribution/pom.xml | 55 +++++++++++++++++++++++++++-
distribution/src/main/assembly/component.xml | 34 +++++++++++++++++
2 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 0adb040..851082c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -552,6 +552,18 @@
<artifactId>compiler-swfdump</artifactId>
<version>0.9.7-SNAPSHOT</version>
</dependency>
+
+ <!-- google closure compiler and library will be needed unpacked in js/lib/google -->
+ <dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>v20181210</version>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>google-closure-library</artifactId>
+ <version>0.0-20190213-2033d5d9</version>
+ </dependency>
</dependencies>
<build>
@@ -590,6 +602,44 @@
</artifactItems>
</configuration>
</execution>
+ <execution>
+ <id>unpack-closure-ompiler</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>v20181210</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/closure-compiler-temp</outputDirectory>
+ <includes>**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-closure-library</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.clojure</groupId>
+ <artifactId>google-closure-library</artifactId>
+ <version>0.0-20190213-2033d5d9</version>
+ <type>jar</type>
+ <outputDirectory>${project.build.directory}/closure-library-temp</outputDirectory>
+ <includes>**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -724,7 +774,8 @@
</dependencies>
<build>
<plugins>
- <plugin>
+ <!-- Not clean since this removes unpacked closure-library from temp folder and prevents the copy to js/lib/google folder -->
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<executions>
@@ -744,7 +795,7 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
diff --git a/distribution/src/main/assembly/component.xml b/distribution/src/main/assembly/component.xml
index b21d76a..b12e7b4 100644
--- a/distribution/src/main/assembly/component.xml
+++ b/distribution/src/main/assembly/component.xml
@@ -182,6 +182,40 @@ under the License.
<filtered>true</filtered>
</fileSet>
+ <!-- Copy the unpacked closure-compiler -->
+ <fileSet>
+ <outputDirectory>js/lib/google/closure-compiler/compiler</outputDirectory>
+ <directory>target/closure-compiler-temp</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ <!-- Copy all from the parent -->
+ <!-- <fileSet>
+ <directory>../js/lib/google/closure-compiler/compiler</directory>
+ <outputDirectory>js/lib/google/closure-compiler/compiler</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet> -->
+
+ <!-- Copy the unpacked closure-library -->
+ <fileSet>
+ <outputDirectory>js/lib/google/closure-library/closure</outputDirectory>
+ <directory>target/closure-library-temp</directory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet>
+ <!-- Copy all from the parent -->
+ <!-- <fileSet>
+ <directory>../js/lib/google/closure-library/closure</directory>
+ <outputDirectory>js/lib/google/closure-library/closure</outputDirectory>
+ <includes>
+ <include>**</include>
+ </includes>
+ </fileSet> -->
+
<!-- Copy the SWFObject templates -->
<fileSet>
<outputDirectory>templates/swfobject</outputDirectory>