You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by er...@apache.org on 2014/07/02 16:18:02 UTC
[17/18] git commit: [flex-sdk] [refs/heads/VF2JS] - "Final" changes
for split of namespace.
"Final" changes for split of namespace.
Signed-off-by: Erik de Bruin <er...@ixsoftware.nl>
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7b309194
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7b309194
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7b309194
Branch: refs/heads/VF2JS
Commit: 7b3091940d9ba6c795efdd48292edda632918523
Parents: 8c8a212
Author: Erik de Bruin <er...@ixsoftware.nl>
Authored: Tue Jul 1 09:55:41 2014 +0200
Committer: Erik de Bruin <er...@ixsoftware.nl>
Committed: Tue Jul 1 09:55:41 2014 +0200
----------------------------------------------------------------------
frameworks/projects/vf2js_mx/build.xml | 36 ++++++++++----------
frameworks/projects/vf2js_mx/bundle-config.xml | 2 +-
frameworks/projects/vf2js_mx/compile-config.xml | 4 +--
frameworks/projects/vf2js_mx/defaults.css | 2 +-
frameworks/projects/vf2js_mx/manifest.xml | 3 +-
5 files changed, 23 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b309194/frameworks/projects/vf2js_mx/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js_mx/build.xml b/frameworks/projects/vf2js_mx/build.xml
index 7608819..939d99e 100644
--- a/frameworks/projects/vf2js_mx/build.xml
+++ b/frameworks/projects/vf2js_mx/build.xml
@@ -18,7 +18,7 @@
-->
-<project name="vf2js_s" default="main" basedir=".">
+<project name="vf2js_mx" default="main" basedir=".">
<property name="FLEX_HOME" location="${basedir}/../../.."/>
<property file="${FLEX_HOME}/env.properties"/>
<property environment="env"/>
@@ -26,11 +26,11 @@
<macrodef name="bundle">
<attribute name="locale"/>
<sequential>
- <echo message="Compiling frameworks/locale/@{locale}/vf2js_s_rb.swc"/>
+ <echo message="Compiling frameworks/locale/@{locale}/vf2js_mx_rb.swc"/>
<!-- 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" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
- <compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_s_rb.swc">
+ <compc fork="true" output="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_mx_rb.swc">
<jvmarg line="${compc.jvm.args}"/>
<load-config filename="bundle-config.xml"/>
<arg value="+playerglobal.version=${playerglobal.version}"/>
@@ -43,7 +43,7 @@
<attribute name="locale"/>
<sequential>
<mkdir dir="${basedir}/bundles/@{locale}/docs"/>
- <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_s_rb.swc" update="true">
+ <zip destfile="${FLEX_HOME}/frameworks/locale/@{locale}/vf2js_mx_rb.swc" update="true">
<zipfileset dir="${basedir}/bundles/@{locale}/docs" prefix="docs">
<include name="*.*"/>
</zipfileset>
@@ -58,8 +58,8 @@
<sequential>
<delete failonerror="false">
<fileset dir="${FLEX_HOME}/frameworks/locale">
- <include name="@{locale}/vf2js_s_rb.swc"/>
- <include name="@{locale}/vf2js_s_rb.swc.incr"/>
+ <include name="@{locale}/vf2js_mx_rb.swc"/>
+ <include name="@{locale}/vf2js_mx_rb.swc.incr"/>
</fileset>
</delete>
</sequential>
@@ -73,7 +73,7 @@
<run.fat.swc/>
</sequential>
</macrodef>
- <target name="main" depends="clean,compile" description="Clean build of vf2js_s.swc and default locale">
+ <target name="main" depends="clean,compile" description="Clean build of vf2js_mx.swc and default locale">
<bundle locale="${locale}"/>
</target>
<target name="other.locales" depends="bundles" description="Build other locale SWCs"/>
@@ -91,21 +91,21 @@
<include name="bundles/en_US/packages.dita"/>
</fileset>
<fileset dir="${FLEX_HOME}/frameworks/libs">
- <include name="vf2js_s.swc"/>
- <include name="vf2js_s.swc.incr"/>
+ <include name="vf2js_mx.swc"/>
+ <include name="vf2js_mx.swc.incr"/>
</fileset>
</delete>
</target>
<target name="bundles-clean">
<delete failonerror="false">
<fileset dir="${FLEX_HOME}/frameworks/locale">
- <include name="*/vf2js_s_rb.swc"/>
- <include name="*/vf2js_s_rb.swc.incr"/>
+ <include name="*/vf2js_mx_rb.swc"/>
+ <include name="*/vf2js_mx_rb.swc.incr"/>
</fileset>
</delete>
</target>
- <target name="compile" description="Compiles vf2js_s.swc">
- <echo message="Compiling frameworks/libs/vf2js_s.swc"/>
+ <target name="compile" description="Compiles vf2js_mx.swc">
+ <echo message="Compiling frameworks/libs/vf2js_mx.swc"/>
<!-- 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" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -122,14 +122,14 @@
Write a bundle list of referenced resource bundles
into the file bundles.properties in this directory.
-->
- <compc fork="true" output="${FLEX_HOME}/frameworks/libs/vf2js_s.swc">
+ <compc fork="true" output="${FLEX_HOME}/frameworks/libs/vf2js_mx.swc">
<jvmarg line="${compc.jvm.args}"/>
<load-config filename="compile-config.xml"/>
<arg value="+playerglobal.version=${playerglobal.version}"/>
<arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}"/>
</compc>
</target>
- <target name="doc" depends="clean-temp-docs" description="updates vf2js_s.swc with asdoc xml">
+ <target name="doc" depends="clean-temp-docs" description="updates vf2js_mx.swc with asdoc xml">
<!-- Load the <asdoc> 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" classpath="${FLEX_HOME}/lib/flexTasks.jar"/>
@@ -146,12 +146,12 @@
<asdoc output="${FLEX_HOME}/tempDoc" lenient="true" failonerror="true" keep-xml="true" skip-xsl="true" fork="true">
<compiler.source-path path-element="${basedir}/src"/>
<doc-classes class="ExperimentalClasses"/>
- <namespace uri="http://flex.apache.org/vf2js_s/ns" manifest="${basedir}/manifest.xml"/>
+ <namespace uri="http://flex.apache.org/vf2js_mx/ns" manifest="${basedir}/manifest.xml"/>
<namespace uri="library://ns.adobe.com/flex/spark" manifest="${basedir}/spark-manifest.xml"/>
<jvmarg line="${asdoc.jvm.args}"/>
</asdoc>
- <!-- updates vf2js_s.swc with asdoc xml -->
- <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/vf2js_s_rb.swc" update="true">
+ <!-- updates vf2js_mx.swc with asdoc xml -->
+ <zip destfile="${FLEX_HOME}/frameworks/locale/en_US/vf2js_mx_rb.swc" update="true">
<zipfileset dir="${FLEX_HOME}/tempDoc/tempdita" prefix="docs">
<include name="*.*"/>
<exclude name="ASDoc_Config.xml"/>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b309194/frameworks/projects/vf2js_mx/bundle-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js_mx/bundle-config.xml b/frameworks/projects/vf2js_mx/bundle-config.xml
index 3604b7a..209d3c4 100644
--- a/frameworks/projects/vf2js_mx/bundle-config.xml
+++ b/frameworks/projects/vf2js_mx/bundle-config.xml
@@ -38,7 +38,7 @@
<include-classes/>
<include-namespaces/>
<include-resource-bundles>
- <bundle>vf2js_s</bundle>
+ <bundle>vf2js_mx</bundle>
</include-resource-bundles>
<target-player>${playerglobal.version}</target-player>
</flex-config>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b309194/frameworks/projects/vf2js_mx/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js_mx/compile-config.xml b/frameworks/projects/vf2js_mx/compile-config.xml
index a297b33..5c99d25 100644
--- a/frameworks/projects/vf2js_mx/compile-config.xml
+++ b/frameworks/projects/vf2js_mx/compile-config.xml
@@ -38,7 +38,7 @@
<library-path/>
<namespaces>
<namespace>
- <uri>http://flex.apache.org/vf2js_s/ns</uri>
+ <uri>http://flex.apache.org/vf2js_mx/ns</uri>
<manifest>manifest.xml</manifest>
</namespace>
</namespaces>
@@ -49,7 +49,7 @@
<warn-no-constructor>false</warn-no-constructor>
</compiler>
<include-namespaces>
- <uri>http://flex.apache.org/vf2js_s/ns</uri>
+ <uri>http://flex.apache.org/vf2js_mx/ns</uri>
</include-namespaces>
<include-classes>
<class>VF2JSClasses</class>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b309194/frameworks/projects/vf2js_mx/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js_mx/defaults.css b/frameworks/projects/vf2js_mx/defaults.css
index 5fe436b..624c300 100644
--- a/frameworks/projects/vf2js_mx/defaults.css
+++ b/frameworks/projects/vf2js_mx/defaults.css
@@ -17,5 +17,5 @@
*
*/
-@namespace vf2js_s "http://flex.apache.org/vf2js_s/ns";
+@namespace vf2js_mx "http://flex.apache.org/vf2js_mx/ns";
@namespace s "library://ns.adobe.com/flex/spark";
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7b309194/frameworks/projects/vf2js_mx/manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/vf2js_mx/manifest.xml b/frameworks/projects/vf2js_mx/manifest.xml
index 7bf4f16..7c86f72 100644
--- a/frameworks/projects/vf2js_mx/manifest.xml
+++ b/frameworks/projects/vf2js_mx/manifest.xml
@@ -25,6 +25,5 @@
-->
<componentPackage>
- <component id="Application" class="vf2js_s.components.Application"/>
- <component id="Button" class="vf2js_s.components.Button"/>
+ <component id="Button" class="vf2js_mx.components.Button"/>
</componentPackage>