You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/04/22 18:55:28 UTC

[4/4] git commit: [flex-asjs] [refs/heads/develop] - fix install now that things are packaged differently

fix install now that things are packaged differently


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

Branch: refs/heads/develop
Commit: cb294dffc63305694feca96edc8da623eed6ed1f
Parents: c7db491
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 22 09:55:09 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 22 09:55:09 2015 -0700

----------------------------------------------------------------------
 installer.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cb294dff/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 6d49b80..6b73822 100644
--- a/installer.xml
+++ b/installer.xml
@@ -295,7 +295,7 @@
         <fail message="${basedir} is not an FlexJS binary package">
             <condition>
                 <not>
-                    <available file="${basedir}/frameworks/as/libs/FlexJSUI.swc" />
+                    <available file="${basedir}/frameworks/libs/Binding.swc" />
                 </not>
             </condition>
         </fail>
@@ -827,10 +827,10 @@
     
     <target name="fixup-config-files">
         <echo>${INFO_INSTALLING_CONFIG_FILES}</echo>
-        <copy file="${FLEXJS_HOME}/frameworks/as/flex-config-template.xml"
-            tofile="${FLEXJS_HOME}/frameworks/flex-config.xml" />
-        <copy file="${FLEXJS_HOME}/frameworks/as/air-config-template.xml"
-            tofile="${FLEXJS_HOME}/frameworks/air-config.xml" />
+        <copy file="${FLEXJS_HOME}/frameworks/flex-config-template.xml"
+            tofile="${FLEXJS_HOME}/frameworks/flex-config.xml" overwrite="true"/>
+        <copy file="${FLEXJS_HOME}/frameworks/air-config-template.xml"
+            tofile="${FLEXJS_HOME}/frameworks/air-config.xml" overwrite="true"/>
         <replace file="${FLEXJS_HOME}/frameworks/flex-config.xml">
             <replacefilter token="@playerversion@"
                             value="${flash.sdk.version}"/>
@@ -952,7 +952,7 @@
         <mkdir dir="${FLEXJS_HOME}/frameworks/rsls" />
         <mkdir dir="${FLEXJS_HOME}/frameworks/themes/Halo" />
         <mkdir dir="${FLEXJS_HOME}/frameworks/themes/Spark" />
-        <copy file="${FLEXJS_HOME}/frameworks/as/libs/MXMLCClasses.swc"
+        <copy file="${FLEXJS_HOME}/frameworks/libs/MXMLCClasses.swc"
 tofile="${FLEXJS_HOME}/frameworks/themes/Halo/Halo.swc" />
         <touch file="${FLEXJS_HOME}/frameworks/themes/Spark/spark.css" />
         <copy file="${FLEXJS_HOME}/frameworks/air-config.xml"