try to get rsync to behave
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6624f3c9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6624f3c9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6624f3c9 Branch: refs/heads/develop Commit: 6624f3c9c85de56a53b3a55128b1bf70cd598ed8 Parents: 3a56dbe Author: Alex Harui <[email protected]> Authored: Tue Jan 14 20:21:35 2014 -0800 Committer: Alex Harui <[email protected]> Committed: Wed Jan 15 15:26:47 2014 -0800 ---------------------------------------------------------------------- installer.xml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6624f3c9/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index eb00fa8..7090a18 100644 --- a/installer.xml +++ b/installer.xml @@ -81,6 +81,19 @@ <os family="unix" /> </condition> + <condition property="goog.donot.ask" value="true"> + <isset property="installer" /> + </condition> + <condition property="air.donot.ask" value="true"> + <isset property="installer" /> + </condition> + <condition property="flash.donot.ask" value="true"> + <isset property="installer" /> + </condition> + <condition property="swfobject.donot.ask" value="true"> + <isset property="installer" /> + </condition> + <condition property="java.home" value="${env.JAVA_HOME}" > <and> <available file="${env.JAVA_HOME}" type="dir" /> @@ -402,11 +415,11 @@ </antcall> <antcall target="mac-copy-dir"> <param name="srcdir" value="frameworks/libs/air" /> - <param name="destdir" value="${FLEXJS_HOME}/frameworks/libs/air" /> + <param name="destdir" value="${FLEXJS_HOME}/frameworks/libs" /> </antcall> <antcall target="mac-copy-dir"> <param name="srcdir" value="frameworks/projects/air" /> - <param name="destdir" value="${FLEXJS_HOME}/frameworks/projects/air" /> + <param name="destdir" value="${FLEXJS_HOME}/frameworks/projects" /> </antcall> <antcall target="mac-copy-dir"> <param name="srcdir" value="include" /> @@ -414,7 +427,7 @@ </antcall> <antcall target="mac-copy-dir-if-exists"> <param name="srcdir" value="install/android" /> - <param name="destdir" value="${FLEXJS_HOME}/install/android" /> + <param name="destdir" value="${FLEXJS_HOME}/install" /> </antcall> <antcall target="mac-copy-dir"> <param name="srcdir" value="lib/android" /> @@ -455,7 +468,7 @@ </exec> </target> - <target name="mac-copy-dir" description="copies a directory using exec and cp so that symbolic links are preserved"> + <target name="mac-copy-dir" description="copies a directory using exec and rsync so that symbolic links are preserved"> <exec executable="rsync" dir="${FLEXJS_HOME}"> <arg value="--archive" /> <arg value="--ignore-existing" /> @@ -465,7 +478,7 @@ </exec> </target> - <target name="mac-copy-dir-if-exists" depends="mac-check-exists" if="${srcdir}.exists" description="copies a directory using exec and cp so that symbolic links are preserved"> + <target name="mac-copy-dir-if-exists" depends="mac-check-exists" if="${srcdir}.exists" description="copies a directory using exec and rsync so that symbolic links are preserved"> <exec executable="rsync" dir="${FLEXJS_HOME}"> <arg value="--archive" /> <arg value="--ignore-existing" />
