flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/3] git commit: [flex-falcon] [refs/heads/develop] - attempt to move externs folder
Date Thu, 12 May 2016 16:19:40 GMT
attempt to move externs folder


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

Branch: refs/heads/develop
Commit: 6bd83ee3747dc60cc3a32190301b8b728dfe7006
Parents: c6b4e74
Author: Alex Harui <aharui@apache.org>
Authored: Thu May 12 08:39:01 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Thu May 12 08:39:31 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/6bd83ee3/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1eae4f3..6c90bfe 100644
--- a/build.xml
+++ b/build.xml
@@ -530,15 +530,15 @@
         </copy>
         
         <!-- generated -->
-        <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"
/>
+        <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"
/>
         
         <!-- generated -->
         <mkdir dir="${basedir}/temp/externs"/>

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/6bd83ee3/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index b3ed920..ed21d67 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}/js/libs" />
+        <mkdir dir="${FLEX_HOME}/frameworks/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}/js/libs" failOnError="false" overwrite="true">
-            <fileset dir="${FALCON_HOME}/js/libs">
+        <copy todir="${FLEX_HOME}/frameworks/js/libs" failOnError="false" overwrite="true">
+            <fileset dir="${FALCON_HOME}/frameworks/js/libs">
                 <include name="**/**"/>
             </fileset>
         </copy>


Mime
View raw message