You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/04/20 16:38:57 UTC
git commit: [flex-asjs] [refs/heads/develop] - Fixed path the libs
directory.
Repository: flex-asjs
Updated Branches:
refs/heads/develop 5dd579bf3 -> 50889a818
Fixed path the libs directory.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/50889a81
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/50889a81
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/50889a81
Branch: refs/heads/develop
Commit: 50889a818d00618554de17934ea30de2d2b68dd1
Parents: 5dd579b
Author: Peter Ent <pe...@apache.org>
Authored: Mon Apr 20 10:38:55 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Mon Apr 20 10:38:55 2015 -0400
----------------------------------------------------------------------
frameworks/projects/Core/as/tests/build.xml | 8 ++++----
frameworks/projects/Core/asjs/build.xml | 6 +++---
frameworks/projects/Core/asjs/compile-config.xml | 4 ++--
frameworks/projects/HTML/asjs/tests/build.xml | 8 ++++----
4 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50889a81/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 e116442..53595b4 100644
--- a/frameworks/projects/Core/as/tests/build.xml
+++ b/frameworks/projects/Core/as/tests/build.xml
@@ -100,8 +100,8 @@
<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/as/projects/FlexJSUI/src" />
- <arg value="-library-path+=${FLEXJS_HOME}/frameworks/as/libs" />
+ <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/Core/as/src" />
+ <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" />
<arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" />
<arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
</mxmlc>
@@ -124,8 +124,8 @@
verbose="true"
localTrusted="true"
command="${browser}">
- <source dir="${FLEXJS_HOME}/frameworks/as/projects/FlexJSUI/src" />
- <library dir="${FLEXJS_HOME}/frameworks/as/libs" />
+ <source dir="${FLEXJS_HOME}/frameworks/projects/Core/as/src" />
+ <library dir="${FLEXJS_HOME}/frameworks/libs" />
</flexunit>
<!-- Generate readable JUnit-style reports -->
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50889a81/frameworks/projects/Core/asjs/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/build.xml b/frameworks/projects/Core/asjs/build.xml
index fc8eddb..545a920 100644
--- a/frameworks/projects/Core/asjs/build.xml
+++ b/frameworks/projects/Core/asjs/build.xml
@@ -47,8 +47,8 @@
<fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
</path>
- <target name="compile" description="Compiles FlexJSJX.swc">
- <echo message="Compiling libs/FlexJSJX.swc"/>
+ <target name="compile" description="Compiles Core.swc">
+ <echo message="Compiling libs/Core.swc"/>
<echo message="FLEX_HOME: ${FLEX_HOME}"/>
<echo message="FALCON_HOME: ${FALCON_HOME}"/>
@@ -68,7 +68,7 @@
into the file bundles.properties in this directory.
-->
<compc fork="true"
- output="${FLEXJS_HOME}/frameworks/as/libs/FlexJSJX.swc">
+ output="${FLEXJS_HOME}/frameworks/libs/FlexJSJX.swc">
<jvmarg line="${compc.jvm.args}"/>
<load-config filename="compile-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50889a81/frameworks/projects/Core/asjs/compile-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/asjs/compile-config.xml b/frameworks/projects/Core/asjs/compile-config.xml
index 31a8edd..740ecc5 100644
--- a/frameworks/projects/Core/asjs/compile-config.xml
+++ b/frameworks/projects/Core/asjs/compile-config.xml
@@ -23,7 +23,7 @@
<external-library-path>
<path-element>${env.PLAYERGLOBAL_HOME}/${playerglobal.version}/playerglobal.swc</path-element>
- <path-element>../../libs/FlexJSUI.swc</path-element>
+ <path-element>../../../libs/Core.swc</path-element>
</external-library-path>
<mxml>
@@ -65,7 +65,7 @@
</include-file>
<include-classes>
- <class>FlexJSJXClasses</class>
+ <class>asjs</class>
</include-classes>
<include-namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50889a81/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
index d7f0c94..56281b0 100644
--- a/frameworks/projects/HTML/asjs/tests/build.xml
+++ b/frameworks/projects/HTML/asjs/tests/build.xml
@@ -101,8 +101,8 @@
<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/as/projects/FlexJSJX/src" />
- <arg value="-library-path+=${FLEXJS_HOME}/frameworks/as/libs" />
+ <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/asjs/src" />
+ <arg value="-library-path+=${FLEXJS_HOME}/frameworks/libs" />
<arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4/target" />
<arg value="-library-path+=${FLEXUNIT_HOME}/FlexUnit4CIListener/target" />
</mxmlc>
@@ -125,8 +125,8 @@
verbose="true"
localTrusted="true"
command="${browser}">
- <source dir="${FLEXJS_HOME}/frameworks/as/projects/FlexJSJX/src" />
- <library dir="${FLEXJS_HOME}/frameworks/as/libs" />
+ <source dir="${FLEXJS_HOME}/frameworks/projects/HTML/asjs/src" />
+ <library dir="${FLEXJS_HOME}/frameworks/libs" />
</flexunit>
<!-- Generate readable JUnit-style reports -->