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 02:16:38 UTC
[royale-asjs] 03/03: try to use variables so repos don't have to be
siblings
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
commit 7dcb10aa023d7612ca56006672fc1f5d69bdd523
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Oct 4 19:16:04 2018 -0700
try to use variables so repos don't have to be siblings
---
build.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.xml b/build.xml
index f82c26a..79bf9ec 100644
--- a/build.xml
+++ b/build.xml
@@ -150,7 +150,7 @@
</target>
<target name="release"
- depends="block-flat-fonts,source-release,binary-release,rat-check"
+ depends="block-flat-fonts,check-compiler-home,check-typedefs-home,source-release,binary-release,rat-check"
description="Creates source and binary kits for Apache Royale."/>
<target name="release-jenkins"
@@ -780,20 +780,20 @@ limitations under the License.
</target>
<target name="stage-compiler" >
- <echo file="${basedir}/../royale-compiler/env.properties">env.ASJS_HOME=${basedir}</echo>
+ <echo file="${ROYALE_COMPILER_REPO}/env.properties">env.ASJS_HOME=${basedir}</echo>
<!-- windows needs backslashes escaped -->
- <replaceregexp file="${basedir}/../royale-compiler/env.properties" match="\\" replace="\\\\\\\\" flags="g" />
- <ant dir="${basedir}/../royale-compiler" target="wipe-all" />
- <ant dir="${basedir}/../royale-compiler" target="stage-all" >
+ <replaceregexp file="${ROYALE_COMPILER_REPO}/env.properties" match="\\" replace="\\\\\\\\" flags="g" />
+ <ant dir="${ROYALE_COMPILER_REPO}" target="wipe-all" />
+ <ant dir="${ROYALE_COMPILER_REPO}" target="stage-all" >
<property name="staging-dir" value="${basedir}/temp/royale-compiler" />
</ant>
</target>
<target name="stage-typedefs" >
- <ant dir="${basedir}/../royale-typedefs" target="wipe" />
+ <ant dir="${ROYALE_TYPEDEFS_HOME}" target="wipe" />
<mkdir dir="${staging-dir}/../royale-typedefs"/>
<copy todir="${staging-dir}/../royale-typedefs" includeEmptyDirs="false" >
- <fileset dir="${basedir}/../royale-typedefs" includes="**" />
+ <fileset dir="${ROYALE_TYPEDEFS_HOME}" includes="**" />
</copy>
</target>