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 2016/04/10 07:57:42 UTC
[1/2] git commit: [flex-asjs] [refs/heads/e4x] - skip extern swc for
now
Repository: flex-asjs
Updated Branches:
refs/heads/e4x e2c462a07 -> a5ea916d7
skip extern swc for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/75bbdd3a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/75bbdd3a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/75bbdd3a
Branch: refs/heads/e4x
Commit: 75bbdd3a340bbe23b6a4ccb1db5d605b35403b4e
Parents: e2c462a
Author: Alex Harui <ah...@apache.org>
Authored: Sat Apr 9 22:57:08 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Apr 9 22:57:08 2016 -0700
----------------------------------------------------------------------
frameworks/projects/XML/build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/75bbdd3a/frameworks/projects/XML/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/build.xml b/frameworks/projects/XML/build.xml
index 6251bd9..7db690a 100644
--- a/frameworks/projects/XML/build.xml
+++ b/frameworks/projects/XML/build.xml
@@ -37,7 +37,9 @@
</path>
</target>
- <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of XML.swc">
+ <!--<target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,compile-extern-swc,copy-js,compile,test-js" description="Full build of XML.swc">
+ </target>-->
+ <target name="main" depends="clean,check-falcon-home,check-falconjx-home,more-props,compile-asjs,copy-js,compile,test-js" description="Full build of XML.swc">
</target>
<target name="test" unless="is.jenkins">
@@ -153,7 +155,7 @@
<load-config filename="src/main/resources/compile-asjs-config.xml" />
<arg value="+playerglobal.version=${playerglobal.version}" />
<arg value="+env.AIR_HOME=${env.AIR_HOME}" />
- <arg value="-external-library-path+=${JS.SWC}" />
+ <arg value="-external-library-path=${JS.SWC}" />
<!-- this is not on external-library path otherwise goog.requires are not generated -->
<arg value="-library-path+=${GCL.SWC}" />
<arg value="-define=COMPILE::AS3,false" />
[2/2] git commit: [flex-asjs] [refs/heads/e4x] - change how compile
flags are used so it builds successfully
Posted by ah...@apache.org.
change how compile flags are used so it builds successfully
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/a5ea916d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/a5ea916d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/a5ea916d
Branch: refs/heads/e4x
Commit: a5ea916d77840080e69510a092ac88bc2e670420
Parents: 75bbdd3
Author: Alex Harui <ah...@apache.org>
Authored: Sat Apr 9 22:57:35 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Sat Apr 9 22:57:35 2016 -0700
----------------------------------------------------------------------
.../projects/XML/src/main/flex/Namespace.as | 9 +--
frameworks/projects/XML/src/main/flex/QName.as | 10 ++-
frameworks/projects/XML/src/main/flex/XML.as | 72 +++++++++++++++++++-
.../projects/XML/src/main/flex/XMLList.as | 33 ++++++++-
4 files changed, 111 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/Namespace.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/Namespace.as b/frameworks/projects/XML/src/main/flex/Namespace.as
index c79ddbe..93f8eab 100644
--- a/frameworks/projects/XML/src/main/flex/Namespace.as
+++ b/frameworks/projects/XML/src/main/flex/Namespace.as
@@ -16,13 +16,12 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class Namespace
{
- public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
+ COMPILE::JS
+ public function Namespace(prefixOrUri:Object=null,uriValue:Object=null)
{
/*
When the Namespace constructor is called with a no arguments, one argument uriValue or two arguments prefixValue and uriValue, the following steps are taken:
@@ -119,16 +118,18 @@ package
_prefix = value;
}
+ COMPILE::JS
public function toString():String
{
return uri;
}
+ COMPILE::JS
override public function valueOf():*
{
return this;
}
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/QName.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/QName.as b/frameworks/projects/XML/src/main/flex/QName.as
index 5232bbe..5ed6d42 100644
--- a/frameworks/projects/XML/src/main/flex/QName.as
+++ b/frameworks/projects/XML/src/main/flex/QName.as
@@ -16,12 +16,11 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class QName
{
+ COMPILE::JS
public function QName(qNameOrUri:*=null,localNameVal:*=null)
{
/*
@@ -96,15 +95,19 @@ package
_prefix = value;
}
+ COMPILE::JS
public function toString():String
{
return _localName;
}
+ COMPILE::JS
public function equals(name:QName):Boolean
{
return this.uri == name.uri && this.localName == name.localName; // this.prefix == name.prefix &&
}
+
+ COMPILE::JS
public function matches(name:QName):Boolean
{
if(this.uri == "*" || name.uri == "*")
@@ -125,6 +128,7 @@ package
_isAttribute = value;
}
+ COMPILE::JS
public function getNamespace(namespaces:Array=null):Namespace
{
/*
@@ -158,5 +162,5 @@ package
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/XML.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XML.as b/frameworks/projects/XML/src/main/flex/XML.as
index 27a7094..720a6b0 100644
--- a/frameworks/projects/XML/src/main/flex/XML.as
+++ b/frameworks/projects/XML/src/main/flex/XML.as
@@ -16,8 +16,6 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class XML
@@ -31,6 +29,7 @@ package
static private var defaultNamespace:Namespace;
+ COMPILE::JS
static public function setDefaultNamespace(ns:*):void
{
if(!ns)
@@ -86,6 +85,7 @@ package
*/
static public var prettyPrinting:Boolean = true;
+ COMPILE::JS
static private function escapeAttributeValue(value:String):String
{
var outArr:Array = [];
@@ -118,6 +118,7 @@ package
return outArr.join("");
}
+ COMPILE::JS
static private function escapeElementValue(value:String):String
{
var i:int;
@@ -144,6 +145,7 @@ package
return outArr.join("");
}
+ COMPILE::JS
static private function insertAttribute(att:Attr,parent:XML):XML
{
var xml:XML = new XML();
@@ -154,6 +156,7 @@ package
parent.addChild(xml);
return xml;
}
+ COMPILE::JS
static private function iterateElement(node:Element,xml:XML):void
{
var i:int;
@@ -174,6 +177,7 @@ package
* returns an XML object from an existing node without the need to parse the XML.
* The new XML object is not normalized
*/
+ COMPILE::JS
static private function fromNode(node:Element):XML
{
var xml:XML;
@@ -227,6 +231,7 @@ package
return xml;
}
+ COMPILE::JS
static private function namespaceInArray(ns:Namespace,arr:Array,considerPrefix:Boolean=true):Boolean
{
if(!arr)
@@ -245,6 +250,7 @@ package
return false;
}
+ COMPILE::JS
static private function trimXMLWhitespace(value:String):String
{
return value.replace(/^\s+|\s+$/gm,'');
@@ -255,6 +261,7 @@ package
* @return
*
*/
+ COMPILE::JS
static public function defaultSettings():Object
{
return {
@@ -271,6 +278,7 @@ package
* @param rest
*
*/
+ COMPILE::JS
static public function setSettings(value:Object):void
{
if(!value)
@@ -289,6 +297,7 @@ package
* @return
*
*/
+ COMPILE::JS
static public function settings():Object
{
return {
@@ -301,6 +310,7 @@ package
}
+ COMPILE::JS
public function XML(xml:String = null)
{
if(xml)
@@ -357,6 +367,7 @@ package
*
*
*/
+ COMPILE::JS
public function addChild(child:XML):void
{
if(!child)
@@ -384,6 +395,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function addNamespace(ns:Namespace):XML
{
/*
@@ -442,6 +454,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function appendChild(child:XML):XML
{
/*
@@ -478,6 +491,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attribute(attributeName:*):XMLList
{
var i:int;
@@ -502,6 +516,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attributes():XMLList
{
var i:int;
@@ -520,6 +535,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function child(propertyName:Object):XMLList
{
/*
@@ -578,6 +594,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function childIndex():int
{
if(!_parent)
@@ -592,6 +609,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function children():XMLList
{
var i:int;
@@ -609,6 +627,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function comments():XMLList
{
var i:int;
@@ -622,6 +641,7 @@ package
return list;
}
+ COMPILE::JS
public function concat(list:*):XMLList
{
if(list is XML)
@@ -649,6 +669,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function contains(value:XML):Boolean
{
return this.equals(value);
@@ -660,6 +681,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function copy():XML
{
/*
@@ -698,6 +720,7 @@ package
return xml;
}
+ COMPILE::JS
private function deleteChildAt(idx:int):void
{
if(idx < 0)
@@ -716,6 +739,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function descendants(name:Object = "*"):XMLList
{
/*
@@ -766,6 +790,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function elements(name:Object = "*"):XMLList
{
if(!name)
@@ -786,6 +811,7 @@ package
return null;
}
+ COMPILE::JS
public function equals(xml:*):Boolean
{
/*
@@ -842,6 +868,7 @@ package
return true;
}
+ COMPILE::JS
public function hasAttribute(nameOrXML:*,value:String=null):Boolean
{
if(!_attributes)
@@ -869,6 +896,7 @@ package
return false;
}
+ COMPILE::JS
private function getAncestorNamespaces(namespaces:Array):Array
{
//don't modify original
@@ -909,11 +937,13 @@ package
return _children ? _children.slice() : [];
}
+ COMPILE::JS
public function getIndexOf(elem:XML):int
{
return _children.indexOf(elem);
}
+ COMPILE::JS
private function getURI(prefix:String):String
{
var i:int;
@@ -936,6 +966,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasComplexContent():Boolean
{
/*
@@ -956,6 +987,7 @@ package
return false;
}
+ COMPILE::JS
override public function hasOwnProperty(p:*):Boolean
{
/*
@@ -998,6 +1030,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasSimpleContent():Boolean
{
/*
@@ -1024,11 +1057,13 @@ package
* @return
*
*/
+ COMPILE::JS
public function inScopeNamespaces():Array
{
return _namespaces.slice();
}
+ COMPILE::JS
private function insertChildAt(child:XML,idx:int):void{
/*
When the [[Insert]] method of an XML object x is called with property name P and value V, the following steps are taken:
@@ -1067,6 +1102,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function insertChildAfter(child1:XML, child2:XML):XML
{
/*
@@ -1103,6 +1139,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function insertChildBefore(child1:XML, child2:XML):XML
{
/*
@@ -1139,6 +1176,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function length():int
{
return 1;
@@ -1150,6 +1188,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function localName():Object
{
return name().localName;
@@ -1163,6 +1202,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function name():Object
{
if(!_name)
@@ -1177,6 +1217,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function namespace(prefix:String = null):*
{
/*
@@ -1220,6 +1261,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function namespaceDeclarations():Array
{
/*
@@ -1290,6 +1332,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function normalize():XML
{
var len:int = _children.length-1;
@@ -1324,6 +1367,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function parent():*
{
return _parent;
@@ -1335,6 +1379,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function prependChild(child:XML):XML
{
child.setParent(this);
@@ -1351,6 +1396,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function processingInstructions(name:String = "*"):XMLList
{
return null;
@@ -1363,6 +1409,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function removeChild(child:XML):Boolean
{
/*
@@ -1417,6 +1464,7 @@ package
child.setParent(null);
return removed;
}
+ COMPILE::JS
private function removeChildByName(name:*):Boolean
{
var i:int;
@@ -1455,6 +1503,7 @@ package
}
return removedItem;
}
+ COMPILE::JS
public function removeChildAt(index:int):void
{
/*
@@ -1482,6 +1531,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function removeNamespace(ns:*):XML
{
/*
@@ -1543,6 +1593,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function replace(propertyName:Object, value:*):XML
{
/*
@@ -1575,6 +1626,7 @@ package
return null;
}
+ COMPILE::JS
private function replaceChild(idx:int,v:*):void
{
/*
@@ -1628,6 +1680,7 @@ package
}
}
+ COMPILE::JS
private function isAncestor(xml:XML):Boolean
{
var p:XML = parent();
@@ -1640,6 +1693,7 @@ package
return false;
}
+ COMPILE::JS
public function setAttribute(attr:*,value:String):void
{
var i:int;
@@ -1691,6 +1745,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function setChild(elementName:*, elements:Object):void
{
@@ -1809,6 +1864,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function setChildren(value:Object):XML
{
var i:int;
@@ -1861,6 +1917,7 @@ package
* @param name
*
*/
+ COMPILE::JS
public function setLocalName(name:String):void
{
if(!_name)
@@ -1875,6 +1932,7 @@ package
* @param name
*
*/
+ COMPILE::JS
public function setName(name:*):void
{
if(name is QName)
@@ -1889,6 +1947,7 @@ package
* @param ns
*
*/
+ COMPILE::JS
public function setNamespace(ns:Object):void
{
if(_nodeKind == "text" || _nodeKind == "comment" || _nodeKind == "processing-instruction")
@@ -1916,6 +1975,7 @@ package
_nodeKind = value;
}
+ COMPILE::JS
public function setParent(parent:XML):void
{
var oldParent:XML = _parent;
@@ -1936,6 +1996,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function text():XMLList
{
var list:XMLList = new XMLList();
@@ -1969,6 +2030,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toString():String
{
// text, comment, processing-instruction, attribute, or element
@@ -1981,6 +2043,7 @@ package
return toXMLString();
}
+ COMPILE::JS
private function toAttributeName(name:*):QName
{
var qname:QName;
@@ -1994,6 +2057,7 @@ package
qname.isAttribute = true;
return qname;
}
+ COMPILE::JS
private function toXMLName(name:*):QName
{
var qname:QName;
@@ -2049,6 +2113,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toXMLString(indentLevel:int=0,ancestors:Array=null):String
{
/*
@@ -2264,6 +2329,7 @@ package
* @return
*
*/
+ COMPILE::JS
override public function valueOf():*
{
return this;
@@ -2271,4 +2337,4 @@ package
}
}
-}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/a5ea916d/frameworks/projects/XML/src/main/flex/XMLList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/XML/src/main/flex/XMLList.as b/frameworks/projects/XML/src/main/flex/XMLList.as
index cacbfc1..ef16906 100644
--- a/frameworks/projects/XML/src/main/flex/XMLList.as
+++ b/frameworks/projects/XML/src/main/flex/XMLList.as
@@ -16,16 +16,16 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-COMPILE::JS
-{
package
{
public class XMLList
{
+ COMPILE::JS
public function XMLList()
{
addIndex(0);
}
+ COMPILE::JS
private var _xmlArray:Array = [];
/*
9.2.1.2 [[Put]] (P, V)
@@ -108,6 +108,7 @@ package
b. Call the [[Put]] method of x[0] with arguments P and V
4. Return
*/
+ COMPILE::JS
private function addIndex(idx:int):void
{
var idxStr:String = "" + idx;
@@ -145,6 +146,7 @@ package
);
}
+ COMPILE::JS
public function appendChild(child:XML):void
{
addIndex(_xmlArray.length);
@@ -158,6 +160,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attribute(attributeName:*):XMLList
{
var retVal:XMLList = new XMLList();
@@ -176,6 +179,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function attributes():XMLList
{
var retVal:XMLList = new XMLList();
@@ -195,6 +199,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function child(propertyName:Object):XMLList
{
var retVal:XMLList = new XMLList();
@@ -213,6 +218,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function children():XMLList
{
var retVal:XMLList = new XMLList();
@@ -231,6 +237,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function comments():XMLList
{
var retVal:XMLList = new XMLList();
@@ -244,6 +251,7 @@ package
return retVal;
}
+ COMPILE::JS
public function concat(list:*):XMLList
{
if(list is XML)
@@ -269,6 +277,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function contains(value:XML):Boolean
{
@@ -287,6 +296,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function copy():XMLList
{
var retVal:XMLList = new XMLList();
@@ -304,6 +314,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function descendants(name:Object = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -324,6 +335,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function elements(name:Object = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -337,6 +349,7 @@ package
return retVal;
}
+ COMPILE::JS
public function equals(list:*):Boolean
{
/*
@@ -364,6 +377,7 @@ package
return false;
}
+ COMPILE::JS
public function hasComplexContent():Boolean
{
//what to do with multiple nodes? If anything is complex, we return true.
@@ -378,6 +392,7 @@ package
return false;
}
+ COMPILE::JS
override public function hasOwnProperty(propertyName:*):Boolean
{
/*
@@ -410,6 +425,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function hasSimpleContent():Boolean
{
//what to do with multiple nodes? If anything is complex, we return false.
@@ -430,6 +446,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function length():int
{
return _xmlArray.length;
@@ -442,6 +459,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function normalize():XMLList
{
/*
@@ -472,6 +490,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function parent():Object
{
if(_xmlArray.length == 0)
@@ -493,6 +512,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function processingInstructions(name:String = "*"):XMLList
{
var retVal:XMLList = new XMLList();
@@ -513,6 +533,7 @@ package
return retVal;
}
+ COMPILE::JS
public function removeChild(child:*):void
{
var i:int;
@@ -538,6 +559,7 @@ package
}
}
+ COMPILE::JS
public function removeChildAt(idx:int):void
{
if(idx >= 0 && idx < _xmlArray.length)
@@ -580,6 +602,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function text():XMLList
{
var retVal:XMLList = new XMLList();
@@ -599,6 +622,7 @@ package
* @return
*
*/
+ COMPILE::JS
override public function toLocaleString():String
{
var retVal:Array = [];
@@ -618,6 +642,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toString():String
{
var retVal:Array = [];
@@ -637,6 +662,7 @@ package
* @return
*
*/
+ COMPILE::JS
public function toXMLString():String
{
var retVal:Array = [];
@@ -656,10 +682,11 @@ package
* @return
*
*/
+ COMPILE::JS
override public function valueOf():*
{
return this;
}
}
}
-}
+