Return-Path: 
 <commits-return-9053-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B45601091D
	for <apmail-flex-commits-archive@www.apache.org>;
 Wed, 15 Jan 2014 23:27:08 +0000 (UTC)
Received: (qmail 39770 invoked by uid 500); 15 Jan 2014 23:27:06 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 39649 invoked by uid 500); 15 Jan 2014 23:27:05 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 39634 invoked by uid 99); 15 Jan 2014 23:27:05 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Jan 2014 23:27:05 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 44DED834A89; Wed, 15 Jan 2014 23:27:05 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Wed, 15 Jan 2014 23:27:06 -0000
Message-Id: <53ae4e25043c48b08d06d1ef2bd70886@git.apache.org>
In-Reply-To: <05546125b5144b338a757d255388ee3b@git.apache.org>
References: <05546125b5144b338a757d255388ee3b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/4] git commit: [flex-asjs] [refs/heads/develop] - try to get rsync
 to behave

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 <aharui@apache.org>
Authored: Tue Jan 14 20:21:35 2014 -0800
Committer: Alex Harui <aharui@apache.org>
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" />