Return-Path: <commits-return-36529-archive-asf-public=cust-asf.ponee.io@flex.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 992CD200CC5
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 26 Jun 2017 18:12:25 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 983E1160BFB; Mon, 26 Jun 2017 16:12:25 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id EC261160BFD
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 26 Jun 2017 18:12:24 +0200 (CEST)
Received: (qmail 68036 invoked by uid 500); 26 Jun 2017 16:12:24 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 67963 invoked by uid 99); 26 Jun 2017 16:12:24 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Jun 2017 16:12:24 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id B50DEE96DF; Mon, 26 Jun 2017 16:12:23 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Mon, 26 Jun 2017 16:12:28 -0000
Message-Id: <67c66f6431944ddb90759b87815c8129@git.apache.org>
In-Reply-To: <4065bd1036ec433a9c754cdf2eb6b47d@git.apache.org>
References: <4065bd1036ec433a9c754cdf2eb6b47d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
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
archived-at: Mon, 26 Jun 2017 16:12:25 -0000

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) {}
  
  /**