You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by er...@apache.org on 2017/11/17 14:16:39 UTC
[royale-asjs] branch feature/as2wasm updated: Make build scripts
fetch the jars from the proper location
This is an automated email from the ASF dual-hosted git repository.
erikdebruin pushed a commit to branch feature/as2wasm
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/as2wasm by this push:
new 4b02899 Make build scripts fetch the jars from the proper location
4b02899 is described below
commit 4b0289954c10074ba44aedffcdf35fc723556002
Author: Erik de Bruin <er...@ixsoftware.nl>
AuthorDate: Fri Nov 17 15:16:31 2017 +0100
Make build scripts fetch the jars from the proper location
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
---
as2wasm/dev-build.xml | 42 +++++++++++++++++++++++++++---------------
build.xml | 22 ----------------------
2 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/as2wasm/dev-build.xml b/as2wasm/dev-build.xml
index 3b824e6..41a375c 100644
--- a/as2wasm/dev-build.xml
+++ b/as2wasm/dev-build.xml
@@ -20,20 +20,32 @@
<project name="royale" default="main" basedir=".">
- <target name="main" depends="compiler.jx,as2wasm.jars" description="Full build"/>
-
- <target name="compiler.jx" description="Builds Royale JS Transpiler jars">
- <ant dir="./resources/royale-compiler/compiler-jx">
- <target name="clean" />
- <target name="main" />
- </ant>
- </target>
-
- <target name="as2wasm.jars" description="Copies Royale JS Transpiler jars for 'as2wasm'">
- <ant dir="../">
- <target name="as2wasm-clean" />
- <target name="copy-as2wasm" />
- </ant>
- </target>
+ <property name="compiler.home" value="${basedir}/resources/royale-compiler"/>
+
+ <target name="main" depends="compiler.jx,as2wasm.jars" description="Full build"/>
+
+ <target name="compiler.jx" description="Builds Royale JS Transpiler jars">
+ <ant dir="./resources/royale-compiler/compiler-jx">
+ <target name="clean" />
+ <target name="main" />
+ </ant>
+ </target>
+
+ <target name="as2wasm.jars" description="Copies Royale JS Transpiler jars for 'as2wasm'">
+ <mkdir dir="${basedir}/lib/external" />
+ <echo>Copying 'as2wasm' transpiler and related jars from compiler build dir</echo>
+ <copy file="${compiler.home}/compiler-jx/lib/wastc.jar" tofile="${basedir}/lib/wastc.jar" />
+ <copy file="${compiler.home}/compiler/lib/compiler.jar" tofile="${basedir}/lib/compiler.jar" />
+ <copy todir="${compiler.home}/lib/external">
+ <fileset dir="${basedir}/lib/external">
+ <include name="antlr*" />
+ <include name="commons-cli*" />
+ <include name="commons-io*" />
+ <include name="flex-tool-api*" />
+ <include name="guava*" />
+ <include name="lzma-sdk*" />
+ </fileset>
+ </copy>
+ </target>
</project>
diff --git a/build.xml b/build.xml
index 460db39..9e0bca2 100644
--- a/build.xml
+++ b/build.xml
@@ -427,24 +427,6 @@
<copy file="${ROYALE_COMPILER_REPO}/compiler/lib/compiler-mxmlc.jar" tofile="${basedir}/lib/adt.jar" />
</target>
- <target name="copy-as2wasm" depends="copy-compiler" description="Copy relevant jars for 'as2wasm' to where they are supposed to go">
- <mkdir dir="${basedir}/as2wasm/lib" />
- <echo>Copying 'as2wasm' transpiler and related jars from 'js/lib'</echo>
- <copy file="${basedir}/js/lib/wastc.jar" tofile="${basedir}/as2wasm/lib/wastc.jar" />
- <copy file="${basedir}/lib/compiler.jar" tofile="${basedir}/as2wasm/lib/compiler.jar" />
- <mkdir dir="${basedir}/as2wasm/lib/external" />
- <copy todir="${basedir}/as2wasm/lib/external">
- <fileset dir="${basedir}/lib/external">
- <include name="antlr*" />
- <include name="commons-cli*" />
- <include name="commons-io*" />
- <include name="flex-tool-api*" />
- <include name="guava*" />
- <include name="lzma-sdk*" />
- </fileset>
- </copy>
- </target>
-
<target name="check_jquery" >
<condition property="jquery_exists">
<available file="${basedir}/js/libs/jquery.swc" />
@@ -548,10 +530,6 @@
<delete dir="${basedir}/in/player" failonerror="false" includeEmptyDirs="true"/>
</target>
- <target name="as2wasm-clean">
- <delete dir="${basedir}/as2wasm/lib" failonerror="false" includeEmptyDirs="true"/>
- </target>
-
<!--
Build Examples
-->
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].