[Jython-checkins] jython: Backed out JNR and JFFI upgrade in 7235:01460e803ef3, because this was causing

jim.baker jython-checkins at python.org
Sun May 18 02:46:29 CEST 2014


http://hg.python.org/jython/rev/05622c95c3d7
changeset:   7255:05622c95c3d7
user:        Jim Baker <jim.baker at rackspace.com>
date:        Sat May 17 18:46:28 2014 -0600
summary:
  Backed out JNR and JFFI upgrade in 7235:01460e803ef3, because this was causing problems on Windows

files:
  build.xml                                            |   58 +++++++--
  extlibs/jffi-1.2.6.jar                               |  Bin 
  extlibs/jffi-1.2.7-native.jar                        |  Bin 
  extlibs/jffi-1.2.7.jar                               |  Bin 
  extlibs/jffi-Darwin.jar                              |  Bin 
  extlibs/jffi-arm-Linux.jar                           |  Bin 
  extlibs/jffi-i386-FreeBSD.jar                        |  Bin 
  extlibs/jffi-i386-Linux.jar                          |  Bin 
  extlibs/jffi-i386-OpenBSD.jar                        |  Bin 
  extlibs/jffi-i386-SunOS.jar                          |  Bin 
  extlibs/jffi-i386-Windows.jar                        |  Bin 
  extlibs/jffi-ppc-AIX.jar                             |  Bin 
  extlibs/jffi-ppc-Linux.jar                           |  Bin 
  extlibs/jffi-ppc64-Linux.jar                         |  Bin 
  extlibs/jffi-s390x-Linux.jar                         |  Bin 
  extlibs/jffi-sparc-SunOS.jar                         |  Bin 
  extlibs/jffi-sparcv9-SunOS.jar                       |  Bin 
  extlibs/jffi-x86_64-FreeBSD.jar                      |  Bin 
  extlibs/jffi-x86_64-Linux.jar                        |  Bin 
  extlibs/jffi-x86_64-OpenBSD.jar                      |  Bin 
  extlibs/jffi-x86_64-SunOS.jar                        |  Bin 
  extlibs/jffi-x86_64-Windows.jar                      |  Bin 
  extlibs/jnr-constants-0.8.4.jar                      |  Bin 
  extlibs/jnr-constants-0.8.5.jar                      |  Bin 
  extlibs/jnr-ffi-0.7.10.jar                           |  Bin 
  extlibs/jnr-ffi-1.0.10.jar                           |  Bin 
  extlibs/jnr-netdb-1.1.1.jar                          |  Bin 
  extlibs/jnr-netdb-1.1.2.jar                          |  Bin 
  extlibs/jnr-posix-2.4.0.jar                          |  Bin 
  extlibs/jnr-posix-3.0.1.jar                          |  Bin 
  src/org/python/modules/posix/PythonPOSIXHandler.java |    8 +-
  31 files changed, 47 insertions(+), 19 deletions(-)


diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -154,12 +154,29 @@
             <pathelement path="${extlibs.dir}/asm-util-4.0.jar" />
             <pathelement path="${extlibs.dir}/guava-17.0.jar" />
             <pathelement path="${extlibs.dir}/icu4j-52_1.jar" />
-            <pathelement path="${extlibs.dir}/jffi-1.2.7.jar"/>
-            <pathelement path="${extlibs.dir}/jffi-1.2.7-native.jar"/>
-            <pathelement path="${extlibs.dir}/jnr-constants-0.8.5.jar"/>
-            <pathelement path="${extlibs.dir}/jnr-ffi-1.0.10.jar"/>
-            <pathelement path="${extlibs.dir}/jnr-netdb-1.1.2.jar"/>
-            <pathelement path="${extlibs.dir}/jnr-posix-3.0.1.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-arm-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-Darwin.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-i386-FreeBSD.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-i386-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-i386-OpenBSD.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-i386-SunOS.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-i386-Windows.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-ppc-AIX.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-ppc-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-ppc64-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-s390x-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-sparc-SunOS.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-sparcv9-SunOS.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-FreeBSD.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-Linux.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-OpenBSD.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-SunOS.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-x86_64-Windows.jar"/>
+            <pathelement path="${extlibs.dir}/jffi-1.2.6.jar"/>
+            <pathelement path="${extlibs.dir}/jnr-ffi-0.7.10.jar"/>
+            <pathelement path="${extlibs.dir}/jnr-netdb-1.1.1.jar"/>
+            <pathelement path="${extlibs.dir}/jnr-posix-2.4.0.jar"/>
+            <pathelement path="${extlibs.dir}/jnr-constants-0.8.4.jar"/>
             <pathelement path="${extlibs.dir}/jline-1.0.jar" />
         </path>
 
