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/12/17 07:33:19 UTC
[1/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - move HTML
test from asjs to as
Repository: flex-asjs
Updated Branches:
refs/heads/core_js_to_as 6a71b8584 -> 93a57d0d7
move HTML test from asjs to as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/653c047a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/653c047a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/653c047a
Branch: refs/heads/core_js_to_as
Commit: 653c047aa9703d87a5fefdbf6fb02b4d3000f762
Parents: 6a71b85
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 14:40:46 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 14:40:46 2015 -0800
----------------------------------------------------------------------
.../as/tests/FlexUnitFlexJSApplication.mxml | 46 ++++++
frameworks/projects/HTML/as/tests/build.xml | 160 +++++++++++++++++++
.../tests/flexUnitTests/DataGridColumnTester.as | 27 ++++
.../flexUnitTests/DataGridColumnTesterTest.as | 55 +++++++
.../asjs/tests/FlexUnitFlexJSApplication.mxml | 46 ------
frameworks/projects/HTML/asjs/tests/build.xml | 160 -------------------
.../tests/flexUnitTests/DataGridColumnTester.as | 27 ----
.../flexUnitTests/DataGridColumnTesterTest.as | 55 -------
frameworks/projects/HTML/build.xml | 2 +-
9 files changed, 289 insertions(+), 289 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/as/tests/FlexUnitFlexJSApplication.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/tests/FlexUnitFlexJSApplication.mxml b/frameworks/projects/HTML/as/tests/FlexUnitFlexJSApplication.mxml
new file mode 100644
index 0000000..06ad1d6
--- /dev/null
+++ b/frameworks/projects/HTML/as/tests/FlexUnitFlexJSApplication.mxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+-->
+
+<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:js="library://ns.apache.org/flexjs/basic"
+ applicationComplete="runTests()"
+ >
+ <fx:Script>
+ <![CDATA[
+ import flexUnitTests.DataGridColumnTesterTest;
+ import flexUnitTests.DataGridColumnTester;
+
+ import org.flexunit.listeners.CIListener;
+ import org.flexunit.runner.FlexUnitCore;
+
+ public function runTests() : void
+ {
+ var core : FlexUnitCore = new FlexUnitCore();
+ core.addListener(new CIListener());
+ core.run(DataGridColumnTester);
+ }
+
+ ]]>
+ </fx:Script>
+ <js:valuesImpl>
+ <js:SimpleValuesImpl />
+ </js:valuesImpl>
+
+</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/as/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/tests/build.xml b/frameworks/projects/HTML/as/tests/build.xml
new file mode 100644
index 0000000..4951b51
--- /dev/null
+++ b/frameworks/projects/HTML/as/tests/build.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+
+
+<project name="flexjsjx.test" default="main" basedir=".">
+ <property name="FLEXJS_HOME" location="../../../../.."/>
+
+ <property file="${FLEXJS_HOME}/env.properties"/>
+ <property environment="env"/>
+ <property file="${FLEXJS_HOME}/build.properties"/>
+ <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
+ <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
+
+ <condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
+ <os family="windows"/>
+ </condition>
+ <condition property="browser" value="/Applications/Safari.app/Contents/MacOS/Safari">
+ <os family="mac"/>
+ </condition>
+
+ <property name="report.dir" value="${basedir}/out" />
+
+ <available file="${FLEXJS_HOME}/../flex-flexunit"
+ type="dir"
+ property="FLEXUNIT_HOME"
+ value="${FLEXJS_HOME}/../flex-flexunit" />
+
+ <available file="${FLEXJS_HOME}/../flexunit"
+ type="dir"
+ property="FLEXUNIT_HOME"
+ value="${FLEXJS_HOME}/../flexunit" />
+
+ <available file="${env.FLEXUNIT_HOME}"
+ type="dir"
+ property="FLEXUNIT_HOME"
+ value="${env.FLEXUNIT_HOME}"/>
+
+ <available file="${FLEXUNIT_HOME}/FlexUnit4/target"
+ type="dir"
+ property="FLEXUNIT_LIBPATH1"
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" />
+ <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit" />
+
+ <available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target"
+ type="dir"
+ property="FLEXUNIT_LIBPATH2"
+ value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
+ <property name="FLEXUNIT_LIBPATH2" value="-define=CONFIG::dummy,false" />
+
+ <available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
+ type="dir"
+ property="FLEXUNIT_CLASSPATH"
+ value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" />
+ <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" />
+
+ <target name="main" depends="clean,compile,test" description="Clean test of FlexJSUI.swc">
+ </target>
+
+ <target name="clean">
+ <delete failonerror="false">
+ <fileset dir="${basedir}">
+ <include name="FlexUnitFlexJSApplication.swf"/>
+ </fileset>
+ </delete>
+ </target>
+
+ <path id="lib.path">
+ <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ </path>
+
+ <target name="compile" description="Compiles FlexUnitApplication.swf">
+ <echo message="Compiling FlexUnitFlexJSApplication.swf"/>
+ <echo message="FLEX_HOME: ${FLEX_HOME}"/>
+ <echo message="FALCON_HOME: ${FALCON_HOME}"/>
+ <echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
+ <echo message="playerglobal.version: ${playerglobal.version}"/>
+
+ <!-- Load the <compc> task. We can't do this at the <project> level -->
+ <!-- because targets that run before flexTasks.jar gets built would fail. -->
+ <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
+ <!--
+ Link in the classes (and their dependencies) for the MXML tags
+ listed in this project's manifest.xml.
+ Also link the additional classes (and their dependencies)
+ listed in FlexJSUIClasses.as,
+ because these aren't referenced by the manifest classes.
+ Keep the standard metadata when compiling.
+ Include the appropriate CSS files and assets in the SWC.
+ Don't include any resources in the SWC.
+ Write a bundle list of referenced resource bundles
+ into the file bundles.properties in this directory.
+ -->
+ <mxmlc fork="true"
+ file="${basedir}/FlexUnitFlexJSApplication.mxml"
+ output="${basedir}/FlexUnitFlexJSApplication.swf">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="-debug" />
+ <arg value="-compiler.mxml.children-as-data" />
+ <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
+ <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" />
+ <arg value="-compiler.binding-value-change-event-type=valueChange" />
+ <arg value="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/as/src" />
+ <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" />
+ <arg value="${FLEXUNIT_LIBPATH1}" />
+ <arg value="${FLEXUNIT_LIBPATH2}" />
+ </mxmlc>
+ </target>
+
+ <target name="test">
+ <taskdef resource="flexUnitTasks.tasks">
+ <classpath>
+ <fileset dir="${FLEXUNIT_CLASSPATH}">
+ <include name="flexUnitTasks*.jar" />
+ </fileset>
+ </classpath>
+ </taskdef>
+ <mkdir dir="${report.dir}" />
+ <flexunit
+ swf="${basedir}/FlexUnitFlexJSApplication.swf"
+ workingDir="${basedir}"
+ toDir="${report.dir}"
+ haltonfailure="false"
+ verbose="true"
+ localTrusted="true"
+ command="${browser}"
+ timeout="90000">
+ <source dir="${FLEXJS_HOME}/frameworks/projects/HTML/as/src" />
+ <library dir="${FLEXJS_HOME}/frameworks/libs" />
+ </flexunit>
+
+ <!-- Generate readable JUnit-style reports -->
+ <junitreport todir="${report.dir}">
+ <fileset dir="${report.dir}">
+ <include name="TEST-*.xml" />
+ </fileset>
+ <report format="frames" todir="${report.dir}/html" />
+ </junitreport>
+
+ </target>
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTester.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTester.as b/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTester.as
new file mode 100644
index 0000000..e060b1f
--- /dev/null
+++ b/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTester.as
@@ -0,0 +1,27 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package flexUnitTests
+{
+ [Suite]
+ [RunWith("org.flexunit.runners.Suite")]
+ public class DataGridColumnTester
+ {
+ public var dataGridColumnTesterTest:DataGridColumnTesterTest;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTesterTest.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTesterTest.as b/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTesterTest.as
new file mode 100644
index 0000000..1a3cc0f
--- /dev/null
+++ b/frameworks/projects/HTML/as/tests/flexUnitTests/DataGridColumnTesterTest.as
@@ -0,0 +1,55 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package flexUnitTests
+{
+ import flexunit.framework.Assert;
+
+ import org.apache.flex.html.supportClasses.DataGridColumn;
+
+ public class DataGridColumnTesterTest
+ {
+ [Before]
+ public function setUp():void
+ {
+ }
+
+ [After]
+ public function tearDown():void
+ {
+ }
+
+ [BeforeClass]
+ public static function setUpBeforeClass():void
+ {
+ }
+
+ [AfterClass]
+ public static function tearDownAfterClass():void
+ {
+ }
+
+ [Test]
+ public function testLabelProperty():void
+ {
+ var column:DataGridColumn = new DataGridColumn();
+ column.label = "foo";
+ Assert.assertEquals("Error testing DataGridColumn.label", column.label, "foo");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/asjs/tests/FlexUnitFlexJSApplication.mxml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/tests/FlexUnitFlexJSApplication.mxml b/frameworks/projects/HTML/asjs/tests/FlexUnitFlexJSApplication.mxml
deleted file mode 100644
index 06ad1d6..0000000
--- a/frameworks/projects/HTML/asjs/tests/FlexUnitFlexJSApplication.mxml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
--->
-
-<js:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:js="library://ns.apache.org/flexjs/basic"
- applicationComplete="runTests()"
- >
- <fx:Script>
- <![CDATA[
- import flexUnitTests.DataGridColumnTesterTest;
- import flexUnitTests.DataGridColumnTester;
-
- import org.flexunit.listeners.CIListener;
- import org.flexunit.runner.FlexUnitCore;
-
- public function runTests() : void
- {
- var core : FlexUnitCore = new FlexUnitCore();
- core.addListener(new CIListener());
- core.run(DataGridColumnTester);
- }
-
- ]]>
- </fx:Script>
- <js:valuesImpl>
- <js:SimpleValuesImpl />
- </js:valuesImpl>
-
-</js:Application>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/asjs/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/tests/build.xml b/frameworks/projects/HTML/asjs/tests/build.xml
deleted file mode 100644
index 4a12b75..0000000
--- a/frameworks/projects/HTML/asjs/tests/build.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-
-
-<project name="flexjsjx.test" default="main" basedir=".">
- <property name="FLEXJS_HOME" location="../../../../.."/>
-
- <property file="${FLEXJS_HOME}/env.properties"/>
- <property environment="env"/>
- <property file="${FLEXJS_HOME}/build.properties"/>
- <property name="FLEX_HOME" value="${env.FLEX_HOME}"/>
- <property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
-
- <condition property="browser" value="C:/Program Files/Internet Explorer/iexplore.exe">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/Applications/Safari.app/Contents/MacOS/Safari">
- <os family="mac"/>
- </condition>
-
- <property name="report.dir" value="${basedir}/out" />
-
- <available file="${FLEXJS_HOME}/../flex-flexunit"
- type="dir"
- property="FLEXUNIT_HOME"
- value="${FLEXJS_HOME}/../flex-flexunit" />
-
- <available file="${FLEXJS_HOME}/../flexunit"
- type="dir"
- property="FLEXUNIT_HOME"
- value="${FLEXJS_HOME}/../flexunit" />
-
- <available file="${env.FLEXUNIT_HOME}"
- type="dir"
- property="FLEXUNIT_HOME"
- value="${env.FLEXUNIT_HOME}"/>
-
- <available file="${FLEXUNIT_HOME}/FlexUnit4/target"
- type="dir"
- property="FLEXUNIT_LIBPATH1"
- value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" />
- <property name="FLEXUNIT_LIBPATH1" value="-library-path+=${FLEXUNIT_HOME}/flexunit" />
-
- <available file="${FLEXUNIT_HOME}/FlexUnit4CIListener/target"
- type="dir"
- property="FLEXUNIT_LIBPATH2"
- value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
- <property name="FLEXUNIT_LIBPATH2" value="-define=CONFIG::dummy,false" />
-
- <available file="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target"
- type="dir"
- property="FLEXUNIT_CLASSPATH"
- value="${FLEXUNIT_HOME}/FlexUnit4AntTasks/target" />
- <property name="FLEXUNIT_CLASSPATH" value="${FLEXUNIT_HOME}/flexunit" />
-
- <target name="main" depends="clean,compile,test" description="Clean test of FlexJSUI.swc">
- </target>
-
- <target name="clean">
- <delete failonerror="false">
- <fileset dir="${basedir}">
- <include name="FlexUnitFlexJSApplication.swf"/>
- </fileset>
- </delete>
- </target>
-
- <path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
- </path>
-
- <target name="compile" description="Compiles FlexUnitApplication.swf">
- <echo message="Compiling FlexUnitFlexJSApplication.swf"/>
- <echo message="FLEX_HOME: ${FLEX_HOME}"/>
- <echo message="FALCON_HOME: ${FALCON_HOME}"/>
- <echo message="FLEXUNIT_HOME: ${FLEXUNIT_HOME}"/>
- <echo message="playerglobal.version: ${playerglobal.version}"/>
-
- <!-- Load the <compc> task. We can't do this at the <project> level -->
- <!-- because targets that run before flexTasks.jar gets built would fail. -->
- <taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
- <!--
- Link in the classes (and their dependencies) for the MXML tags
- listed in this project's manifest.xml.
- Also link the additional classes (and their dependencies)
- listed in FlexJSUIClasses.as,
- because these aren't referenced by the manifest classes.
- Keep the standard metadata when compiling.
- Include the appropriate CSS files and assets in the SWC.
- Don't include any resources in the SWC.
- Write a bundle list of referenced resource bundles
- into the file bundles.properties in this directory.
- -->
- <mxmlc fork="true"
- file="${basedir}/FlexUnitFlexJSApplication.mxml"
- output="${basedir}/FlexUnitFlexJSApplication.swf">
- <jvmarg line="${mxmlc.jvm.args}"/>
- <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
- <arg value="-debug" />
- <arg value="-compiler.mxml.children-as-data" />
- <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" />
- <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" />
- <arg value="-compiler.binding-value-change-event-type=valueChange" />
- <arg value="+playerglobal.version=${playerglobal.version}" />
- <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
- <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/asjs/src" />
- <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" />
- <arg value="${FLEXUNIT_LIBPATH1}" />
- <arg value="${FLEXUNIT_LIBPATH2}" />
- </mxmlc>
- </target>
-
- <target name="test">
- <taskdef resource="flexUnitTasks.tasks">
- <classpath>
- <fileset dir="${FLEXUNIT_CLASSPATH}">
- <include name="flexUnitTasks*.jar" />
- </fileset>
- </classpath>
- </taskdef>
- <mkdir dir="${report.dir}" />
- <flexunit
- swf="${basedir}/FlexUnitFlexJSApplication.swf"
- workingDir="${basedir}"
- toDir="${report.dir}"
- haltonfailure="false"
- verbose="true"
- localTrusted="true"
- command="${browser}"
- timeout="90000">
- <source dir="${FLEXJS_HOME}/frameworks/projects/HTML/asjs/src" />
- <library dir="${FLEXJS_HOME}/frameworks/libs" />
- </flexunit>
-
- <!-- Generate readable JUnit-style reports -->
- <junitreport todir="${report.dir}">
- <fileset dir="${report.dir}">
- <include name="TEST-*.xml" />
- </fileset>
- <report format="frames" todir="${report.dir}/html" />
- </junitreport>
-
- </target>
-</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTester.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTester.as b/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTester.as
deleted file mode 100644
index e060b1f..0000000
--- a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTester.as
+++ /dev/null
@@ -1,27 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package flexUnitTests
-{
- [Suite]
- [RunWith("org.flexunit.runners.Suite")]
- public class DataGridColumnTester
- {
- public var dataGridColumnTesterTest:DataGridColumnTesterTest;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTesterTest.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTesterTest.as b/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTesterTest.as
deleted file mode 100644
index 1a3cc0f..0000000
--- a/frameworks/projects/HTML/asjs/tests/flexUnitTests/DataGridColumnTesterTest.as
+++ /dev/null
@@ -1,55 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package flexUnitTests
-{
- import flexunit.framework.Assert;
-
- import org.apache.flex.html.supportClasses.DataGridColumn;
-
- public class DataGridColumnTesterTest
- {
- [Before]
- public function setUp():void
- {
- }
-
- [After]
- public function tearDown():void
- {
- }
-
- [BeforeClass]
- public static function setUpBeforeClass():void
- {
- }
-
- [AfterClass]
- public static function tearDownAfterClass():void
- {
- }
-
- [Test]
- public function testLabelProperty():void
- {
- var column:DataGridColumn = new DataGridColumn();
- column.label = "foo";
- Assert.assertEquals("Error testing DataGridColumn.label", column.label, "foo");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/653c047a/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index b98d7a8..39812ce 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -44,7 +44,7 @@
<!-- no tests yet
<ant dir="as/tests" />
-->
- <ant dir="asjs/tests" />
+ <ant dir="as/tests" />
</target>
<target name="test-js" unless="is.jenkins">
[6/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - clean up
the build scripts
Posted by ah...@apache.org.
clean up the build scripts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/93a57d0d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/93a57d0d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/93a57d0d
Branch: refs/heads/core_js_to_as
Commit: 93a57d0d726d6e80695f0dfd4c1ba8d20ba9caa6
Parents: 3d2d2c3
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 22:33:12 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 22:33:12 2015 -0800
----------------------------------------------------------------------
build.xml | 38 +++-----------------
frameworks/build.xml | 44 +++++++++---------------
frameworks/projects/Binding/build.xml | 10 +-----
frameworks/projects/Charts/build.xml | 5 +--
frameworks/projects/Collections/build.xml | 5 +--
frameworks/projects/Core/as/tests/build.xml | 2 +-
frameworks/projects/Core/build.xml | 5 +--
frameworks/projects/CreateJS/build.xml | 5 +--
frameworks/projects/DragDrop/build.xml | 10 +-----
frameworks/projects/Effects/build.xml | 10 +-----
frameworks/projects/Flat/build.xml | 10 +-----
frameworks/projects/Formatters/build.xml | 5 +--
frameworks/projects/GoogleMaps/build.xml | 5 +--
frameworks/projects/Graphics/build.xml | 10 +-----
frameworks/projects/HTML/as/tests/build.xml | 2 +-
frameworks/projects/HTML/build.xml | 37 +-------------------
frameworks/projects/HTML5/build.xml | 5 +--
frameworks/projects/JQuery/build.xml | 5 +--
frameworks/projects/Mobile/build.xml | 5 +--
frameworks/projects/Network/build.xml | 10 +-----
20 files changed, 39 insertions(+), 189 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index f5a58b7..a027f93 100644
--- a/build.xml
+++ b/build.xml
@@ -87,14 +87,14 @@
Each of the main targets for the modules will call clean themselves before proceeding.
-->
- <target name="main" depends="check-if-ide,prebuild,frameworks-as,frameworks-js,frameworks-recompile,post-build,last-message-if-airsdk" description="Full build" unless="airsdk.found">
+ <target name="main" depends="check-if-ide,prebuild,frameworks,post-build,last-message-if-airsdk" description="Full build" unless="airsdk.found">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
<echo>ant main target completed on ${build.datetime}</echo>
</target>
- <target name="main-jenkins" depends="dump-config,prebuild,frameworks-as,frameworks-js-jenkins,post-build" description="Full build">
+ <target name="main-jenkins" depends="dump-config,prebuild,frameworks,post-build" description="Full build">
<tstamp>
<format property="build.datetime" pattern="MM/dd/yyyy hh:mm:ss aa" />
</tstamp>
@@ -372,7 +372,7 @@
<delete dir="${basedir}/lib"/>
</target>
- <target name="clean" depends="examples-clean,frameworks-as-clean,package-clean,checkintests-clean"
+ <target name="clean" depends="examples-clean,frameworks-clean,package-clean,checkintests-clean"
description="Full clean excluding thirdparty downloads">
<delete file="${basedir}/flex-sdk-description.xml" failonerror="false"/>
@@ -398,7 +398,7 @@
<ant dir="${basedir}/manualtests" target="clean"/>
</target>
- <target name="frameworks-as-clean">
+ <target name="frameworks-clean">
<ant dir="${basedir}/frameworks" target="clean"/>
</target>
@@ -427,31 +427,12 @@
Build framework SWCs
-->
- <target name="frameworks-as" description="Full build of all Actionscript framework SWCs, including resource bundles and themes" unless="airsdk.found">
+ <target name="frameworks" description="Full build of all Actionscript framework SWCs, including resource bundles and themes" unless="airsdk.found">
<ant dir="${basedir}/frameworks">
<property name="locale" value="${locale}"/>
</ant>
</target>
- <target name="frameworks-js-jenkins" description="Full check of all JavaScript framework files, using gsjlint and jshint">
- <property name="no.lint" value="true" />
- <ant dir="${basedir}/frameworks" target="js">
- <property name="locale" value="${locale}"/>
- </ant>
- </target>
-
- <target name="frameworks-js" description="Full check of all JavaScript framework files, using gsjlint and jshint" unless="airsdk.found">
- <ant dir="${basedir}/frameworks" target="js">
- <property name="locale" value="${locale}"/>
- </ant>
- </target>
-
- <target name="frameworks-recompile" description="Full build of all Actionscript framework SWCs, which picks up JS files" unless="airsdk.found">
- <ant dir="${basedir}/frameworks" target="re-compile">
- <property name="locale" value="${locale}"/>
- </ant>
- </target>
-
<target name="other.locales" description="Build resource SWCs for additional locales">
<!--<ant dir="${basedir}/frameworks" target="other.locales"/>-->
</target>
@@ -547,13 +528,6 @@
<!-- frameworks -->
<antcall target="stage-framework-as"/>
- <copy todir="${basedir}/temp/frameworks/js">
- <fileset dir="${basedir}/frameworks/js" >
- <include name="jshint.properties"/>
- <include name=".jshintrc"/>
- </fileset>
- </copy>
-
<!-- asdoc -->
<copy todir="${basedir}/temp/asdoc" includeEmptyDirs="false">
<fileset dir="${basedir}/asdoc">
@@ -1148,8 +1122,6 @@
<arg value="-js-output-type=FLEXJS" />
<arg value="-closure-lib=${GOOG_HOME}" />
<arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/jquery_externals.js" />
- <arg value="-external-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs/createjs_externals.js" />
<arg value="${basedir}/mustella/tests/basicTests/BasicTestsApp.mxml" />
</java>
<fail>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index 0317c2d..733ccab 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -94,18 +94,6 @@
<antcall target="Network"/>
</target>
- <target name="compile-asjs" description="Cross-compiles all SWCs">
- </target>
-
- <target name="lint-js" description="Cross-compiles all SWCs">
- </target>
-
- <target name="re-compile" description="Builds all SWCs which should pick up the JS files from asjs">
- <!-- order may matter due to dependencies -->
- </target>
-
- <target name="js" depends="compile-asjs, lint-js" />
-
<target name="fonts">
<ant dir="${basedir}/fontsrc" target="main"/>
</target>
@@ -167,67 +155,67 @@
</target>
<target name="Binding" description="Clean build of Binding.swc">
- <ant dir="${basedir}/projects/Binding" target="all"/>
+ <ant dir="${basedir}/projects/Binding"/>
</target>
<target name="Charts" description="Clean build of Charts.swc">
- <ant dir="${basedir}/projects/Charts" target="all"/>
+ <ant dir="${basedir}/projects/Charts"/>
</target>
<target name="Core" description="Clean build of Core.swc">
- <ant dir="${basedir}/projects/Core" target="all"/>
+ <ant dir="${basedir}/projects/Core"/>
</target>
<target name="Collections" description="Clean build of Collections.swc">
- <ant dir="${basedir}/projects/Collections" target="all"/>
+ <ant dir="${basedir}/projects/Collections"/>
</target>
<target name="CreateJS" description="Clean build of CreateJS.swc">
- <ant dir="${basedir}/projects/CreateJS" target="all"/>
+ <ant dir="${basedir}/projects/CreateJS"/>
</target>
<target name="DragDrop" description="Clean build of DragDrop.swc">
- <ant dir="${basedir}/projects/DragDrop" target="all"/>
+ <ant dir="${basedir}/projects/DragDrop"/>
</target>
<target name="Effects" description="Clean build of Effects.swc">
- <ant dir="${basedir}/projects/Effects" target="all"/>
+ <ant dir="${basedir}/projects/Effects"/>
</target>
<target name="Flat" description="Clean build of Flat.swc">
- <ant dir="${basedir}/projects/Flat" target="all"/>
+ <ant dir="${basedir}/projects/Flat"/>
</target>
<target name="Formatters" description="Clean build of Formatters.swc">
- <ant dir="${basedir}/projects/Formatters" target="all"/>
+ <ant dir="${basedir}/projects/Formatters"/>
</target>
<target name="GoogleMaps" description="Clean build of GoogleMaps.swc">
- <ant dir="${basedir}/projects/GoogleMaps" target="all"/>
+ <ant dir="${basedir}/projects/GoogleMaps"/>
</target>
<target name="Graphics" description="Clean build of Graphics.swc">
- <ant dir="${basedir}/projects/Graphics" target="all"/>
+ <ant dir="${basedir}/projects/Graphics"/>
</target>
<target name="HTML" description="Clean build of HTML.swc">
- <ant dir="${basedir}/projects/HTML" target="all"/>
+ <ant dir="${basedir}/projects/HTML"/>
</target>
<target name="HTML5" description="Clean build of HTML5.swc">
- <ant dir="${basedir}/projects/HTML5" target="all"/>
+ <ant dir="${basedir}/projects/HTML5"/>
</target>
<target name="JQuery" description="Clean build of JQuery.swc">
- <ant dir="${basedir}/projects/JQuery" target="all"/>
+ <ant dir="${basedir}/projects/JQuery"/>
</target>
<target name="Mobile" description="Clean build of Mobile.swc">
- <ant dir="${basedir}/projects/Mobile" target="all"/>
+ <ant dir="${basedir}/projects/Mobile"/>
</target>
<target name="Network" description="Clean build of Network.swc">
- <ant dir="${basedir}/projects/Network" target="all"/>
+ <ant dir="${basedir}/projects/Network"/>
</target>
<target name="flex-config" depends="playerglobal-setswfversion" description="Copy the flex config template to flex-config.xml and inject version numbers">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Binding/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml
index af39e74..0fbac3f 100644
--- a/frameworks/projects/Binding/build.xml
+++ b/frameworks/projects/Binding/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of Binding.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of Binding.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of Binding.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Charts/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Charts/build.xml b/frameworks/projects/Charts/build.xml
index 630fe51..3a43954 100644
--- a/frameworks/projects/Charts/build.xml
+++ b/frameworks/projects/Charts/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of Charts.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Charts.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Charts.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Collections/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml
index 9afc851..8206623 100644
--- a/frameworks/projects/Collections/build.xml
+++ b/frameworks/projects/Collections/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of Collections.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Collections.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Collections.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Core/as/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/tests/build.xml b/frameworks/projects/Core/as/tests/build.xml
index 9595ac1..312026d 100644
--- a/frameworks/projects/Core/as/tests/build.xml
+++ b/frameworks/projects/Core/as/tests/build.xml
@@ -19,7 +19,7 @@
-->
-<project name="flexjsui.test" default="main" basedir=".">
+<project name="Core.test" default="main" basedir=".">
<property name="FLEXJS_HOME" location="../../../../.."/>
<property file="${FLEXJS_HOME}/env.properties"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 799665c..1831bf2 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of Core.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Core.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Core.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/CreateJS/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/CreateJS/build.xml b/frameworks/projects/CreateJS/build.xml
index 742c197..b121239 100644
--- a/frameworks/projects/CreateJS/build.xml
+++ b/frameworks/projects/CreateJS/build.xml
@@ -32,10 +32,7 @@
<os family="windows"/>
</condition>
- <target name="main" depends="clean,compile,test" description="Clean build of CreateJS.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of CreateJS.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of CreateJS.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/DragDrop/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/build.xml b/frameworks/projects/DragDrop/build.xml
index 1896794..6736a35 100644
--- a/frameworks/projects/DragDrop/build.xml
+++ b/frameworks/projects/DragDrop/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of DragDrop.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,compile" description="Full build of DragDrop.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,compile" description="Full build of DragDrop.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Effects/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Effects/build.xml b/frameworks/projects/Effects/build.xml
index 3bbc94c..048f6d9 100644
--- a/frameworks/projects/Effects/build.xml
+++ b/frameworks/projects/Effects/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of Effects.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Effects.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Effects.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Flat/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/build.xml b/frameworks/projects/Flat/build.xml
index 04ad536..86bd50c 100644
--- a/frameworks/projects/Flat/build.xml
+++ b/frameworks/projects/Flat/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of Flat.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,compile,copy-js,test" description="Full build of Flat.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,compile,copy-js,test" description="Full build of Flat.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Formatters/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Formatters/build.xml b/frameworks/projects/Formatters/build.xml
index 04a7bd2..5ea5c71 100644
--- a/frameworks/projects/Formatters/build.xml
+++ b/frameworks/projects/Formatters/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of Formatters.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Formatters.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Formatters.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/GoogleMaps/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/build.xml b/frameworks/projects/GoogleMaps/build.xml
index 606e30c..ef21452 100644
--- a/frameworks/projects/GoogleMaps/build.xml
+++ b/frameworks/projects/GoogleMaps/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of GoogleMaps.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of GoogleMaps.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of GoogleMaps.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Graphics/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/build.xml b/frameworks/projects/Graphics/build.xml
index 8296ed6..04e35ae 100644
--- a/frameworks/projects/Graphics/build.xml
+++ b/frameworks/projects/Graphics/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of Graphics.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Graphics.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Graphics.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/HTML/as/tests/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/tests/build.xml b/frameworks/projects/HTML/as/tests/build.xml
index 4951b51..224d62b 100644
--- a/frameworks/projects/HTML/as/tests/build.xml
+++ b/frameworks/projects/HTML/as/tests/build.xml
@@ -19,7 +19,7 @@
-->
-<project name="flexjsjx.test" default="main" basedir=".">
+<project name="HTML.test" default="main" basedir=".">
<property name="FLEXJS_HOME" location="../../../../.."/>
<property file="${FLEXJS_HOME}/env.properties"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/HTML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/build.xml b/frameworks/projects/HTML/build.xml
index 39812ce..517681c 100644
--- a/frameworks/projects/HTML/build.xml
+++ b/frameworks/projects/HTML/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of HTML.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -163,7 +155,6 @@
</compc>
</target>
- <target name="lint-js" depends="gjslint, jshint, copy-js" />
<target name="copy-js" >
<copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs">
<fileset dir="${basedir}/js/out">
@@ -172,30 +163,4 @@
</copy>
</target>
- <target name="gjslint" unless="no.lint">
- <echo>running gjslint</echo>
- <exec executable="${gjslint}" dir="${basedir}" failonerror="true">
- <arg value="--strict" />
- <arg value="--disable" />
- <arg value="006,100,214,300" />
- <!-- 006: wrong indentation -->
- <!-- 100: cannot have non-primitive value -->
- <!-- 214: @fileoverview tag missing description -->
- <!-- 300: missing newline at end of file -->
- <arg value="--max_line_length" />
- <arg value="120" />
- <arg value="-r" />
- <arg value="${basedir}/js/src" />
- </exec>
- </target>
-
- <target name="jshint" unless="no.lint">
- <echo>running jshint</echo>
- <exec executable="${jshint}" dir="${basedir}" failonerror="true">
- <arg value="--config" />
- <arg value="${FLEX_HOME}/frameworks/js/jshint.properties" />
- <arg value="${basedir}/js/src" />
- </exec>
- </target>
-
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/HTML5/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML5/build.xml b/frameworks/projects/HTML5/build.xml
index a1862da..1b1d27d 100644
--- a/frameworks/projects/HTML5/build.xml
+++ b/frameworks/projects/HTML5/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of HTML5.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML5.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of HTML5.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/JQuery/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/JQuery/build.xml b/frameworks/projects/JQuery/build.xml
index ce63aeb..409bf47 100644
--- a/frameworks/projects/JQuery/build.xml
+++ b/frameworks/projects/JQuery/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of jQuery.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of jQuery.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of jQuery.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Mobile/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/build.xml b/frameworks/projects/Mobile/build.xml
index fa1a1b4..2760554 100644
--- a/frameworks/projects/Mobile/build.xml
+++ b/frameworks/projects/Mobile/build.xml
@@ -29,10 +29,7 @@
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <target name="main" depends="clean,compile,test" description="Clean build of Mobile.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Mobile.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Mobile.swc">
</target>
<target name="test" unless="is.jenkins">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/93a57d0d/frameworks/projects/Network/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Network/build.xml b/frameworks/projects/Network/build.xml
index 8b596b2..c3a38ea 100644
--- a/frameworks/projects/Network/build.xml
+++ b/frameworks/projects/Network/build.xml
@@ -28,16 +28,8 @@
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
<property name="FALCON_HOME" value="${env.FALCON_HOME}"/>
<property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/>
- <property name="gjslint" value="gjslint" />
- <property name="jshint" value="jshint" />
- <condition property="no.lint" value="true">
- <os family="windows"/>
- </condition>
- <target name="main" depends="clean,compile,test" description="Clean build of Network.swc">
- </target>
-
- <target name="all" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Network.swc">
+ <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile" description="Full build of Network.swc">
</target>
<target name="test" unless="is.jenkins">
[5/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - hack in
warning suppression
Posted by ah...@apache.org.
hack in warning suppression
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3d2d2c36
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3d2d2c36
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3d2d2c36
Branch: refs/heads/core_js_to_as
Commit: 3d2d2c36a8ce3939249962909c5429b44f2e08b9
Parents: a94bf84
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 15:40:09 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 15:40:09 2015 -0800
----------------------------------------------------------------------
frameworks/projects/Core/build.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3d2d2c36/frameworks/projects/Core/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml
index 15cb288..799665c 100644
--- a/frameworks/projects/Core/build.xml
+++ b/frameworks/projects/Core/build.xml
@@ -117,6 +117,10 @@
<arg value="-define=COMPILE::AS3,false" />
<arg value="-define=COMPILE::JS,true" />
</java>
+ <!-- hack: inject some jsdoc to get rid of a warning when building examples -->
+ <replace file="${basedir}/js/out/org/apache/flex/events/IEventDispatcher.js"
+ token="org.apache.flex.events.IEventDispatcher.prototype.dispatchEvent"
+ value="/** @param {(Object|null|string)} event The event. 
@return {boolean} The return. */
org.apache.flex.events.IEventDispatcher.prototype.dispatchEvent" />
</target>
<target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects">
[2/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - fix error
Posted by ah...@apache.org.
fix error
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/cb0d947f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/cb0d947f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/cb0d947f
Branch: refs/heads/core_js_to_as
Commit: cb0d947f3476e4f393543c380a7c36cb75f6c3ee
Parents: 653c047
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 14:49:33 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 14:49:33 2015 -0800
----------------------------------------------------------------------
.../as/src/org/apache/flex/core/graphics/LinearGradient.as | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/cb0d947f/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/LinearGradient.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/LinearGradient.as b/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/LinearGradient.as
index 58fd116..c36a37b 100644
--- a/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/LinearGradient.as
+++ b/frameworks/projects/Graphics/as/src/org/apache/flex/core/graphics/LinearGradient.as
@@ -90,7 +90,7 @@ package org.apache.flex.core.graphics
}
//Process gradient entries and create a stop for each entry
- var entries:Array = entries;
+ var entries:Array = this.entries;
for (var i:int = 0; i < entries.length; i++)
{
var gradientEntry:GradientEntry = entries[i];
[4/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - clean up
warnings
Posted by ah...@apache.org.
clean up warnings
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a94bf841
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a94bf841
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a94bf841
Branch: refs/heads/core_js_to_as
Commit: a94bf841edc283505e320067e72b60b42aee8c6c
Parents: 9180820
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 15:39:51 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 15:39:51 2015 -0800
----------------------------------------------------------------------
examples/build_example.xml | 54 +++++++++++++++
examples/flexjs/ChartExample/build.xml | 31 +--------
examples/flexjs/CordovaCameraExample/build.xml | 29 --------
examples/flexjs/DataBindingExample/build.xml | 29 --------
.../flexjs/DataBindingExample_Flat/build.xml | 29 --------
examples/flexjs/DataBindingExample_as/build.xml | 29 --------
examples/flexjs/DataGridExample/build.xml | 33 +--------
examples/flexjs/DesktopMap/build.xml | 35 +---------
examples/flexjs/FlexJSStore/build.xml | 29 --------
examples/flexjs/FlexJSStore_jquery/build.xml | 31 +--------
.../flexjs/FlexWebsiteStatsViewer/build.xml | 29 --------
examples/flexjs/MapSearch/build.xml | 35 +---------
examples/flexjs/MobileTrader/build.xml | 33 +--------
examples/flexjs/TodoListSampleApp/build.xml | 29 --------
examples/native/ButtonExample/build.xml | 69 ++++++++----------
examples/native/USStatesMap/build.xml | 73 ++++++++------------
16 files changed, 121 insertions(+), 476 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 0dae399..9a78647 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -20,6 +20,60 @@
<project name="build_example" basedir=".">
+ <condition property="FALCON_HOME" value="${env.FALCON_HOME}">
+ <and>
+ <not>
+ <isset property="FALCON_HOME" />
+ </not>
+ <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar" type="file" />
+ </and>
+ </condition>
+
+ <condition property="FALCON_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk">
+ <and>
+ <not>
+ <isset property="FALCON_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar" type="file" />
+ </and>
+ </condition>
+
+ <condition property="FALCONJX_HOME" value="${env.FALCONJX_HOME}">
+ <and>
+ <not>
+ <isset property="FALCONJX_HOME" />
+ </not>
+ <available file="${env.FALCONJX_HOME}/lib/jsc.jar" type="file" />
+ </and>
+ </condition>
+
+ <condition property="FALCONJX_HOME" value="${FLEXJS_HOME}/../flex-falcon/compiler.jx">
+ <and>
+ <not>
+ <isset property="FALCONJX_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar" type="file" />
+ </and>
+ </condition>
+
+ <condition property="GOOG_HOME" value="${env.GOOG_HOME}">
+ <and>
+ <not>
+ <isset property="GOOG_HOME" />
+ </not>
+ <available file="${env.GOOG_HOME}/closure/goog/base.js" type="file" />
+ </and>
+ </condition>
+
+ <condition property="GOOG_HOME" value="${FLEXJS_HOME}/js/lib/google/closure-library">
+ <and>
+ <not>
+ <isset property="GOOG_HOME" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" type="file" />
+ </and>
+ </condition>
+
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/ChartExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/build.xml b/examples/flexjs/ChartExample/build.xml
index e193711..3eaa208 100644
--- a/examples/flexjs/ChartExample/build.xml
+++ b/examples/flexjs/ChartExample/build.xml
@@ -27,40 +27,11 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <include file="${basedir}/../../build_example.xml" />
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
- <include file="${basedir}/../../build_example.xml" />
-
<!-- temp remove build_example.compilejs -->
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/CordovaCameraExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/build.xml b/examples/flexjs/CordovaCameraExample/build.xml
index 7aa14f4..9087907 100644
--- a/examples/flexjs/CordovaCameraExample/build.xml
+++ b/examples/flexjs/CordovaCameraExample/build.xml
@@ -31,35 +31,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<property name="AIR_HOME" value="${env.AIR_HOME}"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample/build.xml b/examples/flexjs/DataBindingExample/build.xml
index 88dbbba..9a08e7c 100644
--- a/examples/flexjs/DataBindingExample/build.xml
+++ b/examples/flexjs/DataBindingExample/build.xml
@@ -27,35 +27,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample_Flat/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_Flat/build.xml b/examples/flexjs/DataBindingExample_Flat/build.xml
index 6553b2e..5ecc0dd 100644
--- a/examples/flexjs/DataBindingExample_Flat/build.xml
+++ b/examples/flexjs/DataBindingExample_Flat/build.xml
@@ -28,35 +28,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataBindingExample_as/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataBindingExample_as/build.xml b/examples/flexjs/DataBindingExample_as/build.xml
index db584dc..3aed7f8 100644
--- a/examples/flexjs/DataBindingExample_as/build.xml
+++ b/examples/flexjs/DataBindingExample_as/build.xml
@@ -27,35 +27,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DataGridExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DataGridExample/build.xml b/examples/flexjs/DataGridExample/build.xml
index 61ebd4a..34c9abf 100644
--- a/examples/flexjs/DataGridExample/build.xml
+++ b/examples/flexjs/DataGridExample/build.xml
@@ -27,40 +27,11 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-
- <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
<include file="${basedir}/../../build_example.xml" />
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/DesktopMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/DesktopMap/build.xml b/examples/flexjs/DesktopMap/build.xml
index d77d87d..3b6daa0 100644
--- a/examples/flexjs/DesktopMap/build.xml
+++ b/examples/flexjs/DesktopMap/build.xml
@@ -31,41 +31,8 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-
<property name="AIR_HOME" value="${env.AIR_HOME}"/>
- <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
-
-
<condition property="adl" value="adl.exe">
<os family="windows"/>
</condition>
@@ -84,6 +51,8 @@
<include file="${basedir}/../../build_example.xml" />
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+
<target name="main" depends="clean,build_example.compilejsair" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexJSStore/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore/build.xml b/examples/flexjs/FlexJSStore/build.xml
index 7dc4d66..82d62d3 100644
--- a/examples/flexjs/FlexJSStore/build.xml
+++ b/examples/flexjs/FlexJSStore/build.xml
@@ -27,35 +27,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexJSStore_jquery/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexJSStore_jquery/build.xml b/examples/flexjs/FlexJSStore_jquery/build.xml
index 4412a04..d78adbd 100644
--- a/examples/flexjs/FlexJSStore_jquery/build.xml
+++ b/examples/flexjs/FlexJSStore_jquery/build.xml
@@ -27,40 +27,11 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <include file="${basedir}/../../build_example.xml" />
<property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/jquery/out/bin/jquery-1.9.swc"/>
- <include file="${basedir}/../../build_example.xml" />
-
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
<mkdir dir="${basedir}/bin-debug/data" />
<copy file="${basedir}/src/data/catalog.json" tofile="${basedir}/bin-debug/data/catalog.json" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/FlexWebsiteStatsViewer/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/FlexWebsiteStatsViewer/build.xml b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
index 20b4415..c8479ae 100644
--- a/examples/flexjs/FlexWebsiteStatsViewer/build.xml
+++ b/examples/flexjs/FlexWebsiteStatsViewer/build.xml
@@ -27,35 +27,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/MapSearch/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MapSearch/build.xml b/examples/flexjs/MapSearch/build.xml
index 77f0596..c661f54 100644
--- a/examples/flexjs/MapSearch/build.xml
+++ b/examples/flexjs/MapSearch/build.xml
@@ -30,41 +30,9 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<property name="AIR_HOME" value="${env.AIR_HOME}"/>
- <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
-
-
<condition property="adl" value="adl.exe">
<os family="windows"/>
</condition>
@@ -83,6 +51,9 @@
<include file="${basedir}/../../build_example.xml" />
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/google_maps/out/bin/google_maps.swc"/>
+
+
<target name="main" depends="clean,build_example.compilejsair" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index cfadc95..8384d48 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -26,40 +26,11 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
-
- <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
<include file="${basedir}/../../build_example.xml" />
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">
</target>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/flexjs/TodoListSampleApp/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/TodoListSampleApp/build.xml b/examples/flexjs/TodoListSampleApp/build.xml
index db82c4c..3fc578b 100644
--- a/examples/flexjs/TodoListSampleApp/build.xml
+++ b/examples/flexjs/TodoListSampleApp/build.xml
@@ -25,35 +25,6 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
<include file="${basedir}/../../build_example.xml" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/native/ButtonExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/ButtonExample/build.xml b/examples/native/ButtonExample/build.xml
index 2d99e0f..9215c58 100644
--- a/examples/native/ButtonExample/build.xml
+++ b/examples/native/ButtonExample/build.xml
@@ -27,50 +27,35 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
- <available file="${FLEXJS_HOME}/js/libs/js.swc"
- type="file"
- property="JS.SWC"
- value="${FLEXJS_HOME}/js/libs/js.swc" />
-
- <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
- type="file"
- property="JS.SWC"
- value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
+ <include file="${basedir}/../../build_example.xml" />
+
+ <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file" />
+ </and>
+ </condition>
- <available file="${FALCONJX_HOME}/libs/js.swc"
- type="file"
- property="JS.SWC"
- value="${FALCONJX_HOME}/libs/js.swc" />
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
+ </and>
+ </condition>
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a94bf841/examples/native/USStatesMap/build.xml
----------------------------------------------------------------------
diff --git a/examples/native/USStatesMap/build.xml b/examples/native/USStatesMap/build.xml
index e2724f5..7dbabc4 100644
--- a/examples/native/USStatesMap/build.xml
+++ b/examples/native/USStatesMap/build.xml
@@ -27,51 +27,36 @@
<property environment="env"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
- <available file="${env.FALCON_HOME}/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${env.FALCON_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk/lib/falcon-mxmlc.jar"
- type="file"
- property="FALCON_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler/generated/dist/sdk"/>
-
- <available file="${env.FALCONJX_HOME}/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${env.FALCONJX_HOME}"/>
-
- <available file="${FLEXJS_HOME}/../flex-falcon/compiler.jx/lib/jsc.jar"
- type="file"
- property="FALCONJX_HOME"
- value="${FLEXJS_HOME}/../flex-falcon/compiler.jx"/>
-
- <available file="${env.GOOG_HOME}/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${env.GOOG_HOME}"/>
-
- <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js"
- type="file"
- property="GOOG_HOME"
- value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
- <available file="${FLEXJS_HOME}/js/libs/js.swc"
- type="file"
- property="JS.SWC"
- value="${FLEXJS_HOME}/js/libs/js.swc" />
-
- <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc"
- type="file"
- property="JS.SWC"
- value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" />
-
- <available file="${FALCONJX_HOME}/libs/js.swc"
- type="file"
- property="JS.SWC"
- value="${FALCONJX_HOME}/libs/js.swc" />
-
+ <include file="${basedir}/../../build_example.xml" />
+
+ <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
+ </and>
+ </condition>
+
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file" />
+ </and>
+ </condition>
+
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
+ </and>
+ </condition>
+
<path id="lib.path">
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
[3/6] git commit: [flex-asjs] [refs/heads/core_js_to_as] - get rid of
a warning
Posted by ah...@apache.org.
get rid of a warning
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9180820f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9180820f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9180820f
Branch: refs/heads/core_js_to_as
Commit: 9180820f6a9eaae76a14c4841595aa339cb94962
Parents: cb0d947
Author: Alex Harui <ah...@apache.org>
Authored: Wed Dec 16 14:49:48 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Dec 16 14:49:48 2015 -0800
----------------------------------------------------------------------
examples/flexjs/ChartExample/build.xml | 2 ++
examples/flexjs/MobileTrader/build.xml | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9180820f/examples/flexjs/ChartExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ChartExample/build.xml b/examples/flexjs/ChartExample/build.xml
index 20b4415..e193711 100644
--- a/examples/flexjs/ChartExample/build.xml
+++ b/examples/flexjs/ChartExample/build.xml
@@ -57,6 +57,8 @@
property="GOOG_HOME"
value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
<include file="${basedir}/../../build_example.xml" />
<!-- temp remove build_example.compilejs -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9180820f/examples/flexjs/MobileTrader/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/build.xml b/examples/flexjs/MobileTrader/build.xml
index 92a54b9..cfadc95 100644
--- a/examples/flexjs/MobileTrader/build.xml
+++ b/examples/flexjs/MobileTrader/build.xml
@@ -56,6 +56,8 @@
property="GOOG_HOME"
value="${FLEXJS_HOME}/js/lib/google/closure-library"/>
+ <property name="extlib_arg" value="-external-library-path=${FALCONJX_HOME}/../externs/js/out/bin/js.swc"/>
+
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compilejs" description="Clean build of ${example}">