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/10/31 06:15:47 UTC
[1/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - Added spelling config to base
directory so squiggly examples work in full app
Repository: flex-utilities
Updated Branches:
refs/heads/apache-tour-de-flex-1.2 b8e8a5373 -> fe282f4c4
Added spelling config to base directory so squiggly examples work in full app
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/d03df2f6
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/d03df2f6
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/d03df2f6
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: d03df2f62cdf934fe6ca766a58042564388e32d6
Parents: b8e8a53
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:11:02 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:11:02 2014 +1100
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/SpellingConfig.xml | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/d03df2f6/TourDeFlex/TourDeFlex3/src/SpellingConfig.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/SpellingConfig.xml b/TourDeFlex/TourDeFlex3/src/SpellingConfig.xml
new file mode 100644
index 0000000..dfae724
--- /dev/null
+++ b/TourDeFlex/TourDeFlex3/src/SpellingConfig.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<!--
+
+ 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.
+
+-->
+<SpellingConfig>
+ <LanguageResource language="English (British)" languageCode="en_GB" ruleFile="./dictionaries/en_GB/en_GB.aff" dictionaryFile="./dictionaries/en_GB/en_GB.dic"/>
+ <LanguageResource language="English (US)" languageCode="en_US" ruleFile="./dictionaries/en_US/en_US.aff" dictionaryFile="./dictionaries/en_US/en_US.dic"/>
+</SpellingConfig>
[4/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - clean up example
Posted by jm...@apache.org.
clean up example
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/4de22cf6
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/4de22cf6
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/4de22cf6
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: 4de22cf6689b0ee6f07d87e438763daca16af8a3
Parents: fd1f89b
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:12:32 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:12:32 2014 +1100
----------------------------------------------------------------------
.../src/apache/squiggly/SpellingExExample.mxml | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4de22cf6/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExExample.mxml b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExExample.mxml
index d6aea3a..547b45c 100644
--- a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExExample.mxml
@@ -17,11 +17,16 @@
limitations under the License.
-->
-<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
- xmlns:s="library://ns.adobe.com/flex/spark">
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009"
+ xmlns:s="library://ns.adobe.com/flex/spark"
+ xmlns:mx="library://ns.adobe.com/flex/mx">
<fx:Script>
<![CDATA[
- import com.adobe.linguistics.spelling.SpellUI;
+ import com.adobe.linguistics.spelling.SpellUI;
+
+ private function enableSpelling():void {
+ SpellUI.enableSpelling(textArea, "en_US");
+ }
]]>
</fx:Script>
@@ -30,10 +35,10 @@
<s:VerticalLayout paddingLeft="10" paddingRight="10" paddingTop="10" paddingBottom="10"/>
</s:layout>
<s:Group width="100%" height="100%">
- <s:TextArea id="ta_en" width="50%" height="50%"
- text="I know Enlish. Use the context menu to see the suggestions of the missbelled word."
- creationComplete="SpellUI.enableSpelling(ta_en, 'en_US')"/>
+ <s:TextArea id="textArea" width="50%" height="50%"
+ text="I know Enlish. Use the context menu to see the suggestions of the missbelled word." />
</s:Group>
+ <s:Button label="Check Spelling" click="enableSpelling()" />
</s:Panel>
</s:Application>
[5/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - moved to using swf object
Posted by jm...@apache.org.
moved to using swf object
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/116e5521
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/116e5521
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/116e5521
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: 116e5521a79f3380a8589c3a5d3df653209c4cd7
Parents: 4de22cf
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:14:13 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:14:13 2014 +1100
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/AC_OETags.js | 282 ---------------------------
1 file changed, 282 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/116e5521/TourDeFlex/TourDeFlex3/src/AC_OETags.js
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/AC_OETags.js b/TourDeFlex/TourDeFlex3/src/AC_OETags.js
deleted file mode 100755
index 89f7a73..0000000
--- a/TourDeFlex/TourDeFlex3/src/AC_OETags.js
+++ /dev/null
@@ -1,282 +0,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.
- */
-var isIE = (navigator.appVersion.indexOf("MSIE") != -1) ? true : false;
-var isWin = (navigator.appVersion.toLowerCase().indexOf("win") != -1) ? true : false;
-var isOpera = (navigator.userAgent.indexOf("Opera") != -1) ? true : false;
-
-function ControlVersion()
-{
- var version;
- var axo;
- var e;
-
- // NOTE : new ActiveXObject(strFoo) throws an exception if strFoo isn't in the registry
-
- try {
- // version will be set for 7.X or greater players
- axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.7");
- version = axo.GetVariable("$version");
- } catch (e) {
- }
-
- if (!version)
- {
- try {
- // version will be set for 6.X players only
- axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.6");
-
- // installed player is some revision of 6.0
- // GetVariable("$version") crashes for versions 6.0.22 through 6.0.29,
- // so we have to be careful.
-
- // default to the first public version
- version = "WIN 6,0,21,0";
-
- // throws if AllowScripAccess does not exist (introduced in 6.0r47)
- axo.AllowScriptAccess = "always";
-
- // safe to call for 6.0r47 or greater
- version = axo.GetVariable("$version");
-
- } catch (e) {
- }
- }
-
- if (!version)
- {
- try {
- // version will be set for 4.X or 5.X player
- axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
- version = axo.GetVariable("$version");
- } catch (e) {
- }
- }
-
- if (!version)
- {
- try {
- // version will be set for 3.X player
- axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash.3");
- version = "WIN 3,0,18,0";
- } catch (e) {
- }
- }
-
- if (!version)
- {
- try {
- // version will be set for 2.X player
- axo = new ActiveXObject("ShockwaveFlash.ShockwaveFlash");
- version = "WIN 2,0,0,11";
- } catch (e) {
- version = -1;
- }
- }
-
- return version;
-}
-
-// JavaScript helper required to detect Flash Player PlugIn version information
-function GetSwfVer(){
- // NS/Opera version >= 3 check for Flash plugin in plugin array
- var flashVer = -1;
-
- if (navigator.plugins != null && navigator.plugins.length > 0) {
- if (navigator.plugins["Shockwave Flash 2.0"] || navigator.plugins["Shockwave Flash"]) {
- var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
- var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
- var descArray = flashDescription.split(" ");
- var tempArrayMajor = descArray[2].split(".");
- var versionMajor = tempArrayMajor[0];
- var versionMinor = tempArrayMajor[1];
- if ( descArray[3] != "" ) {
- tempArrayMinor = descArray[3].split("r");
- } else {
- tempArrayMinor = descArray[4].split("r");
- }
- var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
- var flashVer = versionMajor + "." + versionMinor + "." + versionRevision;
- }
- }
- // MSN/WebTV 2.6 supports Flash 4
- else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.6") != -1) flashVer = 4;
- // WebTV 2.5 supports Flash 3
- else if (navigator.userAgent.toLowerCase().indexOf("webtv/2.5") != -1) flashVer = 3;
- // older WebTV supports Flash 2
- else if (navigator.userAgent.toLowerCase().indexOf("webtv") != -1) flashVer = 2;
- else if ( isIE && isWin && !isOpera ) {
- flashVer = ControlVersion();
- }
- return flashVer;
-}
-
-// When called with reqMajorVer, reqMinorVer, reqRevision returns true if that version or greater is available
-function DetectFlashVer(reqMajorVer, reqMinorVer, reqRevision)
-{
- versionStr = GetSwfVer();
- if (versionStr == -1 ) {
- return false;
- } else if (versionStr != 0) {
- if(isIE && isWin && !isOpera) {
- // Given "WIN 2,0,0,11"
- tempArray = versionStr.split(" "); // ["WIN", "2,0,0,11"]
- tempString = tempArray[1]; // "2,0,0,11"
- versionArray = tempString.split(","); // ['2', '0', '0', '11']
- } else {
- versionArray = versionStr.split(".");
- }
- var versionMajor = versionArray[0];
- var versionMinor = versionArray[1];
- var versionRevision = versionArray[2];
-
- // is the major.revision >= requested major.revision AND the minor version >= requested minor
- if (versionMajor > parseFloat(reqMajorVer)) {
- return true;
- } else if (versionMajor == parseFloat(reqMajorVer)) {
- if (versionMinor > parseFloat(reqMinorVer))
- return true;
- else if (versionMinor == parseFloat(reqMinorVer)) {
- if (versionRevision >= parseFloat(reqRevision))
- return true;
- }
- }
- return false;
- }
-}
-
-function AC_AddExtension(src, ext)
-{
- if (src.indexOf('?') != -1)
- return src.replace(/\?/, ext+'?');
- else
- return src + ext;
-}
-
-function AC_Generateobj(objAttrs, params, embedAttrs)
-{
- var str = '';
- if (isIE && isWin && !isOpera)
- {
- str += '<object ';
- for (var i in objAttrs)
- str += i + '="' + objAttrs[i] + '" ';
- for (var i in params)
- str += '><param name="' + i + '" value="' + params[i] + '" /> ';
- str += '></object>';
- } else {
- str += '<embed ';
- for (var i in embedAttrs)
- str += i + '="' + embedAttrs[i] + '" ';
- str += '> </embed>';
- }
-
- document.write(str);
-}
-
-function AC_FL_RunContent(){
- var ret =
- AC_GetArgs
- ( arguments, ".swf", "movie", "clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- , "application/x-shockwave-flash"
- );
- AC_Generateobj(ret.objAttrs, ret.params, ret.embedAttrs);
-}
-
-function AC_GetArgs(args, ext, srcParamName, classid, mimeType){
- var ret = new Object();
- ret.embedAttrs = new Object();
- ret.params = new Object();
- ret.objAttrs = new Object();
- for (var i=0; i < args.length; i=i+2){
- var currArg = args[i].toLowerCase();
-
- switch (currArg){
- case "classid":
- break;
- case "pluginspage":
- ret.embedAttrs[args[i]] = args[i+1];
- break;
- case "src":
- case "movie":
- args[i+1] = AC_AddExtension(args[i+1], ext);
- ret.embedAttrs["src"] = args[i+1];
- ret.params[srcParamName] = args[i+1];
- break;
- case "onafterupdate":
- case "onbeforeupdate":
- case "onblur":
- case "oncellchange":
- case "onclick":
- case "ondblClick":
- case "ondrag":
- case "ondragend":
- case "ondragenter":
- case "ondragleave":
- case "ondragover":
- case "ondrop":
- case "onfinish":
- case "onfocus":
- case "onhelp":
- case "onmousedown":
- case "onmouseup":
- case "onmouseover":
- case "onmousemove":
- case "onmouseout":
- case "onkeypress":
- case "onkeydown":
- case "onkeyup":
- case "onload":
- case "onlosecapture":
- case "onpropertychange":
- case "onreadystatechange":
- case "onrowsdelete":
- case "onrowenter":
- case "onrowexit":
- case "onrowsinserted":
- case "onstart":
- case "onscroll":
- case "onbeforeeditfocus":
- case "onactivate":
- case "onbeforedeactivate":
- case "ondeactivate":
- case "type":
- case "codebase":
- case "id":
- ret.objAttrs[args[i]] = args[i+1];
- break;
- case "width":
- case "height":
- case "align":
- case "vspace":
- case "hspace":
- case "class":
- case "title":
- case "accesskey":
- case "name":
- case "tabindex":
- ret.embedAttrs[args[i]] = ret.objAttrs[args[i]] = args[i+1];
- break;
- default:
- ret.embedAttrs[args[i]] = ret.params[args[i]] = args[i+1];
- }
- }
- ret.objAttrs["classid"] = classid;
- if (mimeType) ret.embedAttrs["type"] = mimeType;
- return ret;
-}
-
-
[2/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - fix spelling config
Posted by jm...@apache.org.
fix spelling config
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/1647766c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/1647766c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/1647766c
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: 1647766c5deeb07b9a0d10e081d362813ebdf0e8
Parents: d03df2f
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:11:32 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:11:32 2014 +1100
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/1647766c/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml
index 300e394..dfae724 100644
--- a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml
+++ b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingConfig.xml
@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding='UTF-8'?>
+<?xml version="1.0" encoding='UTF-8'?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,6 +18,6 @@
-->
<SpellingConfig>
- <LanguageResource language="English (British)" languageCode="en_GB" ruleFile="./dictionaries/en_GB/en_GB.aff" dictionaryFile="dictionaries/en_GB/en_GB.dic"/>
- <LanguageResource language="English (US)" languageCode="en_US" ruleFile="./dictionaries/en_US/en_US.aff" dictionaryFile="dictionaries/en_US/en_US.dic"/>
+ <LanguageResource language="English (British)" languageCode="en_GB" ruleFile="./dictionaries/en_GB/en_GB.aff" dictionaryFile="./dictionaries/en_GB/en_GB.dic"/>
+ <LanguageResource language="English (US)" languageCode="en_US" ruleFile="./dictionaries/en_US/en_US.aff" dictionaryFile="./dictionaries/en_US/en_US.dic"/>
</SpellingConfig>
[3/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - remove unneeded ids
Posted by jm...@apache.org.
remove unneeded ids
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fd1f89be
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fd1f89be
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fd1f89be
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: fd1f89be92e8beccd592fb32c36b6d3ef875ae2d
Parents: 1647766
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:11:57 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:11:57 2014 +1100
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fd1f89be/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml
index 13e1985..9f1fdb1 100644
--- a/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/apache/squiggly/SpellingExample.mxml
@@ -40,8 +40,8 @@ limitations under the License.
</s:layout>
<s:VGroup width="100%" height="100%">
<mx:TextArea id="textArea" width="50%" height="50%" text="Spell cheecking in TextArea"/>
- <mx:Button id="tt2" label="Check British English" click="enableGB()" />
- <mx:Button id="tt3" label="Check American English" click="enableUS()" />
+ <mx:Button label="Check British English" click="enableGB()" />
+ <mx:Button label="Check American English" click="enableUS()" />
</s:VGroup>
</s:Panel>
[6/6] git commit: [flex-utilities]
[refs/heads/apache-tour-de-flex-1.2] - compile squiggly examples so that they
work and add swf object to release bundle
Posted by jm...@apache.org.
compile squiggly examples so that they work and add swf object to release bundle
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/fe282f4c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/fe282f4c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/fe282f4c
Branch: refs/heads/apache-tour-de-flex-1.2
Commit: fe282f4c474223be019cd01dc75282f0164ec372
Parents: 116e552
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Oct 31 16:15:15 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Oct 31 16:15:15 2014 +1100
----------------------------------------------------------------------
TourDeFlex/TourDeFlex3/build.xml | 68 ++++++++++++++++++++++++++++-------
1 file changed, 55 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/fe282f4c/TourDeFlex/TourDeFlex3/build.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/build.xml b/TourDeFlex/TourDeFlex3/build.xml
index 07af642..b29e8ab 100644
--- a/TourDeFlex/TourDeFlex3/build.xml
+++ b/TourDeFlex/TourDeFlex3/build.xml
@@ -67,16 +67,36 @@
</sequential>
</macrodef>
- <macrodef name="compile-mxml-libs">
+ <macrodef name="compile-mxml-squiggly-mx-libs">
<attribute name="example"/>
<sequential>
<mxmlc file="${basedir}/src/@{example}.mxml"
output="${basedir}/src/@{example}.swf" fork="true" failonerror="true">
<load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
- <compiler.library-path dir="${basedir}/libs" append="true">
- <include name="*.swc" />
- </compiler.library-path>
+ <compiler.include-libraries dir="${basedir}/libs" append="true">
+ <include name="ApacheFlexLinguisticUtils.swc" />
+ <include name="ApacheflexSpellingEngine.swc" />
+ <include name="ApacheFlexSpellingFramework.swc" />
+ <include name="ApacheFlexSpellingUI.swc" />
+ </compiler.include-libraries>
+ </mxmlc>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="compile-mxml-squiggly-spark-libs">
+ <attribute name="example"/>
+
+ <sequential>
+ <mxmlc file="${basedir}/src/@{example}.mxml"
+ output="${basedir}/src/@{example}.swf" fork="true" failonerror="true">
+ <load-config filename="${FLEX_HOME}/frameworks/flex-config.xml"/>
+ <compiler.include-libraries dir="${basedir}/libs" append="true">
+ <include name="ApacheFlexLinguisticUtils.swc" />
+ <include name="ApacheflexSpellingEngine.swc" />
+ <include name="ApacheFlexSpellingFramework.swc" />
+ <include name="ApacheFlexSpellingUIEx.swc" />
+ </compiler.include-libraries>
</mxmlc>
</sequential>
</macrodef>
@@ -443,6 +463,10 @@
<property name="mirror.url" value="http://flex.apache.org/single-mirror-url.cgi" />
<property name="squiggly.folder" value="flex/squiggly/1.1" />
+ <condition property="isWindows" value="true">
+ <os family="windows" />
+ </condition>
+
<condition property="squiggly.file" value="apache-flex-squiggly-1.1-bin.zip">
<os family="windows" />
</condition>
@@ -456,14 +480,24 @@
<target name="compile-squiggly" description="compile apache squiggly examples" depends="squiggly-download">
<compile-mxml example="/apache/Squiggly1_1"/>
- <compile-mxml-libs example="/apache/squiggly/SpellingExample"/>
- <compile-mxml-libs example="/apache/squiggly/SpellingExExample"/>
+ <compile-mxml-squiggly-mx-libs example="/apache/squiggly/SpellingExample"/>
+ <compile-mxml-squiggly-spark-libs example="/apache/squiggly/SpellingExExample"/>
</target>
<target name="squiggly-check" description="Checks if Squiggly has been downloaded.">
<available file="${basedir}/libs/ApacheFlexSpellingEngine.swc" property="sqigggly.present"/>
</target>
-
+
+ <target name="squiggly-untar" unless="isWindows">
+ <mkdir dir="${unpack.dir}"/>
+ <untar dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" compression="gzip" />
+ </target>
+
+ <target name="squiggly-unzip" if="isWindows">
+ <mkdir dir="${unpack.dir}"/>
+ <unzip dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" />
+ </target>
+
<target name="squiggly-download" depends="squiggly-check" unless="sqigggly.present" description="Downloads squiggly SDK">
<mkdir dir="${download.dir}"/>
@@ -477,10 +511,9 @@
<get src="${squiggly.url}/${squiggly.folder}/${squiggly.file}"
dest="${download.dir}/${squiggly.file}"
verbose="true"/>
-
- <!-- TODO upzip on windows -->
- <mkdir dir="${unpack.dir}"/>
- <untar dest="${unpack.dir}" src="${download.dir}/${squiggly.file}" compression="gzip" />
+
+ <ant target="squiggly-untar" />
+ <ant target="squiggly-unzip" />
<mkdir dir="libs"/>
<copy todir="libs">
@@ -489,6 +522,15 @@
</fileset>
</copy>
+ <!-- So squiggly works in Tour De Flex app -->
+ <mkdir dir="dictionaries"/>
+ <copy todir="dictionaries">
+ <fileset dir="${unpack.dir}/dictionaries">
+ <include name="*.*" />
+ </fileset>
+ </copy>
+
+ <!-- So squiggly works stand alone -->
<mkdir dir="dictionaries"/>
<copy todir="dictionaries">
<fileset dir="${unpack.dir}/dictionaries">
@@ -521,7 +563,7 @@
<include name="src/favicon.ico" />
<include name="src/index.html" />
<include name="src/explorer.xml" />
- <include name="src/AC_OETags.js" />
+ <include name="src/swfobject.js" />
<include name="**/*.mxml" />
<include name="**/*.as" />
<include name="**/*.jpg" />
@@ -552,7 +594,7 @@
<include name="src/favicon.ico" />
<include name="src/index.html" />
<include name="src/explorer.xml" />
- <include name="src/AC_OETags.js" />
+ <include name="src/swfobject.js" />
<include name="**/*.mxml" />
<include name="**/*.as" />
<include name="**/*.jpg" />