@@ -576,12 +593,29 @@
             <rule pattern="io.netty.**" result="org.python.netty. at 1"/>
             <zipfileset src="extlibs/netty-transport-4.0.18.Final.jar"/>
             <rule pattern="io.netty.**" result="org.python.netty. at 1"/>
-            <zipfileset src="${extlibs.dir}/jffi-1.2.7.jar"/>
-            <zipfileset src="${extlibs.dir}/jffi-1.2.7-native.jar"/>
-            <zipfileset src="${extlibs.dir}/jnr-constants-0.8.5.jar"/>
-            <zipfileset src="${extlibs.dir}/jnr-ffi-1.0.10.jar"/>
-	    <zipfileset src="${extlibs.dir}/jnr-netdb-1.1.2.jar"/>
-	    <zipfileset src="${extlibs.dir}/jnr-posix-3.0.1.jar"/>
+            <zipfileset src="extlibs/jffi-arm-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-Darwin.jar"/>
+            <zipfileset src="extlibs/jffi-i386-FreeBSD.jar"/>
+            <zipfileset src="extlibs/jffi-i386-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-i386-OpenBSD.jar"/>
+            <zipfileset src="extlibs/jffi-i386-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-i386-Windows.jar"/>
+            <zipfileset src="extlibs/jffi-ppc-AIX.jar"/>
+            <zipfileset src="extlibs/jffi-ppc-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-ppc64-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-s390x-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-sparc-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-sparcv9-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-FreeBSD.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-Linux.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-OpenBSD.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-SunOS.jar"/>
+            <zipfileset src="extlibs/jffi-x86_64-Windows.jar"/>
+            <zipfileset src="extlibs/jffi-1.2.6.jar"/>
+            <zipfileset src="${extlibs.dir}/jnr-ffi-0.7.10.jar"/>
+	    <zipfileset src="${extlibs.dir}/jnr-netdb-1.1.1.jar"/>
+	    <zipfileset src="${extlibs.dir}/jnr-posix-2.4.0.jar"/>
+            <zipfileset src="${extlibs.dir}/jnr-constants-0.8.4.jar"/>
             <zipfileset src="extlibs/xml-apis-2.11.0.jar" excludes="META-INF/services/*"/>
             <zipfileset src="extlibs/xercesImpl-2.11.0.jar" excludes="META-INF/services/*"/>
             <rule pattern="org.apache.xml.**" result="org.python.apache.xml. at 1"/>
