flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [06/36] flex-typedefs git commit: try to use patch instead of post process so Maven will see it. The default value isn't correct, but I don't think that matters
Date Mon, 26 Jun 2017 16:12:28 GMT
try to use patch instead of post process so Maven will see it.  The default value isn't correct,
but I don't think that matters


Project: http://git-wip-us.apache.org/repos/asf/flex-typedefs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-typedefs/commit/e7609344
Tree: http://git-wip-us.apache.org/repos/asf/flex-typedefs/tree/e7609344
Diff: http://git-wip-us.apache.org/repos/asf/flex-typedefs/diff/e7609344

Branch: refs/heads/master
Commit: e7609344d2f519fd106b2a647e75d73f3563a8e4
Parents: 13b17b1
Author: Alex Harui <aharui@apache.org>
Authored: Tue Nov 1 16:02:29 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Nov 1 16:02:29 2016 -0700

----------------------------------------------------------------------
 js/build.xml               |  9 ++++++---
 js/src/main/patch/js.patch | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/e7609344/js/build.xml
----------------------------------------------------------------------
diff --git a/js/build.xml b/js/build.xml
index eb1ba0e..302c0fc 100644
--- a/js/build.xml
+++ b/js/build.xml
@@ -114,6 +114,12 @@
         <replaceregexp file="${basedir}/target/downloads/es3.js" match="(The constructor
of the current object(?:(?!\*/).)*?)@type \{Function\}((?:(?!\*/).)*?\*/[\r\n]+Object\.prototype\.constructor)([^;]*?);"
replace="\1@type {Class}\2;" flags="s" />
         <replaceregexp file="${basedir}/target/downloads/es3.js" match="(Transposes the
elements of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @this)" replace="\1\2
* @return {!Array&lt;?&gt;}\2\3" flags="s" />
         <replaceregexp file="${basedir}/target/downloads/es3.js" match="(Sorts the elements
of an array in place(?:(?!\*/).)*?[\r\n]+ \*)([\r\n]+)( \* @param)" replace="\1\2 * @return
{!Array&lt;?&gt;}\2\3" flags="s" />
+        <replace file="${basedir}/target/downloads/es3.js" >
+            <replacefilter token="function parseInt(num, base)" value="function parseInt(num,
opt_base)" />
+        </replace>
+        <replace file="${basedir}/target/downloads/es3.js" >
+            <replacefilter token="param {number|undefined} base" value="param {number=}
base" />
+        </replace>
         <antcall target="diff" />
     </target>
 
@@ -157,9 +163,6 @@
     </target>
     
     <target name="postprocess" >
-        <replace file="${basedir}/target/generated-sources/externc/functions/parseInt.as"
>
-            <replacefilter token="base:Number)" value="base:Number = 10)" />
-        </replace>
     </target>
     
     <target name="compc" >

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/e7609344/js/src/main/patch/js.patch
----------------------------------------------------------------------
diff --git a/js/src/main/patch/js.patch b/js/src/main/patch/js.patch
index cae08d5..f54f48f 100644
--- a/js/src/main/patch/js.patch
+++ b/js/src/main/patch/js.patch
@@ -16,9 +16,24 @@
 
 Generated from Ant script
 diff --git a/js/target/downloads/es3.js b/js/target/downloads/es3.js
-index fa5e5a6..6c5e3e7 100644
+index fa5e5a6..a6e4fa0 100644
 --- a/js/target/downloads/es3.js
 +++ b/js/target/downloads/es3.js
+@@ -174,12 +174,12 @@ function parseFloat(num) {}
+  * leader, then pass {@code undefined} as the base.
+  *
+  * @param {*} num
+- * @param {number|undefined} base
++ * @param {number=} base
+  * @return {number}
+  * @nosideeffects
+  * @see http://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/parseInt
+  */
+-function parseInt(num, base) {}
++function parseInt(num, opt_base) {}
+ 
+ /**
+  * @param {string} code
 @@ -201,10 +201,10 @@ function Object(opt_value) {}
  
  /**


Mime
View raw message