This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-typedefs.git
The following commit(s) were added to refs/heads/develop by this push:
new c346b3e Hopefully this fixes things
c346b3e is described below
commit c346b3e1ee2a3a4ec1aaa69e7a5a868e94805c45
Author: Harbs <ha...@in-tools.com>
AuthorDate: Wed Feb 14 10:37:53 2018 +0200
Hopefully this fixes things
---
js/build.xml | 79 ++++++++++++++++++++++++++++---------------
js/pom.xml | 108 +++++++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 139 insertions(+), 48 deletions(-)
diff --git a/js/build.xml b/js/build.xml
index b763bf7..f32d27a 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -81,35 +81,60 @@
<target name="download" >
<echo>${ROYALE_HOME}</echo>
- <mkdir dir="${basedir}/target/temp" />
- <exec executable="git" failonerror="false"
dir="${basedir}/target/temp/">
- <arg value="clone" />
- <arg value="https://github.com/royale-extras/closure-compiler.git";
/>
- <arg value="closure-compiler" />
- </exec>
- <exec executable="git" failonerror="false"
dir="${basedir}/target/temp/closure-compiler">
- <arg value="checkout" />
- <arg value="royale" />
- </exec>
- <exec executable="git" failonerror="false"
dir="${basedir}/target/temp/closure-compiler">
- <arg value="pull" />
- </exec>
- <!-- <exec executable="svn">
- <arg value="co" />
- <arg
value="https://github.com/royale-extras/closure-compiler/branches/royale/externs";
/>
- <arg value="${basedir}/target/temp/externs" />
- </exec> -->
+ <mkdir dir="${basedir}/target/temp/externs" />
+ <unjar
src="${ROYALE_TRANSPILER_HOME}/lib/google/closure-compiler/compiler.jar"
+ dest="${basedir}/target/temp/externs">
+ <patternset>
+ <include name="externs.zip"/>
+ </patternset>
+ </unjar>
<mkdir dir="${basedir}/target/downloads" />
- <copy todir="${basedir}/target/downloads">
- <fileset dir="${basedir}/target/temp/closure-compiler/externs"
includes="**"/>
- </copy>
- <copy
file="${basedir}/target/temp/closure-compiler/contrib/externs/svg.js"
tofile="${basedir}/target/downloads/svg.js" />
- <!-- <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/svg.js";
dest="${basedir}/target/downloads/svg.js" ignoreerrors="true"/> -->
- <!-- <antcall target="get-from-cache-if-needed" >
+ <unzip src="${basedir}/target/temp/externs/externs.zip"
dest="${basedir}/target/downloads">
+ <patternset>
+ <include name="**/*.js"/>
+ <exclude name="**/es3.js"/>
+ <exclude name="**/es6.js"/>
+ <exclude name="**/w3c_css.js"/>
+ <exclude name="**/gecko_dom.js"/>
+ <exclude name="**/w3c_dom2.js"/>
+ </patternset>
+ </unzip>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/svg.js";
dest="${basedir}/target/downloads/svg.js" ignoreerrors="true"
skipexisting="true"/>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es3.js";
dest="${basedir}/target/downloads/es3.js" ignoreerrors="true"
skipexisting="true"/>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es6.js";
dest="${basedir}/target/downloads/es6.js" ignoreerrors="true"
skipexisting="true"/>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/w3c_css.js";
dest="${basedir}/target/downloads/browser/w3c_css.js" ignoreerrors="true"
skipexisting="true"/>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/gecko_dom.js";
dest="${basedir}/target/downloads/browser/gecko_dom.js" ignoreerrors="true"
skipexisting="true"/>
+ <get
src="https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/browser/w3c_dom2.js";
dest="${basedir}/target/downloads/browser/w3c_dom2.js" ignoreerrors="true"
skipexisting="true"/>
+ <antcall target="get-from-cache-if-needed" >
<param name="srcFile" value="svg.js" />
<param name="destFile" value="svg.js" />
<param name="destDir" value="${basedir}/target/downloads" />
- </antcall> -->
+ </antcall>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="srcFile" value="es3.js" />
+ <param name="destFile" value="es3.js" />
+ <param name="destDir" value="${basedir}/target/downloads" />
+ </antcall>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="srcFile" value="es6.js" />
+ <param name="destFile" value="es6.js" />
+ <param name="destDir" value="${basedir}/target/downloads" />
+ </antcall>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="srcFile" value="w3c_css.js" />
+ <param name="destFile" value="w3c_css.js" />
+ <param name="destDir" value="${basedir}/target/downloads/browser"
/>
+ </antcall>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="srcFile" value="gecko_dom.js" />
+ <param name="destFile" value="gecko_dom.js" />
+ <param name="destDir" value="${basedir}/target/downloads/browser"
/>
+ </antcall>
+ <antcall target="get-from-cache-if-needed" >
+ <param name="srcFile" value="w3c_dom2.js" />
+ <param name="destFile" value="w3c_dom2.js" />
+ <param name="destDir" value="${basedir}/target/downloads/browser"
/>
+ </antcall>
<antcall target="fail-if-not-found" >
<param name="destFile" value="svg.js" />
<param name="destDir" value="${basedir}/target/downloads" />
@@ -117,10 +142,10 @@
</target>
<target name="make_patch" depends="download">
- <!-- <mkdir dir="${basedir}/target/reference" />
+ <mkdir dir="${basedir}/target/reference" />
<copy todir="${basedir}/target/reference">
<fileset dir="${basedir}/target/downloads/" />
- </copy> -->
+ </copy>
<!-- preprocessing .js files -->
<!-- <replaceregexp file="${basedir}/target/downloads/svg.js"
match="@type \{function\(new:.*" replace="" flags="g" />
<replaceregexp file="${basedir}/target/downloads/svg.js"
match="Window\.prototype\..*" replace="" flags="g" />
diff --git a/js/pom.xml b/js/pom.xml
index fc4fd57..e7388b0 100644
--- a/js/pom.xml
+++ b/js/pom.xml
@@ -35,27 +35,6 @@
<build>
<sourceDirectory>src/main/royale</sourceDirectory>
<plugins>
- <!-- Download JavaScript form GitHub -->
- <plugin>
- <groupId>com.googlecode.maven-download-plugin</groupId>
- <artifactId>download-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>get-createjs</id>
- <phase>validate</phase>
- <goals>
- <goal>wget</goal>
- </goals>
- <configuration>
-
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/svg.js</url>
- <outputFileName>svg.js</outputFileName>
-
<outputDirectory>${project.build.directory}/downloads</outputDirectory>
- <skipCache>true</skipCache>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.royale.compiler</groupId>
<artifactId>compiler-build-tools</artifactId>
@@ -84,6 +63,93 @@
</dependency>
</dependencies>
</plugin>
+ <!-- Download JavaScript from GitHub -->
+ <plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>get-svg</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/svg.js</url>
+ <outputFileName>svg.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-es3</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es3.js</url>
+ <outputFileName>es3.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-es6</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/externs/es6.js</url>
+ <outputFileName>es6.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-w3c_css</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/browser/w3c_css.js</url>
+ <outputFileName>w3c_css.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads/browser</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-gecko_dom</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/browser/gecko_dom.js</url>
+ <outputFileName>gecko_dom.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads/browser</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ <execution>
+ <id>get-w3c_dom2</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>wget</goal>
+ </goals>
+ <configuration>
+
<url>https://raw.githubusercontent.com/royale-extras/closure-compiler/royale/contrib/externs/browser/w3c_dom2.js</url>
+ <outputFileName>w3c_dom2.js</outputFileName>
+
<outputDirectory>${project.build.directory}/downloads/browser</outputDirectory>
+ <skipCache>true</skipCache>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
--
To stop receiving notification emails like this one, please contact
ha...@apache.org.
