You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/31 23:36:05 UTC
[1/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - don't wipe
out other defines
Repository: flex-asjs
Updated Branches:
refs/heads/release0.8.0 784ad2642 -> ec58f56e6
don't wipe out other defines
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2413b1aa
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2413b1aa
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2413b1aa
Branch: refs/heads/release0.8.0
Commit: 2413b1aaec315d82128a7ce566db74251a7eb394
Parents: 784ad26
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 15:37:36 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 15:37:36 2017 -0700
----------------------------------------------------------------------
examples/build_example.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/2413b1aa/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index 073fa9a..d6d5a9d 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -169,7 +169,7 @@
<taskdef resource="flexTasks.tasks" classpathref="lib.path"/>
<property name="config_arg" value="flex" />
<property name="file_suffix" value="mxml" />
- <property name="optional_arg" value="-define=CONFIG::dummy,true" />
+ <property name="optional_arg" value="-define+=CONFIG::dummy,true" />
<mxmlc fork="true"
debug="true"
configname="${config_arg}"
[6/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - get
CordovaCamera to work again
Posted by ah...@apache.org.
get CordovaCamera to work again
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ec58f56e
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ec58f56e
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ec58f56e
Branch: refs/heads/release0.8.0
Commit: ec58f56e633ef8413c97c8218242f28d5dca70f1
Parents: a2586ab
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 16:35:54 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 16:35:54 2017 -0700
----------------------------------------------------------------------
.../flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ec58f56e/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
index 2e79292..94eaea6 100644
--- a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
@@ -59,6 +59,9 @@ limitations under the License.
private function onFromPhotoLibrary() : void
{
+ if (cam == null) {
+ cam = new Camera();
+ }
cam.getPhotoFromLibrary(libSuccess,failure);
}
[2/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - make SWF
the default for IDE compatibility
Posted by ah...@apache.org.
make SWF the default for IDE compatibility
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/5c93d4da
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/5c93d4da
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/5c93d4da
Branch: refs/heads/release0.8.0
Commit: 5c93d4da943c7e7b490d8a6e2a5421f2f37e45ac
Parents: 2413b1a
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 15:40:30 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 15:40:30 2017 -0700
----------------------------------------------------------------------
frameworks/air-config.xml | 8 ++++----
frameworks/flex-config.xml | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c93d4da/frameworks/air-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/air-config.xml b/frameworks/air-config.xml
index e226175..ee55640 100644
--- a/frameworks/air-config.xml
+++ b/frameworks/air-config.xml
@@ -68,9 +68,9 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
- <swf-external-library-path>
+ <external-library-path>
<path-element>{airHome}/frameworks/libs/air/airglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
@@ -91,10 +91,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
<path-element>{airHome}/frameworks/libs/air</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5c93d4da/frameworks/flex-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/flex-config.xml b/frameworks/flex-config.xml
index a1b86cf..677284f 100644
--- a/frameworks/flex-config.xml
+++ b/frameworks/flex-config.xml
@@ -69,9 +69,9 @@
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
- <swf-external-library-path>
+ <external-library-path>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}/playerglobal.swc</path-element>
- </swf-external-library-path>
+ </external-library-path>
<!-- List of SWC files or directories to compile against but to omit from -->
<!-- linking. -->
@@ -92,10 +92,10 @@
-->
<!-- List of SWC files or directories that contain SWC files. -->
- <swf-library-path>
+ <library-path>
<path-element>libs</path-element>
<path-element>{playerglobalHome}/{targetPlayerMajorVersion}.{targetPlayerMinorVersion}</path-element>
- </swf-library-path>
+ </library-path>
<!-- List of SWC files or directories that contain SWC files. -->
<js-library-path>
[3/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - photo
library works on my LG
Posted by ah...@apache.org.
photo library works on my LG
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c5216086
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c5216086
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c5216086
Branch: refs/heads/release0.8.0
Commit: c5216086f2e0d2d7def40483aca29813c20a7ba5
Parents: 5c93d4d
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 15:42:06 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 15:42:06 2017 -0700
----------------------------------------------------------------------
.../src/main/flex/MyInitialView.mxml | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c5216086/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
index dcdd742..2e79292 100644
--- a/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/CordovaCameraExample/src/main/flex/MyInitialView.mxml
@@ -31,7 +31,7 @@ limitations under the License.
{
status.text = "ready";
}
-
+
public function snapPicture() : void
{
if (cam == null) {
@@ -46,17 +46,29 @@ limitations under the License.
image.src = String(imageData);
}
+ private function libSuccess(imageData:Object):void
+ {
+ output.text = "Chose photo file: " + String(imageData);
+ image.src = String(imageData);
+ }
+
private function failure(message:Object):void
{
output.text = "Failed: "+String(message);
}
+ private function onFromPhotoLibrary() : void
+ {
+ cam.getPhotoFromLibrary(libSuccess,failure);
+ }
+
]]>
</fx:Script>
<js:Label id="status" x="20" y="140" width="400" text="loading..."/>
+ <js:TextButton text="From Photo Library" x="20" y="20" click="onFromPhotoLibrary()" />
<js:TextButton text="Snap Picture" x="20" y="55" click="snapPicture()" />
<js:Label id="output" x="20" y="110" width="400"/>
[5/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - get cordova
build to work for CameraExample
Posted by ah...@apache.org.
get cordova build to work for CameraExample
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a2586ab7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a2586ab7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a2586ab7
Branch: refs/heads/release0.8.0
Commit: a2586ab7fc0cf4b4ea22d630e0ae29dc1234f71f
Parents: dd489a4
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 16:35:20 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 16:35:20 2017 -0700
----------------------------------------------------------------------
examples/flexjs/CordovaCameraExample/build.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a2586ab7/examples/flexjs/CordovaCameraExample/build.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/CordovaCameraExample/build.xml b/examples/flexjs/CordovaCameraExample/build.xml
index e293491..55bd7ae 100644
--- a/examples/flexjs/CordovaCameraExample/build.xml
+++ b/examples/flexjs/CordovaCameraExample/build.xml
@@ -36,14 +36,21 @@
<include file="${basedir}/../../build_example.xml" />
<target name="main" depends="clean,build_example.compile,build_example.compile.cordova" description="Clean build of ${example}">
+ <antcall target="cordova-plugins" />
</target>
+ <target name="cordova-plugins" if="has.cordova" >
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-plugin" >
+ <property name="plugin" value="cordova-plugin-camera"/>
+ </ant>
+ </target>
+
<target name="cordova" description="Executes the Cordova build script to create Cordova app">
<ant antfile="../../../cordova-build.xml" />
</target>
<target name="run-android" description="Executes the Cordova build script to run the app on a device.">
- <ant antfile="../../../cordova-build.xml" target="run" />
+ <ant antfile="../../../cordova-build.xml" target="run.android" />
</target>
<target name="all" depends="main, cordova" description="Builds the app then runs the Cordova script">
[4/6] git commit: [flex-asjs] [refs/heads/release0.8.0] - fix up
android cordova builds
Posted by ah...@apache.org.
fix up android cordova 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/dd489a47
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/dd489a47
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/dd489a47
Branch: refs/heads/release0.8.0
Commit: dd489a471150f905ddf245c18bfbf772e964298f
Parents: c521608
Author: Alex Harui <ah...@apache.org>
Authored: Wed May 31 16:34:39 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed May 31 16:34:39 2017 -0700
----------------------------------------------------------------------
cordova-build.xml | 8 ++++----
examples/build_example.xml | 3 ++-
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd489a47/cordova-build.xml
----------------------------------------------------------------------
diff --git a/cordova-build.xml b/cordova-build.xml
index 56768f6..f9101ff 100644
--- a/cordova-build.xml
+++ b/cordova-build.xml
@@ -40,7 +40,7 @@
-->
- <target name="main" depends="find.cordova.mac,create, copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app">
+ <target name="main" depends="find.cordova.mac,create,copyfiles" description="Creates the Cordova app if needed, compiles the FlexJS app, copies the results to Cordova app">
</target>
<!-- Set up properties and conditions -->
@@ -147,7 +147,7 @@
<available file="${android.platform}" type="dir" property="platform.loaded" />
</target>
- <target name="load-platform.android" depends="check-platform.android" unless="platform.loaded">
+ <target name="load-platform.android" depends="find.cordova.mac,check-platform.android" unless="platform.loaded">
<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
<env key="PATH" path="${app.path}:${cordova.path}"/>
<arg value="platform" />
@@ -165,7 +165,7 @@
<available file="${ios.platform}" type="dir" property="platform.loaded" />
</target>
- <target name="load-platform.ios" depends="check-platform.ios" unless="platform.loaded">
+ <target name="load-platform.ios" depends="find.cordova.mac,check-platform.ios" unless="platform.loaded">
<exec executable="${cordova.executable}" dir="${cordova.target.dir}">
<env key="PATH" path="${app.path}:${cordova.path}"/>
<arg value="platform" />
@@ -241,4 +241,4 @@
</target>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/dd489a47/examples/build_example.xml
----------------------------------------------------------------------
diff --git a/examples/build_example.xml b/examples/build_example.xml
index d6d5a9d..ab2c62c 100644
--- a/examples/build_example.xml
+++ b/examples/build_example.xml
@@ -370,7 +370,8 @@
<target name="compile.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">
<property name="mobile.platform" value="android" />
- <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="run.${mobile.platform}" />
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="main" />
+ <ant antfile="${FLEXJS_HOME}/cordova-build.xml" target="load-platform.${mobile.platform}" />
</target>
<target name="run.cordova" description="Executes the Cordova build script to run the app on a device." if="has.cordova">