flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/spark] - clean build and compile of MX hello world. Will it run?
Date Fri, 17 Jun 2016 19:59:12 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/spark 77148f4ae -> 9d395280f


clean build and compile of MX hello world.  Will it run?


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

Branch: refs/heads/spark
Commit: 9d395280f08db1ba3c413ebb764bc33312cfc5a8
Parents: 77148f4
Author: Alex Harui <aharui@apache.org>
Authored: Fri Jun 17 12:59:03 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Jun 17 12:59:03 2016 -0700

----------------------------------------------------------------------
 frameworks/projects/MX/src/main/config/compile-as-config.xml | 2 ++
 frameworks/projects/MX/src/test/flex/build.xml               | 1 +
 frameworks/projects/MX/src/test/flex/src/TestCompile.mxml    | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d395280/frameworks/projects/MX/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/main/config/compile-as-config.xml b/frameworks/projects/MX/src/main/config/compile-as-config.xml
index 55b8403..7f3365e 100644
--- a/frameworks/projects/MX/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/MX/src/main/config/compile-as-config.xml
@@ -80,6 +80,8 @@
     </compiler>
     
     <include-file>
+        <name>js/out/*</name>
+        <path>../../../../../js/FlexJS/projects/MXJS/target/generated-sources/flexjs/*</path>
     </include-file>
 
     <include-sources>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d395280/frameworks/projects/MX/src/test/flex/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/test/flex/build.xml b/frameworks/projects/MX/src/test/flex/build.xml
index dc226ab..24f38b6 100644
--- a/frameworks/projects/MX/src/test/flex/build.xml
+++ b/frameworks/projects/MX/src/test/flex/build.xml
@@ -27,6 +27,7 @@
     <property file="${FLEXJS_HOME}/build.properties"/>
     <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
     <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
+    <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
     <property name="target.name" value="MX-${release.version}.swc" />
     
 	<condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9d395280/frameworks/projects/MX/src/test/flex/src/TestCompile.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/MX/src/test/flex/src/TestCompile.mxml b/frameworks/projects/MX/src/test/flex/src/TestCompile.mxml
index 7ad8c1b..b9749fd 100644
--- a/frameworks/projects/MX/src/test/flex/src/TestCompile.mxml
+++ b/frameworks/projects/MX/src/test/flex/src/TestCompile.mxml
@@ -38,7 +38,7 @@ limitations under the License.
     </js:valuesImpl>
 	<js:initialView>
 		<js:View>
-			<mx:UIComponent />
+			<mx:Label text="Hello World" />
 		</js:View>
 	</js:initialView>
 </js:Application>


Mime
View raw message