You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cz...@apache.org on 2013/03/22 09:30:49 UTC
git commit: FLEX-33413 renamed playerProductInstall.swf to
expressInstall.swf in HtmlWrapperTask and updated the html-wrapper-build.xml.
Updated Branches:
refs/heads/develop db300defe -> 096baa7a8
FLEX-33413 renamed playerProductInstall.swf to expressInstall.swf in HtmlWrapperTask and updated the html-wrapper-build.xml.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/096baa7a
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/096baa7a
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/096baa7a
Branch: refs/heads/develop
Commit: 096baa7a8dc780d1dcf8b97de2b948c7a9d86626
Parents: db300de
Author: cyrill.zadra <cy...@gmail.com>
Authored: Fri Mar 22 18:30:34 2013 +1000
Committer: cyrill.zadra <cy...@gmail.com>
Committed: Fri Mar 22 18:30:34 2013 +1000
----------------------------------------------------------------------
modules/antTasks/build.xml | 18 ---
modules/antTasks/src/flex/ant/HtmlWrapperTask.java | 10 +-
modules/antTasks/tests/html-wrapper-build.xml | 88 +++++----------
3 files changed, 31 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/096baa7a/modules/antTasks/build.xml
----------------------------------------------------------------------
diff --git a/modules/antTasks/build.xml b/modules/antTasks/build.xml
index cbbae8b..0abb4c8 100644
--- a/modules/antTasks/build.xml
+++ b/modules/antTasks/build.xml
@@ -82,22 +82,4 @@
</delete>
</target>
- <target name="test" depends="test-clean">
- <exec executable="ant">
- <arg value="-lib"/>
- <arg value="classes"/>
- <arg value="-file"/>
- <arg value="/home/preilly/PFServer/flex/sdk/modules/antTasks/tests/html-wrapper-build.xml"/>
- </exec>
- </target>
-
- <target name="test-clean">
- <exec executable="ant">
- <arg value="-lib"/>
- <arg value="classes"/>
- <arg value="-file"/>
- <arg value="/home/preilly/PFServer/flex/sdk/modules/antTasks/tests/html-wrapper-build.xml"/>
- <arg value="clean"/>
- </exec>
- </target>
</project>
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/096baa7a/modules/antTasks/src/flex/ant/HtmlWrapperTask.java
----------------------------------------------------------------------
diff --git a/modules/antTasks/src/flex/ant/HtmlWrapperTask.java b/modules/antTasks/src/flex/ant/HtmlWrapperTask.java
index a5ad687..f910e66 100644
--- a/modules/antTasks/src/flex/ant/HtmlWrapperTask.java
+++ b/modules/antTasks/src/flex/ant/HtmlWrapperTask.java
@@ -58,7 +58,7 @@ public final class HtmlWrapperTask extends Task implements DynamicAttribute
private static final String HISTORY_CSS = "history/history.css";
private static final String HISTORY_JS = "history/history.js";
private static final String HISTORY_FRAME_HTML = "history/historyFrame.html";
- private static final String PLAYERPRODUCTINSTALL_SWF = "playerProductInstall.swf";
+ private static final String EXPRESSINSTALL_SWF = "expressInstall.swf";
private static final String HTML_COMMENT_DELIMITER = "--";
private String application;
@@ -174,8 +174,8 @@ public final class HtmlWrapperTask extends Task implements DynamicAttribute
{
if(expressInstall)
{
- expressInstallSwf = PLAYERPRODUCTINSTALL_SWF;
- resources = new String[] {SWFOBJECT_JS, HISTORY_FRAME_HTML, HISTORY_JS, HISTORY_CSS, PLAYERPRODUCTINSTALL_SWF};
+ expressInstallSwf = EXPRESSINSTALL_SWF;
+ resources = new String[] {SWFOBJECT_JS, HISTORY_FRAME_HTML, HISTORY_JS, HISTORY_CSS, EXPRESSINSTALL_SWF};
versionDetection = true;
}
else
@@ -189,8 +189,8 @@ public final class HtmlWrapperTask extends Task implements DynamicAttribute
{
if(expressInstall)
{
- expressInstallSwf = PLAYERPRODUCTINSTALL_SWF;
- resources = new String[] {SWFOBJECT_JS, PLAYERPRODUCTINSTALL_SWF};
+ expressInstallSwf = EXPRESSINSTALL_SWF;
+ resources = new String[] {SWFOBJECT_JS, EXPRESSINSTALL_SWF};
versionDetection = true;
}
else
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/096baa7a/modules/antTasks/tests/html-wrapper-build.xml
----------------------------------------------------------------------
diff --git a/modules/antTasks/tests/html-wrapper-build.xml b/modules/antTasks/tests/html-wrapper-build.xml
index b0d747e..b3a6d9f 100644
--- a/modules/antTasks/tests/html-wrapper-build.xml
+++ b/modules/antTasks/tests/html-wrapper-build.xml
@@ -19,14 +19,17 @@
-->
-<project default="main" basedir=".">
+<project default="test-html-wrapper" basedir=".">
- <taskdef resource="flexTasks-internal.tasks" />
-
- <target name="main">
- <mkdir dir="default"/>
- <html-wrapper swf="bar" output="default"/>
- <mkdir dir="client-side-detection"/>
+ <taskdef resource="flexTasks.tasks"
+ classpath="../../../lib/flexTasks.jar"/>
+
+ <target name="test-html-wrapper" depends="clean-test-html-wrapper">
+ <!-- history = false, expressInstall = false -->
+ <mkdir dir="html-wrapper-tests/default"/>
+ <html-wrapper swf="bar" output="html-wrapper-tests/default"/>
+ <!-- history = false, expressInstall = true -->
+ <mkdir dir="html-wrapper-tests/express-installation"/>
<html-wrapper title="foo"
height="100"
width="100"
@@ -37,9 +40,10 @@
version-minor="0"
version-revision="0"
history="false"
- template="client-side-detection"
- output="client-side-detection"/>
- <mkdir dir="client-side-detection-with-history"/>
+ express-install="true"
+ output="html-wrapper-tests/express-installation"/>
+ <!-- history = true, expressInstall = true -->
+ <mkdir dir="html-wrapper-tests/express-installation-with-history"/>
<html-wrapper title="foo"
height="100"
width="100"
@@ -50,48 +54,10 @@
version-minor="0"
version-revision="0"
history="true"
- template="client-side-detection"
- output="client-side-detection-with-history"/>
- <mkdir dir="express-installation"/>
- <html-wrapper title="foo"
- height="100"
- width="100"
- bgcolor="red"
- application="bar"
- swf="bar"
- version-major="9"
- version-minor="0"
- version-revision="0"
- history="false"
- template="express-installation"
- output="express-installation"/>
- <mkdir dir="express-installation-with-history"/>
- <html-wrapper title="foo"
- height="100"
- width="100"
- bgcolor="red"
- application="bar"
- swf="bar"
- version-major="9"
- version-minor="0"
- version-revision="0"
- history="true"
- template="express-installation"
- output="express-installation-with-history"/>
- <mkdir dir="no-player-detection"/>
- <html-wrapper title="foo"
- height="100"
- width="100"
- bgcolor="red"
- application="bar"
- swf="bar"
- version-major="9"
- version-minor="0"
- version-revision="0"
- history="false"
- template="no-player-detection"
- output="no-player-detection"/>
- <mkdir dir="no-player-detection-with-history"/>
+ express-install="true"
+ output="html-wrapper-tests/express-installation-with-history"/>
+ <mkdir dir="html-wrapper-tests/history"/>
+ <!-- history = true, expressInstall = false -->
<html-wrapper title="foo"
height="100"
width="100"
@@ -101,19 +67,17 @@
version-major="9"
version-minor="0"
version-revision="0"
+ express-install="false"
history="true"
- template="no-player-detection"
- output="no-player-detection-with-history"/>
+ output="html-wrapper-tests/history"/>
+
</target>
- <target name="clean">
- <delete dir="default" />
- <delete dir="client-side-detection" />
- <delete dir="client-side-detection-with-history" />
- <delete dir="express-installation" />
- <delete dir="express-installation-with-history" />
- <delete dir="no-player-detection" />
- <delete dir="no-player-detection-with-history" />
+ <target name="clean-test-html-wrapper">
+ <delete dir="html-wrapper-tests/default" />
+ <delete dir="html-wrapper-tests/history" />
+ <delete dir="html-wrapper-tests/express-installation" />
+ <delete dir="html-wrapper-tests/express-installation-with-history" />
</target>
</project>