Return-Path: <commits-return-27567-archive-asf-public=cust-asf.ponee.io@flex.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 432E72009A8
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue, 17 May 2016 20:33:40 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 41CA01609F5; Tue, 17 May 2016 18:33:40 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 89B131607A8
	for <archive-asf-public@cust-asf.ponee.io>; Tue, 17 May 2016 20:33:39 +0200 (CEST)
Received: (qmail 8902 invoked by uid 500); 17 May 2016 18:33:38 -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 8894 invoked by uid 99); 17 May 2016 18:33:38 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 May 2016 18:33:38 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 54A43DFB7A; Tue, 17 May 2016 18:33:38 +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
Message-Id: <a2ac3d3d5120478ea097983f0e05c2d2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: [flex-falcon] [refs/heads/develop] - Revert "attempt to
 move externs folder"
Date: Tue, 17 May 2016 18:33:38 +0000 (UTC)
archived-at: Tue, 17 May 2016 18:33:40 -0000

Repository: flex-falcon
Updated Branches:
  refs/heads/develop 088cea00a -> 9ac68e37d


Revert "attempt to move externs folder"

This reverts commit 6bd83ee3747dc60cc3a32190301b8b728dfe7006.


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9ac68e37
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9ac68e37
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9ac68e37

Branch: refs/heads/develop
Commit: 9ac68e37d44ee6ebed84b056456c81bbb36f7f9b
Parents: 088cea0
Author: Alex Harui <aharui@apache.org>
Authored: Tue May 17 11:32:27 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue May 17 11:32:27 2016 -0700

----------------------------------------------------------------------
 build.xml     | 18 +++++++++---------
 installer.xml |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9ac68e37/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6c90bfe..1eae4f3 100644
--- a/build.xml
+++ b/build.xml
@@ -530,15 +530,15 @@
         </copy>
         
         <!-- generated -->
-        <mkdir dir="${basedir}/temp/frameworks/js/libs"/>
-        <copy tofile="${basedir}/temp/frameworks/js/libs/js.swc" file="${basedir}/externs/js/target/js.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/cordova.swc" file="${basedir}/externs/cordova/target/cordova.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/createjs.swc" file="${basedir}/externs/createjs/target/createjs.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/target/google_maps.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/target/jasmine.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/jquery.swc" file="${basedir}/externs/jquery/target/jquery-1.9.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/GCL.swc" file="${basedir}/externs/GCL/target/GCL.swc" />
-        <copy tofile="${basedir}/temp/frameworks/js/libs/node.swc" file="${basedir}/externs/node/target/node.swc" />
+        <mkdir dir="${basedir}/temp/js/libs"/>
+        <copy tofile="${basedir}/temp/js/libs/js.swc" file="${basedir}/externs/js/target/js.swc" />
+        <copy tofile="${basedir}/temp/js/libs/cordova.swc" file="${basedir}/externs/cordova/target/cordova.swc" />
+        <copy tofile="${basedir}/temp/js/libs/createjs.swc" file="${basedir}/externs/createjs/target/createjs.swc" />
+        <copy tofile="${basedir}/temp/js/libs/google_maps.swc" file="${basedir}/externs/google_maps/target/google_maps.swc" />
+        <copy tofile="${basedir}/temp/js/libs/jasmine.swc" file="${basedir}/externs/jasmine/target/jasmine.swc" />
+        <copy tofile="${basedir}/temp/js/libs/jquery.swc" file="${basedir}/externs/jquery/target/jquery-1.9.swc" />
+        <copy tofile="${basedir}/temp/js/libs/GCL.swc" file="${basedir}/externs/GCL/target/GCL.swc" />
+        <copy tofile="${basedir}/temp/js/libs/node.swc" file="${basedir}/externs/node/target/node.swc" />
         
         <!-- generated -->
         <mkdir dir="${basedir}/temp/externs"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9ac68e37/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index ed21d67..b3ed920 100644
--- a/installer.xml
+++ b/installer.xml
@@ -157,14 +157,14 @@
     <target name="copyfiles.jx" if="install.jx" description="copy FalconJX files into SDK" >
         <mkdir dir="${FLEX_HOME}/js/bin" />
         <mkdir dir="${FLEX_HOME}/js/lib" />
-        <mkdir dir="${FLEX_HOME}/frameworks/js/libs" />
+        <mkdir dir="${FLEX_HOME}/js/libs" />
         <copy todir="${FLEX_HOME}/js/lib" failOnError="false" overwrite="true">
             <fileset dir="${FALCON_HOME}/js/lib">
                 <include name="**/**"/>
             </fileset>
         </copy>
-        <copy todir="${FLEX_HOME}/frameworks/js/libs" failOnError="false" overwrite="true">
-            <fileset dir="${FALCON_HOME}/frameworks/js/libs">
+        <copy todir="${FLEX_HOME}/js/libs" failOnError="false" overwrite="true">
+            <fileset dir="${FALCON_HOME}/js/libs">
                 <include name="**/**"/>
             </fileset>
         </copy>