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 2014/04/08 23:02:22 UTC

git commit: [flex-asjs] [refs/heads/develop] - fix js build

Repository: flex-asjs
Updated Branches:
  refs/heads/develop 7028bd9cc -> 0857885d7


fix js build


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

Branch: refs/heads/develop
Commit: 0857885d7fc8610f4c229411e590967b7c69b7df
Parents: 7028bd9
Author: Alex Harui <ah...@apache.org>
Authored: Tue Apr 8 14:02:11 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Apr 8 14:02:11 2014 -0700

----------------------------------------------------------------------
 frameworks/js/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0857885d/frameworks/js/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/build.xml b/frameworks/js/build.xml
index 2a9a51d..49e1259 100644
--- a/frameworks/js/build.xml
+++ b/frameworks/js/build.xml
@@ -59,6 +59,7 @@
     <property environment="env"/>
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}" />
+    <property name="FLEX_HOME" value="${env.FLEX_HOME}" />
  
     <target name="main" depends="check-compile-env,clean,prepare,compile" 
         description="Clean build of all SWCs"/>
@@ -102,7 +103,6 @@
 	
     <target name="flexjsjx" >
         <echo message="Compiling libs/FlexJSJX.swc"/>
-        <echo message="FLEX_HOME: ${FLEX_HOME}"/>
         <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/>
         <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
         <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" >
@@ -110,7 +110,7 @@
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
             <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" />
             <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" />
-            <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+            <arg value="+flexlib=${FLEX_HOME}/frameworks" />
             <arg value="-js-output-type=FLEXJS" />
             <arg value="-output=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
             <arg value="-load-config=${FLEXJS_HOME}/frameworks/as/projects/FlexJSJX/compile-config.xml" />