Commits

Marcus R. Brown committed d32c365

Remove the jffi module and the jars it uses.

  • Participants
  • Parent commits 1d56750

Comments (0)

Files changed (2)

             <exclude name="**/handler/InformixDataHandler.java" unless="informix.present" />
             <exclude name="**/handler/OracleDataHandler.java" unless="oracle.present" />
 
-            <!-- TODO: Needs repackaged Apache Harmony jdni.jar for javax.naming.*. -->
+            <!-- MRB TODO: Needs repackaged Apache Harmony jdni.jar for javax.naming.*. -->
             <exclude name="**/com/ziclix/python/sql/connect/Lookup.java" />
+            
+            <!-- MRB TODO: Remove jffi. -->
+            <exclude name="**/modules/jffi/*.java" />
 
             <classpath refid="main.classpath" />
             <classpath>
             <rule pattern="org.objectweb.asm.**" result="org.python.objectweb.asm.@1"/>
             <zipfileset src="extlibs/guava-r07.jar"/>
             <rule pattern="com.google.**" result="org.python.google.@1"/>
-            <zipfileset src="extlibs/jaffl.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.jar"/>
+            <!-- MRB TODO: Remove jffi. -->
+            <!-- zipfileset src="extlibs/jaffl.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.jar"/-->
             <zipfileset src="extlibs/jnr-posix.jar"/>
             <zipfileset src="extlibs/jnr-netdb-0.4.jar"/>
             <!-- <rule pattern="com.sun.jna.**" result="org.python.jna.@1"/> -->

src/org/python/modules/Setup.java

         "_marshal",
         "_threading:org.python.modules._threading._threading",
         PosixModule.getOSName() + ":org.python.modules.posix.PosixModule",
-        "jffi:org.python.modules.jffi.jffi"
+// MRB TODO: Remove jffi.
+//        "jffi:org.python.modules.jffi.jffi"
     };
 }