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 57c5f5f This should fix the ant build 57c5f5f is described below commit 57c5f5fe08127e55ac26b05c54e588b2e8653ccc Author: Harbs <ha...@in-tools.com> AuthorDate: Tue Feb 13 13:32:26 2018 +0200 This should fix the ant build I need help with the maven build --- js/build.xml | 23 +++++++++-------------- js/pom.xml | 2 +- js/src/main/config/externc-config.xml | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/js/build.xml b/js/build.xml index 7438a15..32b9ac4 100644 --- a/js/build.xml +++ b/js/build.xml @@ -81,15 +81,16 @@ <target name="download" > <echo>${ROYALE_HOME}</echo> - <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/temp" /> + <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/downloads" /> - <unzip src="${basedir}/target/temp/externs/externs.zip" dest="${basedir}/target/downloads" /> + <copy todir="${basedir}/target/downloads"> + <fileset dir="${basedir}/target/temp/externs" includes="**"/> + </copy> <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" > <param name="srcFile" value="svg.js" /> @@ -146,12 +147,6 @@ </target> <target name="preprocess" depends="download"> - <!-- <exec executable="git" dir="${basedir}/.." failonerror="true"> - <arg value="apply"/> - <arg value="--ignore-whitespace"/> - <arg value="--whitespace=nowarn"/> - <arg value="${basedir}/src/main/patch/js.patch"/> - </exec> --> </target> <target name="externc" > diff --git a/js/pom.xml b/js/pom.xml index 3f173ac..fc4fd57 100644 --- a/js/pom.xml +++ b/js/pom.xml @@ -138,7 +138,7 @@ <include>browser/gecko_*.js</include> <include>browser/webkit_*.js</include> <include>browser/iphone.js</include> - <include>browser/chrome.js</include> + <!-- <include>browser/chrome.js</include> --> <include>browser/flash.js</include> <include>browser/page_visibility.js</include> <include>browser/fileapi.js</include> diff --git a/js/src/main/config/externc-config.xml b/js/src/main/config/externc-config.xml index 7ab7497..82bedb6 100644 --- a/js/src/main/config/externc-config.xml +++ b/js/src/main/config/externc-config.xml @@ -67,7 +67,7 @@ <path-element>../../../target/downloads/browser/whatwg_encoding.js</path-element> - <path-element>../../../target/downloads/browser/chrome.js</path-element> + <!-- <path-element>../../../target/downloads/browser/chrome.js</path-element> --> <!-- path-element>../../../target/downloads/browser/fetchapi.js</path-element>--> <path-element>../../../target/downloads/browser/fileapi.js</path-element> <path-element>../../../target/downloads/browser/flash.js</path-element> -- To stop receiving notification emails like this one, please contact ha...@apache.org.