You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/09/01 06:51:06 UTC
[1/2] git commit: [flex-utilities] [refs/heads/develop] - fix paths
to load modules
Repository: flex-utilities
Updated Branches:
refs/heads/develop 84658ba57 -> a399ee176
fix paths to load modules
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/62830920
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/62830920
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/62830920
Branch: refs/heads/develop
Commit: 62830920b30091eaf2a6a5afc98a804ce84e83e9
Parents: 84658ba
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Sep 1 14:23:23 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Sep 1 14:23:23 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/62830920/TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml
index 0c6dcdd..95dd359 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/modules/ModuleExample.mxml
@@ -70,8 +70,8 @@
</s:layout>
<mx:ApplicationControlBar dock="true" fillColors="[0x000000,0x323232]" fillAlphas="[1,1]" horizontalAlign="center">
- <s:Button label="Load Module 1" click="loadModule('module 1', 'Module1.swf')"/>
- <s:Button label="Load Module 2" click="loadModule('module 2', 'Module2.swf')"/>
+ <s:Button label="Load Module 1" click="loadModule('module 1', './spark/modules/Module1.swf')"/>
+ <s:Button label="Load Module 2" click="loadModule('module 2', './spark/modules/Module2.swf')"/>
</mx:ApplicationControlBar>
<mx:HBox id="hBox" />
[2/2] git commit: [flex-utilities] [refs/heads/develop] - FLEX-34490
FLEX-34478 fixes fro video path issues
Posted by jm...@apache.org.
FLEX-34490 FLEX-34478 fixes fro video path issues
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a399ee17
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a399ee17
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a399ee17
Branch: refs/heads/develop
Commit: a399ee17604a6247c65bfb3472fa8307000ce7c4
Parents: 6283092
Author: Justin Mclean <jm...@apache.org>
Authored: Mon Sep 1 14:50:44 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Mon Sep 1 14:50:44 2014 +1000
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/installer.xml | 171 +++++++++++++++++++
TourDeFlex/TourDeFlex3/src/explorer.xml | 2 +
.../src/spark/controls/VideoDisplayExample.mxml | 2 +-
.../src/spark/controls/VideoPlayerExample.mxml | 5 +-
4 files changed, 176 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a399ee17/TourDeFlex/TourDeFlex3/installer.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/installer.xml b/TourDeFlex/TourDeFlex3/installer.xml
new file mode 100644
index 0000000..797493b
--- /dev/null
+++ b/TourDeFlex/TourDeFlex3/installer.xml
@@ -0,0 +1,171 @@
+<?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="tour_de_flex_install" default="install" basedir=".">
+
+ <!-- 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="windows"/>
+ <equals arg1="${sun.arch.data.model}" arg2="64"/>
+ <equals arg1="${os.arch}" arg2="x86_64"/>
+ <equals arg1="${ant.java.version}" arg2="1.6"/>
+ </and>
+ </condition>
+
+ <property environment="env"/>
+ <condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+ <isset property="env.FLEX_HOME" />
+ </condition>
+ <echo>${env.FLEX_HOME}</echo>
+ <property file="${FLEX_HOME}/local.properties"/>
+ <property file="${FLEX_HOME}/build.properties"/>
+
+ <property file="${basedir}/${bundle}.properties"/>
+
+ <property name="download.dir" value="${FLEX_HOME}/in"/>
+ <property name="unpack.dir" value="${FLEX_HOME}/tourdeflex"/>
+
+ <property name="mirror.url" value="http://flex.apache.org/single-mirror-url.cgi" />
+
+ <property name="tourdeflex.url.folder" value="flex/tourdeflex/1.0" />
+ <condition property="tourdeflex.url.file" value="apache-flex-tour-de-flex-component-explorer-1.0-src.zip">
+ <os family="windows" />
+ </condition>
+ <condition property="tourdeflex.url.file" value="apache-flex-tour-de-flex-component-explorer-1.0-src.tar.gz">
+ <or>
+ <os family="mac" />
+ <os family="unix" />
+ </or>
+ </condition>
+ <condition property="tourdeflex.url.md5" value="2509291d41cc325ba21ed6b9cf4306f2">
+ <os family="windows" />
+ </condition>
+ <condition property="tourdeflex.url.md5" value="2509291d41cc325ba21ed6b9cf4306f2">
+ <or>
+ <os family="mac" />
+ <os family="unix" />
+ </or>
+ </condition>
+
+ <target name="install" depends="tourdeflex-download-unpack" description="Adds TourDeFlex to SDK">
+ <delete dir="${download.dir}" />
+ <echo>${install.complete.echo}</echo>
+ </target>
+
+ <target name="tourdeflex-download-unpack" description="Downloads Tour De Flex and copies into SDK">
+ <mkdir dir="${download.dir}"/>
+
+ <get src="${mirror.url}" dest="${download.dir}/mirror.txt" />
+ <replace file="${download.dir}/mirror.txt" token="<p>" />
+ <replace file="${download.dir}/mirror.txt" token="</p>" />
+ <loadfile property="tourdeflex.url.server" srcFile="${download.dir}/mirror.txt" />
+
+ <echo>Downloading ${tourdeflex.url.server}/${tourdeflex.url.folder}/${tourdeflex.url.file}</echo>
+
+ <antcall target="download_tourdeflex_with_md5">
+ <param name="srcDomain" value="${tourdeflex.url.server}" />
+ <param name="srcFolder" value="${tourdeflex.url.folder}" />
+ <param name="srcFile" value="${tourdeflex.url.file}" />
+ <param name="dest" value="${download.dir}/${tourdeflex.url.file}"/>
+ <param name="message" value="${INFO_INSTALLING_TOURDEFLEX} ${tourdeflex.url.server}/${tourdeflex.url.folder}/${tourdeflex.url.file}" />
+ <param name="failmessage" value="Tour De Flex download failed" />
+ <param name="md5" value="${tourdeflex.url.md5}" />
+ </antcall>
+
+ <mkdir dir="${unpack.dir}"/>
+ <condition property="platform" value="windows">
+ <unzip dest="${unpack.dir}">
+ <fileset file="${download.dir}/${tourdeflex.url.file" />
+ </unzip>
+ </condition>
+ <condition property="platform" value="mac">
+ <tar-ungzip dest="${unpack.dir}">
+ <fileset file="${download.dir}/${tourdeflex.url.file" />
+ </tar-ungzip>
+ </condition>
+ <condition property="platform" value="linux">
+ <tar-ungzip dest="${unpack.dir}">
+ <fileset file="${download.dir}/${tourdeflex.url.file" />
+ </tar-ungzip>
+ </condition>
+ </target>
+
+ <target name="download_tourdeflex_with_md5">
+ <antcall target="download_using_get" />
+ </target>
+
+ <target name="download_using_get"
+ description="Downloads file, and optionally verifies checksum.">
+
+ <tstamp />
+ <property name="ts" value="${DSTAMP}${TSTAMP}" />
+
+ <antcall target="get">
+ </antcall>
+ </target>
+
+ <target name="get">
+ <antcall target="get-with-params" />
+ <antcall target="check-sum" />
+ </target>
+
+ <target name="check-params" >
+ <condition property="has-params">
+ <and>
+ <contains string="${srcDomain}/${srcFolder}/${srcFile}" substring="?" />
+ <not>
+ <contains string="${srcDomain}/${srcFolder}/${srcFile}" substring="file://" />
+ </not>
+ </and>
+ </condition>
+ <condition property="is-local">
+ <contains string="${srcDomain}/${srcFolder}/${srcFile}" substring="file://" />
+ </condition>
+ <condition property="not-local-no-params">
+ <and>
+ <not>
+ <contains string="${srcDomain}/${srcFolder}/${srcFile}" substring="file://" />
+ </not>
+ <not>
+ <contains string="${srcDomain}/${srcFolder}/${srcFile}" substring="?" />
+ </not>
+ </and>
+ </condition>
+ </target>
+
+ <target name="get-with-params" depends="check-params" if="has-params" >
+ <get src="${srcDomain}/${srcFolder}/${srcFile}&ts=${ts}" dest="${dest}"/>
+ </target>
+
+ <target name="check-sum" if="md5"
+ description="Verifies MD5 checksum, and fails if checksum doesn't match">
+
+ <echo>Checking ${dest} matches ${md5}</echo>
+ <checksum file="${dest}" algorithm="MD5" verifyproperty="we.failed" property="${md5}" />
+ <fail message="${failmessage}">
+ <condition>
+ <equals arg1="${we.failed}" arg2="false" />
+ </condition>
+ </fail>
+ </target>
+</project>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a399ee17/TourDeFlex/TourDeFlex3/src/explorer.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/explorer.xml b/TourDeFlex/TourDeFlex3/src/explorer.xml
index 9a2c9bd..77c9ffd 100755
--- a/TourDeFlex/TourDeFlex3/src/explorer.xml
+++ b/TourDeFlex/TourDeFlex3/src/explorer.xml
@@ -365,7 +365,9 @@
<node label="ToolTip" app="spark/controls/ToolTipExample" />
<node label="Tree" app="spark/controls/TreeExample" />
<node label="VideoDisplay" app="spark/controls/VideoDisplayExample" />
+ <!-- Removed as it's using an external asset they may not work any more
<node label="VideoDisplay" app="spark/controls/OSMFExample" />
+ -->
<node label="VideoPlayer" app="spark/controls/VideoPlayerExample" />
</node>
<node label="Button Controls">
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a399ee17/TourDeFlex/TourDeFlex3/src/spark/controls/VideoDisplayExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/VideoDisplayExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/VideoDisplayExample.mxml
index 91a9212..2da694d 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/VideoDisplayExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/controls/VideoDisplayExample.mxml
@@ -51,7 +51,7 @@
textFlow="{TextConverter.importToFlow(TitleText, TextConverter.TEXT_FIELD_HTML_FORMAT)}"
horizontalCenter="0" verticalCenter="0" />
- <s:VideoDisplay id="myVid" height="146" width="220" source="assets/FlexInstaller.mp4" autoPlay="false"/>
+ <s:VideoDisplay id="myVid" width="66%" height="66%" source="./spark/controls/assets/FlexInstaller.mp4" autoPlay="false"/>
<s:HGroup>
<s:Button label="Play" color="0x00000" click="myVid.play();"/>
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a399ee17/TourDeFlex/TourDeFlex3/src/spark/controls/VideoPlayerExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/spark/controls/VideoPlayerExample.mxml b/TourDeFlex/TourDeFlex3/src/spark/controls/VideoPlayerExample.mxml
index 963cc2b..89d8590 100644
--- a/TourDeFlex/TourDeFlex3/src/spark/controls/VideoPlayerExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/spark/controls/VideoPlayerExample.mxml
@@ -66,9 +66,8 @@ users seek through video; a volume bar; a timer; and a button to toggle in and o
selected="true"
change="playPauseChange(event)" />
</s:HGroup>
- <s:VideoPlayer id="videoPlayer"
- horizontalCenter="-2" y="50"
- source="assets/FlexInstaller.mp4"
+ <s:VideoPlayer id="videoPlayer" width="66%" height="66%" y="50"
+ source="./spark/controls/assets/FlexInstaller.mp4"
autoPlay="false"
autoRewind="{checkRewind.selected}"/>
</s:VGroup>