diff --git a/extlibs/jffi-1.2.6.jar b/extlibs/jffi-1.2.6.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..a6b2be6c39798f0fc5958aa309924506b74f0f9f
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.7-native.jar b/extlibs/jffi-1.2.7-native.jar
deleted file mode 100644
index 0b7404c256d1d4277b58c9c559bf24938f11404e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-1.2.7.jar b/extlibs/jffi-1.2.7.jar
deleted file mode 100644
index 68c8db05c248ab54aba86d03d3c7904334468770..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-Darwin.jar b/extlibs/jffi-Darwin.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..009191ac8c0dcaf63267ea0103e73ea2a9895e43
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-arm-Linux.jar b/extlibs/jffi-arm-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b3c5d977c1b7ad3fc196bfe2cd24fe56129dc8f9
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-i386-FreeBSD.jar b/extlibs/jffi-i386-FreeBSD.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-i386-Linux.jar b/extlibs/jffi-i386-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..7e23b400cce5e3b4861141ee4f10730fbcbdb5de
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-i386-OpenBSD.jar b/extlibs/jffi-i386-OpenBSD.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-i386-SunOS.jar b/extlibs/jffi-i386-SunOS.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..68bcacc39ac49a01929be37ec67c6784612bc966
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-i386-Windows.jar b/extlibs/jffi-i386-Windows.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..90a6baecf76870212dc4f8cb7aa56e0962d1f858
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc-AIX.jar b/extlibs/jffi-ppc-AIX.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc-Linux.jar b/extlibs/jffi-ppc-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-ppc64-Linux.jar b/extlibs/jffi-ppc64-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-s390x-Linux.jar b/extlibs/jffi-s390x-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-sparc-SunOS.jar b/extlibs/jffi-sparc-SunOS.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-sparcv9-SunOS.jar b/extlibs/jffi-sparcv9-SunOS.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..306788c0810baeccb93f191316844d5d0d9e6254
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-FreeBSD.jar b/extlibs/jffi-x86_64-FreeBSD.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..32824a7e209b57e06808d4de65de4443225a5349
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-Linux.jar b/extlibs/jffi-x86_64-Linux.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..99deb014d458c5a42b5290832b8141acf42212dd
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-OpenBSD.jar b/extlibs/jffi-x86_64-OpenBSD.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8235a3484884243b1d17d5e19340e4166f3b0b55
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-SunOS.jar b/extlibs/jffi-x86_64-SunOS.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b8240422d442b4bcf0e95d6b6a0a02714aeac827
GIT binary patch
[stripped]
diff --git a/extlibs/jffi-x86_64-Windows.jar b/extlibs/jffi-x86_64-Windows.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..667e48db8193809b21118cff14b23184d558821a
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.8.4.jar b/extlibs/jnr-constants-0.8.4.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f0ff6bb1a1796560c09121b4366a5d04032156af
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-constants-0.8.5.jar b/extlibs/jnr-constants-0.8.5.jar
deleted file mode 100644
index fe11c5752485174311ae271f4ca8ce76a496ff63..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-ffi-0.7.10.jar b/extlibs/jnr-ffi-0.7.10.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..9e2e64f276334bed30c62d12823d5088b5672425
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-ffi-1.0.10.jar b/extlibs/jnr-ffi-1.0.10.jar
deleted file mode 100644
index 0e90154fcbf11a4ce289ec5b93cfe975cee6fa50..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-netdb-1.1.1.jar b/extlibs/jnr-netdb-1.1.1.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..731f6ec0fdc5c420ec55edec6c28092b06c70e32
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-netdb-1.1.2.jar b/extlibs/jnr-netdb-1.1.2.jar
deleted file mode 100644
index d082053606b4718b13648a1ca17c0ffc43eb66a6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-posix-2.4.0.jar b/extlibs/jnr-posix-2.4.0.jar
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..36f3fc1d217091941a1079e9ebccc70094a5ede6
GIT binary patch
[stripped]
diff --git a/extlibs/jnr-posix-3.0.1.jar b/extlibs/jnr-posix-3.0.1.jar
deleted file mode 100644
index 94f9bf3a7d19baf0071e12eb24f14a0d0cef6c0b..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
[stripped]
diff --git a/src/org/python/modules/posix/PythonPOSIXHandler.java b/src/org/python/modules/posix/PythonPOSIXHandler.java
--- a/src/org/python/modules/posix/PythonPOSIXHandler.java
+++ b/src/org/python/modules/posix/PythonPOSIXHandler.java
@@ -20,13 +20,7 @@
  */
 public class PythonPOSIXHandler implements POSIXHandler {
 
-    public void error(Errno error, String extraData) {
-        // XXX: extraData (filename) could have been unicode!
-        // http://bugs.jython.org/issue1825
-        throw Py.OSError(error, Py.newString(extraData));
-    }
-
-    public void error(Errno error, String methodName, String extraData) {
+	public void error(Errno error, String extraData) {
         // XXX: extraData (filename) could have been unicode!
         // http://bugs.jython.org/issue1825
         throw Py.OSError(error, Py.newString(extraData));

-- 
Repository URL: http://hg.python.org/jython


More information about the Jython-checkins mailing list