flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject [08/50] [abbrv] flex-typedefs git commit: Revert "patch $ command in jquery"
Date Sun, 17 Jul 2016 16:49:40 GMT
Revert "patch $ command in jquery"

This reverts commit f192872530bdc91ce9aac82c5d01722a265d8655.


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

Branch: refs/heads/master
Commit: 0faa04ff4da62952d7d88e0a0ad44f17bd0ac80d
Parents: e15e5d9
Author: Alex Harui <aharui@apache.org>
Authored: Tue May 24 16:28:15 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue May 24 16:28:15 2016 -0700

----------------------------------------------------------------------
 jquery/build.xml                   | 34 ++++-----------------------------
 jquery/src/main/patch/jquery.patch | 12 ------------
 2 files changed, 4 insertions(+), 42 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/0faa04ff/jquery/build.xml
----------------------------------------------------------------------
diff --git a/jquery/build.xml b/jquery/build.xml
index 9c8ef17..bd3421e 100644
--- a/jquery/build.xml
+++ b/jquery/build.xml
@@ -23,37 +23,11 @@
     
     <target name="main" depends="preprocess, externc, postprocess, compc" />
 
-    <target name="preprocess" depends="download">
-        <exec executable="git" dir="${basedir}/../..">
-            <arg value="apply"/>
-            <arg value="${basedir}/src/main/patch/jquery.patch"/>
-        </exec>
-    </target>
-
-    <target name="make_patch" depends="download">
-        <mkdir dir="${basedir}/target/reference" />
-        <copy todir="${basedir}/target/reference" file="${basedir}/target/downloads/jquery-1.9.js"
/>
-        <!-- we manually edit the jquery file to set the type of the $ const, then run
ant diff -->
-        <!--<antcall target="diff" />-->
-    </target>
-
-    <target name="diff" >
-        <delete dir="${basedir}/src/main/patch" />
-        <mkdir dir="${basedir}/src/main/patch" />
-        <exec executable="git" output="${basedir}/src/main/patch/jquery.patch" >
-            <arg value="diff"/>
-            <arg value="--no-index"/>
-            <arg value="--"/>
-            <arg value="${basedir}/target/reference"/>
-            <arg value="${basedir}/target/downloads"/>
-        </exec>
-        <replace file="${basedir}/src/main/patch/jquery.patch" token="target/reference"
value="target/downloads" />
-        <replace file="${basedir}/src/main/patch/jquery.patch" token="${basedir}/target/downloads"
value="/externs/jquery/target/downloads" />
-    </target>
-
-    <target name="download" >
+    <!-- we need to insert a line near the beginning of the file to make the
+         compiler happy. -->
+    <target name="preprocess">
         <mkdir dir="${basedir}/target/downloads" />
-        <get src="https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/jquery-1.9.js"
dest="${basedir}/target/downloads/jquery-1.9.js"/>
+        <get src="https://raw.githubusercontent.com/google/closure-compiler/master/contrib/externs/jquery-1.9.js"
dest="${basedir}/target/downloads/jquery-1.9.js" skipexisting="true"/>
     </target>
     
     <target name="externc" >

http://git-wip-us.apache.org/repos/asf/flex-typedefs/blob/0faa04ff/jquery/src/main/patch/jquery.patch
----------------------------------------------------------------------
diff --git a/jquery/src/main/patch/jquery.patch b/jquery/src/main/patch/jquery.patch
deleted file mode 100644
index 6e39d18..0000000
--- a/jquery/src/main/patch/jquery.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/externs/jquery/target/downloads/jquery-1.9.js b/externs/jquery/target/downloads/jquery-1.9.js
-index d00166a..1d85908 100644
---- a/externs/jquery/target/downloads/jquery-1.9.js
-+++ b/externs/jquery/target/downloads/jquery-1.9.js
-@@ -156,6 +156,7 @@ function jQuery(arg1, arg2) {}
- 
- /**
-  * @const
-+ * @type {!jQuery}
-  */
- var $ = jQuery;
- 


Mime
View raw message