You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/10/05 03:53:35 UTC
[royale-asjs] branch develop updated: more changes to support
non-sibling repos
This is an automated email from the ASF dual-hosted git repository.
aharui 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 083307a more changes to support non-sibling repos
083307a is described below
commit 083307a358175599c85f40f1b67a5296fc3089b0
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Oct 4 20:53:17 2018 -0700
more changes to support non-sibling repos
---
build.xml | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 79bf9ec..1d16510 100644
--- a/build.xml
+++ b/build.xml
@@ -1970,9 +1970,16 @@ limitations under the License.
</target>
<target name="check-royale-compiler">
+ <available file="${ROYALE_COMPILER_REPO}"
+ type="dir"
+ property="royale-compiler-exists"/>
<available file="${base.folder.name}/royale-compiler"
type="dir"
property="royale-compiler-exists"/>
+ <available file="${base.folder.name}/royale-compiler"
+ type="dir"
+ property="ROYALE_COMPILER_REPO"
+ value="${base.folder.name}/royale-compiler"/>
</target>
<target name="clone-royale-compiler" depends="check-royale-compiler" unless="royale-compiler-exists">
@@ -1982,6 +1989,7 @@ limitations under the License.
<arg value="https://github.com/apache/royale-compiler.git" />
<arg value="royale-compiler" />
</exec>
+ <property name="ROYALE_COMPILER_REPO" value="${base.folder.name}/royale-compiler" />
<exec executable="git" failonerror="true" dir="${base.folder.name}/royale-compiler">
<arg value="checkout" />
<arg value="develop" />
@@ -1989,9 +1997,16 @@ limitations under the License.
</target>
<target name="check-royale-typedefs">
+ <available file="${ROYALE_TYPEDEFS_HOME}"
+ type="dir"
+ property="royale-typedefs-exists"/>
<available file="${base.folder.name}/royale-typedefs"
type="dir"
property="royale-typedefs-exists"/>
+ <available file="${base.folder.name}/royale-typedefs"
+ type="dir"
+ property="ROYALE_TYPEDEFS_HOME"
+ value="${base.folder.name}/royale-typedefs"/>
</target>
<target name="clone-royale-typedefs" depends="check-royale-typedefs" unless="royale-typedefs-exists">
@@ -2001,18 +2016,19 @@ limitations under the License.
<arg value="https://github.com/apache/royale-typedefs.git" />
<arg value="royale-typedefs" />
</exec>
+ <property name="ROYALE_TYPEDEFS_HOME" value="${base.folder.name}/royale-typedefs" />
<exec executable="git" failonerror="true" dir="${base.folder.name}/royale-typedefs">
<arg value="checkout" />
<arg value="develop" />
</exec>
</target>
- <target name="build-all" depends="check-playerglobal-home,check-air-home">
+ <target name="build-all" depends="check-playerglobal-home,check-air-home,check-royale-compiler,check-royale-typedefs">
<property name="font.donot.ask" value="set" />
<antcall target="ask-before-build-all" />
<property name="javadoc.zip.uptodate" value="set" /> <!-- javadoc fails on windows? -->
- <ant dir="${base.folder.name}/royale-compiler" />
- <ant dir="${base.folder.name}/royale-typedefs" />
+ <ant dir="${ROYALE_COMPILER_REPO}" />
+ <ant dir="${ROYALE_TYPEDEFS_HOME}" />
</target>
<target name="ask-before-build-all" unless="release.target">
<input