put compile-js-config in separate project folder tree to get ready for IDE builds
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bdce696a Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bdce696a Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bdce696a Branch: refs/heads/develop Commit: bdce696a0910d8ec1d9996bb374b24352c02095f Parents: 893f0e5 Author: Alex Harui <aha...@apache.org> Authored: Tue May 10 23:39:35 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue May 10 23:39:35 2016 -0700 ---------------------------------------------------------------------- frameworks/js/FlexJS/build.xml | 319 +++++++++++++++++++ frameworks/js/FlexJS/projects/Binding/build.xml | 145 +++++++++ .../src/main/config/compile-js-config.xml | 79 +++++ .../js/FlexJS/projects/Collections/build.xml | 140 ++++++++ .../src/main/config/compile-js-config.xml | 69 ++++ frameworks/js/FlexJS/projects/Core/build.xml | 148 +++++++++ .../Core/src/main/config/compile-js-config.xml | 78 +++++ .../js/FlexJS/projects/Graphics/build.xml | 147 +++++++++ .../src/main/config/compile-js-config.xml | 82 +++++ frameworks/js/FlexJS/projects/HTML/build.xml | 146 +++++++++ .../HTML/src/main/config/compile-js-config.xml | 90 ++++++ frameworks/projects/Binding/build.xml | 86 +---- .../src/main/config/compile-as-config.xml | 2 +- .../src/main/config/compile-js-config.xml | 79 ----- frameworks/projects/Collections/build.xml | 84 +---- .../src/main/config/compile-as-config.xml | 2 +- .../src/main/config/compile-js-config.xml | 69 ---- frameworks/projects/Core/build.xml | 91 +----- .../Core/src/main/config/compile-as-config.xml | 2 +- .../Core/src/main/config/compile-js-config.xml | 78 ----- frameworks/projects/Graphics/build.xml | 84 +---- .../src/main/config/compile-as-config.xml | 2 +- .../src/main/config/compile-js-config.xml | 82 ----- frameworks/projects/HTML/build.xml | 85 +---- .../HTML/src/main/config/compile-as-config.xml | 3 +- .../HTML/src/main/config/compile-js-config.xml | 90 ------ 26 files changed, 1458 insertions(+), 824 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/build.xml b/frameworks/js/FlexJS/build.xml new file mode 100644 index 0000000..3050586 --- /dev/null +++ b/frameworks/js/FlexJS/build.xml @@ -0,0 +1,319 @@ +<?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. + +--> + +<!-- Note: + If you modify this file you may have to make the same change in build_framework.xml. + build_framework.xml is renamed to build.xml when it is packaged. + It is used to build the frameworks directory from the zip file. +--> +<project name="frameworksJS" default="main" basedir="."> + + <property name="FLEXJS_HOME" location="../../.."/> + + <!-- Required for OSX 10.6 / Snow Leopard Performance. --> + <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only --> + <!-- local.d32 is set/used in build.properties so this needs to be done first. --> + <condition property="local.d32" value="-d32"> + <and> + <os family="mac"/> + <matches pattern="1.6.*" string="${java.version}"/> + <equals arg1="${sun.arch.data.model}" arg2="64"/> + <equals arg1="${os.arch}" arg2="x86_64"/> + </and> + </condition> + + <!-- Property for the platform. --> + <condition property="isMac"> + <os family="mac"/> + </condition> + <condition property="isWindows"> + <os family="windows" /> + </condition> + <condition property="isLinux"> + <and> + <os family="unix"/> + <not> + <os family="mac"/> + </not> + </and> + </condition> + + <property file="${FLEXJS_HOME}/env.properties"/> + <property environment="env"/> + <property file="${FLEXJS_HOME}/build.properties"/> + <property name="FLEX_HOME" value="${FLEXJS_HOME}" /> + + <target name="main" depends="check-compile-env,clean,prepare,compile,fonts" + description="Clean build of all SWCs"/> + + <target name="check-compile-env" description="Check for the required environment variables"> + <ant antfile="${FLEXJS_HOME}/build.xml" target="check-compile-env" dir="${FLEXJS_HOME}"/> + </target> + + + <target name="prepare" depends="thirdparty-downloads"/> + + <target name="thirdparty-downloads" unless="no.thirdparty-downloads" description="Downloads all the required thirdparty code."> + </target> + + <target name="compile" description="Builds all SWCs but not their resource bundles"> + <!-- order may matter due to dependencies --> + <antcall target="Core"/> + <antcall target="Graphics"/> + <antcall target="Binding"/> + <antcall target="Collections"/> + <antcall target="HTML"/> + <!-- + <antcall target="Flat"/> + <antcall target="Charts"/> + <antcall target="CreateJS"/> + <antcall target="DragDrop"/> + <antcall target="Effects"/> + <antcall target="Formatters"/> + <antcall target="GoogleMaps"/> + <antcall target="HTML5"/> + <antcall target="JQuery"/> + <antcall target="Mobile"/> + <antcall target="Network"/> + <antcall target="Reflection"/> + <antcall target="Storage"/> + <antcall target="XML"/> + --> + </target> + + <target name="fonts"> + <ant dir="${basedir}/fontsrc" target="main"/> + </target> + + <target name="other.locales" description ="Builds resource SWCs for all locales"> + <!--<ant dir="${basedir}/projects/FlexJSUI" target="other.locales"/>--> + </target> + + <target name="doc" > + <ant dir="${basedir}/projects/Core" target="doc" /> + </target> + + <!-- + Cleanup + --> + + <target name="super-clean" depends="thirdparty-clean,clean" description="Cleans everything including thirdparty downloads."/> + + <target name="thirdparty-clean" unless="no.thirdparty-clean" description="Removes all thirdparty downloads."> + <ant antfile="${basedir}/downloads.xml" target="clean" dir="${basedir}"/> + </target> + + <target name="clean" description="Cleans all SWCs and their resource bundles"> + <!-- Delete output from SWC projects --> + <ant dir="${basedir}/projects/Binding" target="clean"/> + <!-- + <ant dir="${basedir}/projects/Charts" target="clean"/> + --> + <ant dir="${basedir}/projects/Collections" target="clean"/> + <ant dir="${basedir}/projects/Core" target="clean"/> + <!-- + <ant dir="${basedir}/projects/CreateJS" target="clean"/> + <ant dir="${basedir}/projects/DragDrop" target="clean"/> + <ant dir="${basedir}/projects/Effects" target="clean"/> + <ant dir="${basedir}/projects/Flat" target="clean"/> + <ant dir="${basedir}/projects/Formatters" target="clean"/> + <ant dir="${basedir}/projects/GoogleMaps" target="clean"/> + --> + <ant dir="${basedir}/projects/Graphics" target="clean"/> + <ant dir="${basedir}/projects/HTML" target="clean"/> + <!-- + <ant dir="${basedir}/projects/HTML5" target="clean"/> + <ant dir="${basedir}/projects/JQuery" target="clean"/> + <ant dir="${basedir}/projects/Mobile" target="clean"/> + <ant dir="${basedir}/projects/Network" target="clean"/> + <ant dir="${basedir}/projects/Reflection" target="clean"/> + <ant dir="${basedir}/projects/Storage" target="clean"/> + <ant dir="${basedir}/projects/XML" target="clean"/> + <ant dir="${basedir}/fontsrc" target="clean"/> + --> + + <!-- delete the FlashBuilder executable directories --> + <delete includeemptydirs="true" failonerror="false"> + <fileset dir="${basedir}/projects"> + <include name="*/bin/**"/> + </fileset> + </delete> + <!-- Delete empty folders --> + <delete dir="${basedir}/libs"/> + <delete dir="${basedir}/locale"> + <exclude name="**/metadata.properties"/> + </delete> + <delete dir="${basedir}/libs/generated"/> + <!-- Delete only if it exists and it is empty. air and swfobject put dirs here. --> + <delete dir="${FLEXJS_HOME}/templates" includeemptydirs="true" failonerror="false"> + <exclude name="swfobject/index.template.html" /> + <exclude name="swfobject/expressInstall.swf" /> + <exclude name="swfobject/swfobject.js" /> + <exclude name="swfobject/history/**" /> + </delete> + </target> + + <target name="Binding" description="Clean build of Binding.swc"> + <ant dir="${basedir}/projects/Binding"/> + </target> + + <target name="Charts" description="Clean build of Charts.swc"> + <ant dir="${basedir}/projects/Charts"/> + </target> + + <target name="Core" description="Clean build of Core.swc"> + <ant dir="${basedir}/projects/Core"/> + </target> + + <target name="Collections" description="Clean build of Collections.swc"> + <ant dir="${basedir}/projects/Collections"/> + </target> + + <target name="CreateJS" description="Clean build of CreateJS.swc"> + <ant dir="${basedir}/projects/CreateJS"/> + </target> + + <target name="DragDrop" description="Clean build of DragDrop.swc"> + <ant dir="${basedir}/projects/DragDrop"/> + </target> + + <target name="Effects" description="Clean build of Effects.swc"> + <ant dir="${basedir}/projects/Effects"/> + </target> + + <target name="Flat" description="Clean build of Flat.swc"> + <ant dir="${basedir}/projects/Flat"/> + </target> + + <target name="Formatters" description="Clean build of Formatters.swc"> + <ant dir="${basedir}/projects/Formatters"/> + </target> + + <target name="GoogleMaps" description="Clean build of GoogleMaps.swc"> + <ant dir="${basedir}/projects/GoogleMaps"/> + </target> + + <target name="Graphics" description="Clean build of Graphics.swc"> + <ant dir="${basedir}/projects/Graphics"/> + </target> + + <target name="HTML" description="Clean build of HTML.swc"> + <ant dir="${basedir}/projects/HTML"/> + </target> + + <target name="HTML5" description="Clean build of HTML5.swc"> + <ant dir="${basedir}/projects/HTML5"/> + </target> + + <target name="JQuery" description="Clean build of JQuery.swc"> + <ant dir="${basedir}/projects/JQuery"/> + </target> + + <target name="Mobile" description="Clean build of Mobile.swc"> + <ant dir="${basedir}/projects/Mobile"/> + </target> + + <target name="Network" description="Clean build of Network.swc"> + <ant dir="${basedir}/projects/Network"/> + </target> + + <target name="Reflection" description="Clean build of Reflection.swc"> + <ant dir="${basedir}/projects/Reflection"/> + </target> + + <target name="Storage" description="Clean build of Storage.swc"> + <ant dir="${basedir}/projects/Storage"/> + </target> + <target name="XML" description="Clean build of XML.swc"> + <ant dir="${basedir}/projects/XML"/> + </target> + + <target name="flex-config" depends="playerglobal-setswfversion" description="Copy the flex config template to flex-config.xml and inject version numbers"> + <copy file="${basedir}/flex-config-template.xml" tofile="${basedir}/flex-config.xml" overwrite="true"> + <filterset> + <filter token="playerversion" value="${playerglobal.version}"/> + <filter token="swfversion" value="${playerglobal.swfversion}"/> + <filter token="locale" value="${locale}"/> + </filterset> + </copy> + </target> + + <target name="air-config" depends="playerglobal-setswfversion" description="Copy the air config template to air-config.xml and inject version numbers"> + <copy file="${basedir}/air-config-template.xml" tofile="${basedir}/air-config.xml" overwrite="true"> + <filterset> + <filter token="playerversion" value="${playerglobal.version}"/> + <filter token="swfversion" value="${playerglobal.swfversion}"/> + <filter token="locale" value="${locale}"/> + </filterset> + </copy> + </target> + + <target name="playerglobal-setswfversion" description="Set the swfversion to insert into the flex config file"> + <condition property="playerglobal.swfversion" value="11"> + <equals arg1="${playerglobal.version}" arg2="10.2" /> + </condition> + <condition property="playerglobal.swfversion" value="12"> + <equals arg1="${playerglobal.version}" arg2="10.3" /> + </condition> + <condition property="playerglobal.swfversion" value="13"> + <equals arg1="${playerglobal.version}" arg2="11.0" /> + </condition> + <condition property="playerglobal.swfversion" value="14"> + <equals arg1="${playerglobal.version}" arg2="11.1" /> + </condition> + <condition property="playerglobal.swfversion" value="15"> + <equals arg1="${playerglobal.version}" arg2="11.2" /> + </condition> + <condition property="playerglobal.swfversion" value="16"> + <equals arg1="${playerglobal.version}" arg2="11.3" /> + </condition> + <condition property="playerglobal.swfversion" value="17"> + <equals arg1="${playerglobal.version}" arg2="11.4" /> + </condition> + <condition property="playerglobal.swfversion" value="18"> + <equals arg1="${playerglobal.version}" arg2="11.5" /> + </condition> + <condition property="playerglobal.swfversion" value="19"> + <equals arg1="${playerglobal.version}" arg2="11.6" /> + </condition> + <condition property="playerglobal.swfversion" value="20"> + <equals arg1="${playerglobal.version}" arg2="11.7" /> + </condition> + <condition property="playerglobal.swfversion" value="21"> + <equals arg1="${playerglobal.version}" arg2="11.8" /> + </condition> + <condition property="playerglobal.swfversion" value="22"> + <equals arg1="${playerglobal.version}" arg2="11.9" /> + </condition> + <condition property="playerglobal.swfversion" value="23"> + <equals arg1="${playerglobal.version}" arg2="12.0" /> + </condition> + <condition property="playerglobal.swfversion" value="24"> + <equals arg1="${playerglobal.version}" arg2="13.0" /> + </condition> + <condition property="playerglobal.swfversion" value="25"> + <equals arg1="${playerglobal.version}" arg2="14.0" /> + </condition> + <condition property="playerglobal.swfversion" value="26"> + <equals arg1="${playerglobal.version}" arg2="15.0" /> + </condition> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Binding/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Binding/build.xml b/frameworks/js/FlexJS/projects/Binding/build.xml new file mode 100644 index 0000000..ff119f6 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Binding/build.xml @@ -0,0 +1,145 @@ +<?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="BindingJS" 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="${FLEXJS_HOME}"/> + <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > + <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> + </condition> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > + <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> + </condition> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> + + <property name="target.name" value="BindingJS.swc" /> + <property name="target.name.no.version" value="BindingJS.swc" /> + + <target name="main" depends="clean,compile-extern-swc,compile-asjs,copy-js,test-js" description="Full build of Binding.swc"> + </target> + + <target name="test" unless="is.jenkins"> + <!-- no tests yet + <ant dir="as/tests" /> + --> + </target> + + <target name="test-js" unless="is.jenkins"> + <!-- no tests yet + <ant dir="js/tests" /> + --> + </target> + + <target name="clean"> + <delete failonerror="false"> + <fileset dir="${FLEXJS_HOME}/frameworks/libs"> + <include name="${target.name.no.version}"/> + </fileset> + </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/target"> + <include name="**/**"/> + </fileset> + </delete> + </target> + + <path id="lib.path"> + <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> + </path> + + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> + <arg value="-js-output-type=FLEXJS" /> + <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </java> + </target> + + <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> + <echo message="Compiling target/${target.name}"/> + <echo message="FLEX_HOME: ${FLEX_HOME}"/> + <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> + <mkdir dir="${basedir}/target"/> + + <!-- 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 CoreClasses.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. + --> + <compc fork="true" + output="${basedir}/target/${target.name}"> + <jvmarg line="${compc.jvm.args}"/> + <load-config filename="src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name.no.version}" /> + </target> + + <target name="copy-js" > + <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**" /> + </fileset> + </copy> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml new file mode 100644 index 0000000..8a8909e --- /dev/null +++ b/frameworks/js/FlexJS/projects/Binding/src/main/config/compile-js-config.xml @@ -0,0 +1,79 @@ +<!-- + + 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. + +--> +<flex-config> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </mxml> + <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> + <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> + <binding-value-change-event-type>valueChange</binding-value-change-event-type> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path> + <!-- asjscompc won't 'link' these classes in, but will list their requires + if these swcs are on the external-library-path then their requires + will not be listed --> + <path-element>../../../../../libs/CoreJS.swc</path-element> + </library-path> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../../../../../../../projects/Binding/src/main/resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../../../../../../../projects/Binding/src/main/flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + </include-file> + + <include-sources> + <path-element>../../../../../../../projects/Binding/src/main/flex</path-element> + </include-sources> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + </include-namespaces> + + <target-player>${playerglobal.version}</target-player> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Collections/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Collections/build.xml b/frameworks/js/FlexJS/projects/Collections/build.xml new file mode 100644 index 0000000..b799458 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Collections/build.xml @@ -0,0 +1,140 @@ +<?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="CollectionsJS" 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="${FLEXJS_HOME}"/> + <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > + <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> + </condition> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > + <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> + </condition> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> + + <property name="target.name" value="CollectionsJS.swc" /> + <property name="target.name.no.version" value="CollectionsJS.swc" /> + + <target name="main" depends="clean,compile-extern-swc,compile-asjs,copy-js,test" description="Full build of CollectionsJS.swc"> + </target> + + <target name="test" unless="is.jenkins"> + <!-- no tests yet + <ant dir="as/tests" /> + --> + </target> + + <target name="clean"> + <delete failonerror="false"> + <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <include name="${target.name.no.version}"/> + </fileset> + </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/target"> + <include name="**/**"/> + </fileset> + </delete> + </target> + + <path id="lib.path"> + <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> + </path> + + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> + <arg value="-js-output-type=FLEXJS" /> + <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </java> + </target> + + <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> + <echo message="Compiling target/${target.name}"/> + <echo message="FLEX_HOME: ${FLEX_HOME}"/> + <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <!-- make JS output folder now so include-file doesn't error --> + <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> + <mkdir dir="${basedir}/target"/> + + <!-- 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 CoreClasses.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. + --> + <compc fork="true" + output="${basedir}/target/${target.name}"> + <jvmarg line="${compc.jvm.args}"/> + <load-config filename="src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name.no.version}" /> + </target> + + <target name="copy-js"> + <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**"/> + </fileset> + </copy> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml new file mode 100644 index 0000000..729d0b2 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Collections/src/main/config/compile-js-config.xml @@ -0,0 +1,69 @@ +<!-- + + 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. + +--> +<flex-config> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </mxml> + <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> + <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> + <binding-value-change-event-type>valueChange</binding-value-change-event-type> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path> + <!-- asjscompc won't 'link' these classes in, but will list their requires + if these swcs are on the external-library-path then their requires + will not be listed --> + <path-element>../../../../../libs/CoreJS.swc</path-element> + </library-path> + + <source-path> + <path-element>../../../../../../../projects/Collections/src/main/flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-sources> + <path-element>../../../../../../../projects/Collections/src/main/flex</path-element> + </include-sources> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + </include-namespaces> + + <target-player>${playerglobal.version}</target-player> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Core/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Core/build.xml b/frameworks/js/FlexJS/projects/Core/build.xml new file mode 100644 index 0000000..d800753 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Core/build.xml @@ -0,0 +1,148 @@ +<?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="CoreJS" 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="${FLEXJS_HOME}"/> + <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > + <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> + </condition> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > + <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> + </condition> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> + + <property name="target.name" value="CoreJS.swc" /> + <property name="target.name.no.version" value="CoreJS.swc" /> + + <target name="main" depends="clean,compile-extern-swc,compile-asjs,copy-js" description="Full build of CoreJS.swc"> + </target> + + <target name="test" unless="is.jenkins"> + <!-- no tests yet + <ant dir="src/test/flex"/> + --> + </target> + + <target name="test-js" unless="is.jenkins"> + <!-- no tests yet + <ant dir="js/tests" /> + --> + </target> + + <target name="clean"> + <delete failonerror="false"> + <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <include name="${target.name.no.version}"/> + </fileset> + </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/target"> + <include name="**/**"/> + </fileset> + </delete> + </target> + + <path id="lib.path"> + <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> + </path> + + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> + <!-- make JS output folder now so include-file doesn't error --> + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> + <arg value="-js-output-type=FLEXJS" /> + <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <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}/target/generated-sources/flexjs/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"> + <echo message="Compiling target/${target.name}"/> + <echo message="FLEX_HOME: ${FLEX_HOME}"/> + <echo message="FALCON_HOME: ${FALCON_HOME}"/> + + <!-- 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 CoreClasses.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. + --> + <compc fork="true" + output="${basedir}/target/${target.name}"> + <jvmarg line="${compc.jvm.args}"/> + <load-config filename="src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name.no.version}" /> + </target> + + <target name="copy-js"> + <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**"/> + </fileset> + </copy> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Core/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Core/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Core/src/main/config/compile-js-config.xml new file mode 100644 index 0000000..55229de --- /dev/null +++ b/frameworks/js/FlexJS/projects/Core/src/main/config/compile-js-config.xml @@ -0,0 +1,78 @@ +<!-- + + 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. + +--> +<flex-config> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </mxml> + <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> + <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> + <binding-value-change-event-type>valueChange</binding-value-change-event-type> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path> + </library-path> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../../../../../../../projects/Core/src/main/resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../../../../../../../projects/Core/src/main/flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + </include-file> + + <include-sources> + </include-sources> + + <include-classes> + <class>CoreClasses</class> + </include-classes> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + </include-namespaces> + + <!--<target-player>${playerglobal.version}</target-player>--> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Graphics/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Graphics/build.xml b/frameworks/js/FlexJS/projects/Graphics/build.xml new file mode 100644 index 0000000..bcf5da3 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Graphics/build.xml @@ -0,0 +1,147 @@ +<?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="GraphicsJS" 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="${FLEXJS_HOME}"/> + <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > + <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> + </condition> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > + <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> + </condition> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> + <property name="target.name" value="GraphicsJS.swc" /> + <property name="target.name.no.version" value="GraphicsJS.swc" /> + + <target name="main" depends="clean,compile-extern-swc,compile-asjs,copy-js,test" description="Full build of GraphicsJS.swc"> + </target> + + <target name="test" unless="is.jenkins"> + <!-- no tests yet + <ant dir="as/tests" /> + <ant dir="asjs/tests" /> + --> + </target> + + <target name="test-js" unless="is.jenkins"> + <!-- no tests yet + <ant dir="js/tests" /> + --> + </target> + + + <target name="clean"> + <delete failonerror="false"> + <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <include name="${target.name.no.version}"/> + </fileset> + </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/target"> + <include name="**/**"/> + </fileset> + </delete> + </target> + + <path id="lib.path"> + <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> + </path> + + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> + <arg value="-js-output-type=FLEXJS" /> + <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </java> + </target> + + <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> + <echo message="Compiling target/${target.name}"/> + <echo message="FLEX_HOME: ${FLEX_HOME}"/> + <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <!-- make JS output folder now so include-file doesn't error --> + <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> + <mkdir dir="${basedir}/target"/> + + <!-- 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 CoreClasses.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. + --> + <compc fork="true" + output="${basedir}/target/${target.name}"> + <jvmarg line="${compc.jvm.args}"/> + <load-config filename="src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name.no.version}" /> + </target> + + <target name="copy-js"> + <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**"/> + </fileset> + </copy> + </target> + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/Graphics/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/Graphics/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/Graphics/src/main/config/compile-js-config.xml new file mode 100644 index 0000000..8a65a62 --- /dev/null +++ b/frameworks/js/FlexJS/projects/Graphics/src/main/config/compile-js-config.xml @@ -0,0 +1,82 @@ +<!-- + + 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. + +--> +<flex-config> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </mxml> + <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> + <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> + <binding-value-change-event-type>valueChange</binding-value-change-event-type> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path> + <!-- asjscompc won't 'link' these classes in, but will list their requires + if these swcs are on the external-library-path then their requires + will not be listed --> + <path-element>../../../../../libs/CoreJS.swc</path-element> + </library-path> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../../../../../../../projects/Graphics/src/main/resources/basic-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../../../../../../../projects/Graphics/src/main/flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + </include-file> + + <include-sources> + </include-sources> + + <include-classes> + <class>GraphicsClasses</class> + </include-classes> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + </include-namespaces> + + <target-player>${playerglobal.version}</target-player> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/HTML/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/HTML/build.xml b/frameworks/js/FlexJS/projects/HTML/build.xml new file mode 100644 index 0000000..d88fc4a --- /dev/null +++ b/frameworks/js/FlexJS/projects/HTML/build.xml @@ -0,0 +1,146 @@ +<?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="HTMLJS" 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="${FLEXJS_HOME}"/> + <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> + <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> + <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > + <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> + </condition> + <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> + <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > + <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> + </condition> + <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> + <property name="target.name" value="HTMLJS.swc" /> + <property name="target.name.no.version" value="HTMLJS.swc" /> + + <target name="main" depends="clean,compile-extern-swc,compile-asjs,copy-js,test" description="Full build of HTMLJS.swc"> + </target> + + <target name="test" unless="is.jenkins"> + <!-- no tests yet + <ant dir="src/test/flex"/> + --> + </target> + + <target name="test-js" unless="is.jenkins"> + <!-- no tests yet + <ant dir="js/tests" /> + --> + </target> + + <target name="clean"> + <delete failonerror="false"> + <fileset dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <include name="${target.name.no.version}"/> + </fileset> + </delete> + <delete failonerror="false"> + <fileset dir="${basedir}/target"> + <include name="**/**"/> + </fileset> + </delete> + </target> + + <path id="lib.path"> + <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/> + </path> + + <target name="compile-asjs"> + <echo message="Cross-compiling ${target.name}"/> + <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> + <mkdir dir="${basedir}/target/generated-sources/flexjs"/> + <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > + <jvmarg value="-Xmx384m" /> + <jvmarg value="-Dsun.io.useCanonCaches=false" /> + <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> + <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> + <arg value="+flexlib=${FLEX_HOME}/frameworks" /> + <arg value="-js-output-type=FLEXJS" /> + <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> + <arg value="-output=${basedir}/target/generated-sources/flexjs" /> + <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </java> + </target> + + <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> + <echo message="Compiling target/externs/${target.name}"/> + <echo message="FLEX_HOME: ${FLEX_HOME}"/> + <echo message="FALCON_HOME: ${FALCON_HOME}"/> + <!-- make JS output folder now so include-file doesn't error --> + <mkdir dir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"/> + <mkdir dir="${basedir}/target"/> + + <!-- 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 CoreClasses.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. + --> + <compc fork="true" + output="${basedir}/target/${target.name}"> + <jvmarg line="${compc.jvm.args}"/> + <load-config filename="src/main/config/compile-js-config.xml" /> + <arg value="+playerglobal.version=${playerglobal.version}" /> + <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> + <arg value="-external-library-path+=${JS.SWC}" /> + <!-- this is not on external-library path otherwise goog.requires are not generated --> + <arg value="-library-path+=${GCL.SWC}" /> + <arg value="-define=COMPILE::AS3,false" /> + <arg value="-define=COMPILE::JS,true" /> + </compc> + <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/js/FlexJS/libs/${target.name.no.version}" /> + </target> + + <target name="copy-js"> + <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> + <fileset dir="${basedir}/target/generated-sources/flexjs"> + <include name="**/**"/> + </fileset> + </copy> + </target> + + +</project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/js/FlexJS/projects/HTML/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/projects/HTML/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTML/src/main/config/compile-js-config.xml new file mode 100644 index 0000000..2670033 --- /dev/null +++ b/frameworks/js/FlexJS/projects/HTML/src/main/config/compile-js-config.xml @@ -0,0 +1,90 @@ +<!-- + + 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. + +--> +<flex-config> + + <compiler> + <accessible>false</accessible> + + <external-library-path> + </external-library-path> + + <mxml> + <children-as-data>true</children-as-data> + </mxml> + <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> + <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> + <binding-value-change-event-type>valueChange</binding-value-change-event-type> + + <keep-as3-metadata> + <name>Bindable</name> + <name>Managed</name> + <name>ChangeEvent</name> + <name>NonCommittingChangeEvent</name> + <name>Transient</name> + </keep-as3-metadata> + + <locale/> + + <library-path> + <!-- asjscompc won't 'link' these classes in, but will list their requires + if these swcs are on the external-library-path then their requires + will not be listed --> + <path-element>../../../../../libs/BindingJS.swc</path-element> + <path-element>../../../../../libs/CoreJS.swc</path-element> + <path-element>../../../../../libs/GraphicsJS.swc</path-element> + <path-element>../../../../../libs/CollectionsJS.swc</path-element> + </library-path> + + <namespaces> + <namespace> + <uri>library://ns.apache.org/flexjs/basic</uri> + <manifest>../../../../../../../projects/HTML/src/main/resources/basic-manifest.xml</manifest> + </namespace> + <namespace> + <uri>library://ns.apache.org/flexjs/svg</uri> + <manifest>../../../../../../../projects/HTML/src/main/resources/svg-manifest.xml</manifest> + </namespace> + </namespaces> + + <source-path> + <path-element>../../../../../../../projects/HTML/src/main/flex</path-element> + </source-path> + + <warn-no-constructor>false</warn-no-constructor> + </compiler> + + <include-file> + </include-file> + + <include-sources> + </include-sources> + + <include-classes> + <class>HTMLClasses</class> + </include-classes> + + <include-namespaces> + <uri>library://ns.apache.org/flexjs/basic</uri> + <uri>library://ns.apache.org/flexjs/svg</uri> + </include-namespaces> + + <target-player>${playerglobal.version}</target-player> + + +</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Binding/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/build.xml b/frameworks/projects/Binding/build.xml index 6d3bbb1..d612bbb 100644 --- a/frameworks/projects/Binding/build.xml +++ b/frameworks/projects/Binding/build.xml @@ -27,20 +27,11 @@ <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> - <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> - <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > - <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> - </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> - <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > - <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> - </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> - <property name="target.name" value="Binding-${release.version}.swc" /> + <property name="target.name" value="Binding.swc" /> <property name="target.name.no.version" value="Binding.swc" /> - <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of Binding.swc"> + <target name="main" depends="clean,compile,test-js" description="Full build of Binding.swc"> </target> <target name="test" unless="is.jenkins"> @@ -76,8 +67,6 @@ <echo message="Compiling libs/Binding.swc"/> <echo message="FLEX_HOME: ${FLEX_HOME}"/> <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${basedir}/target/generated-sources/flexjs" /> <!-- Load the <compc> task. We can't do this at the <project> level --> <!-- because targets that run before flexTasks.jar gets built would fail. --> @@ -106,75 +95,4 @@ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" /> </target> - <target name="compile-asjs"> - <echo message="Cross-compiling ${target.name}"/> - <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <mkdir dir="${basedir}/target/generated-sources/flexjs"/> - <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > - <jvmarg value="-Xmx384m" /> - <jvmarg value="-Dsun.io.useCanonCaches=false" /> - <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> - <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> - <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> - <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${JS.SWC}" /> - <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${GCL.SWC}" /> - <arg value="-define=COMPILE::AS3,false" /> - <arg value="-define=COMPILE::JS,true" /> - </java> - </target> - - <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/externs/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/> - <mkdir dir="${basedir}/target/externs"/> - - <!-- 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 CoreClasses.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. - --> - <compc fork="true" - output="${basedir}/target/externs/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${JS.SWC}" /> - <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${GCL.SWC}" /> - <arg value="-define=COMPILE::AS3,false" /> - <arg value="-define=COMPILE::JS,true" /> - </compc> - <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}" /> - </target> - - <target name="copy-js" > - <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> - <fileset dir="${basedir}/target/generated-sources/flexjs"> - <include name="**/**" /> - </fileset> - </copy> - </target> - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Binding/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/src/main/config/compile-as-config.xml b/frameworks/projects/Binding/src/main/config/compile-as-config.xml index e9bc933..adcb1c8 100644 --- a/frameworks/projects/Binding/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Binding/src/main/config/compile-as-config.xml @@ -61,7 +61,7 @@ <include-file> <name>js/out/*</name> - <path>../../../target/generated-sources/flexjs/*</path> + <path>../../../../../js/FlexJS/projects/Binding/target/generated-sources/flexjs/*</path> </include-file> <include-classes> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Binding/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Binding/src/main/config/compile-js-config.xml b/frameworks/projects/Binding/src/main/config/compile-js-config.xml deleted file mode 100644 index cfeaa2a..0000000 --- a/frameworks/projects/Binding/src/main/config/compile-js-config.xml +++ /dev/null @@ -1,79 +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. - ---> -<flex-config> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </mxml> - <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> - <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> - <binding-value-change-event-type>valueChange</binding-value-change-event-type> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path> - <!-- asjscompc won't 'link' these classes in, but will list their requires - if these swcs are on the external-library-path then their requires - will not be listed --> - <path-element>../../../../../externs/Core.swc</path-element> - </library-path> - - <namespaces> - <namespace> - <uri>library://ns.apache.org/flexjs/basic</uri> - <manifest>../resources/basic-manifest.xml</manifest> - </namespace> - </namespaces> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-file> - </include-file> - - <include-sources> - <path-element>../flex</path-element> - </include-sources> - - <include-namespaces> - <uri>library://ns.apache.org/flexjs/basic</uri> - </include-namespaces> - - <target-player>${playerglobal.version}</target-player> - - -</flex-config> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Collections/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/build.xml b/frameworks/projects/Collections/build.xml index 64e19a5..c9a9356 100644 --- a/frameworks/projects/Collections/build.xml +++ b/frameworks/projects/Collections/build.xml @@ -27,20 +27,11 @@ <property file="${FLEXJS_HOME}/build.properties"/> <property name="FLEX_HOME" value="${FLEXJS_HOME}"/> <property name="FALCON_HOME" value="${env.FALCON_HOME}"/> - <property name="FALCONJX_HOME" value="${env.FALCONJX_HOME}"/> - <condition property="JS.SWC" value="${FALCONJX_HOME}/../js/libs/js.swc" > - <available file="${FALCONJX_HOME}/../js/libs/js.swc" /> - </condition> - <property name="JS.SWC" value="${FALCONJX_HOME}/../externs/js/target/js.swc" /> - <condition property="GCL.SWC" value="${FALCONJX_HOME}/../js/libs/GCL.swc" > - <available file="${FALCONJX_HOME}/../js/libs/GCL.swc" /> - </condition> - <property name="GCL.SWC" value="${FALCONJX_HOME}/../externs/GCL/target/GCL.swc" /> - <property name="target.name" value="Collections-${release.version}.swc" /> + <property name="target.name" value="Collections.swc" /> <property name="target.name.no.version" value="Collections.swc" /> - <target name="main" depends="clean,compile-asjs,compile-extern-swc,copy-js,compile,test" description="Full build of Collections.swc"> + <target name="main" depends="clean,compile,test" description="Full build of Collections.swc"> </target> <target name="test" unless="is.jenkins"> @@ -100,75 +91,4 @@ <copy file="${basedir}/target/${target.name}" tofile="${FLEXJS_HOME}/frameworks/libs/${target.name.no.version}" /> </target> - <target name="compile-asjs"> - <echo message="Cross-compiling ${target.name}"/> - <echo message="FALCONJX_HOME: ${FALCONJX_HOME}"/> - <mkdir dir="${basedir}/target/generated-sources/flexjs"/> - <java jar="${FALCONJX_HOME}/lib/compc.jar" fork="true" > - <jvmarg value="-Xmx384m" /> - <jvmarg value="-Dsun.io.useCanonCaches=false" /> - <jvmarg value="-Dflexcompiler=${FALCONJX_HOME}/../compiler" /> - <jvmarg value="-Dflexlib=${FLEXJS_HOME}/frameworks" /> - <arg value="+flexlib=${FLEX_HOME}/frameworks" /> - <arg value="-js-output-type=FLEXJS" /> - <arg value="-keep-asdoc" /><!-- allows compiler to see @flexjsignorecoercion annotations --> - <arg value="-output=${basedir}/target/generated-sources/flexjs" /> - <arg value="-load-config=${basedir}/src/main/config/compile-js-config.xml" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> - <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${JS.SWC}" /> - <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${GCL.SWC}" /> - <arg value="-define=COMPILE::AS3,false" /> - <arg value="-define=COMPILE::JS,true" /> - </java> - </target> - - <target name="compile-extern-swc" description="Compiles .as files into .swc used for cross-compiling other projects"> - <echo message="Compiling target/externs/${target.name}"/> - <echo message="FLEX_HOME: ${FLEX_HOME}"/> - <echo message="FALCON_HOME: ${FALCON_HOME}"/> - <!-- make JS output folder now so include-file doesn't error --> - <mkdir dir="${FLEXJS_HOME}/frameworks/externs"/> - <mkdir dir="${basedir}/target/externs"/> - - <!-- 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 CoreClasses.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. - --> - <compc fork="true" - output="${basedir}/target/externs/${target.name}"> - <jvmarg line="${compc.jvm.args}"/> - <load-config filename="src/main/config/compile-js-config.xml" /> - <arg value="+playerglobal.version=${playerglobal.version}" /> - <arg value="+env.AIR_HOME=${env.AIR_HOME}" /> - <arg value="-external-library-path+=${JS.SWC}" /> - <!-- this is not on external-library path otherwise goog.requires are not generated --> - <arg value="-library-path+=${GCL.SWC}" /> - <arg value="-define=COMPILE::AS3,false" /> - <arg value="-define=COMPILE::JS,true" /> - </compc> - <copy file="${basedir}/target/externs/${target.name}" tofile="${FLEXJS_HOME}/frameworks/externs/${target.name.no.version}" /> - </target> - - <target name="copy-js"> - <copy todir="${FLEXJS_HOME}/frameworks/js/FlexJS/libs"> - <fileset dir="${basedir}/target/generated-sources/flexjs"> - <include name="**/**"/> - </fileset> - </copy> - </target> - </project> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Collections/src/main/config/compile-as-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/src/main/config/compile-as-config.xml b/frameworks/projects/Collections/src/main/config/compile-as-config.xml index 80c19e5..fe380a8 100644 --- a/frameworks/projects/Collections/src/main/config/compile-as-config.xml +++ b/frameworks/projects/Collections/src/main/config/compile-as-config.xml @@ -61,7 +61,7 @@ <include-file> <name>js/out/*</name> - <path>../../../target/generated-sources/flexjs/*</path> + <path>../../../../../js/FlexJS/projects/Collections/target/generated-sources/flexjs/*</path> </include-file> <include-classes> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bdce696a/frameworks/projects/Collections/src/main/config/compile-js-config.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Collections/src/main/config/compile-js-config.xml b/frameworks/projects/Collections/src/main/config/compile-js-config.xml deleted file mode 100644 index a69e491..0000000 --- a/frameworks/projects/Collections/src/main/config/compile-js-config.xml +++ /dev/null @@ -1,69 +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. - ---> -<flex-config> - - <compiler> - <accessible>false</accessible> - - <external-library-path> - </external-library-path> - - <mxml> - <children-as-data>true</children-as-data> - </mxml> - <binding-value-change-event>org.apache.flex.events.ValueChangeEvent</binding-value-change-event> - <binding-value-change-event-kind>org.apache.flex.events.ValueChangeEvent</binding-value-change-event-kind> - <binding-value-change-event-type>valueChange</binding-value-change-event-type> - - <keep-as3-metadata> - <name>Bindable</name> - <name>Managed</name> - <name>ChangeEvent</name> - <name>NonCommittingChangeEvent</name> - <name>Transient</name> - </keep-as3-metadata> - - <locale/> - - <library-path> - <!-- asjscompc won't 'link' these classes in, but will list their requires - if these swcs are on the external-library-path then their requires - will not be listed --> - <path-element>../../../../../externs/Core.swc</path-element> - </library-path> - - <source-path> - <path-element>../flex</path-element> - </source-path> - - <warn-no-constructor>false</warn-no-constructor> - </compiler> - - <include-sources> - <path-element>../flex</path-element> - </include-sources> - - <include-namespaces> - <uri>library://ns.apache.org/flexjs/basic</uri> - </include-namespaces> - - <target-player>${playerglobal.version}</target-player> - - -</flex-config>