dev-lang/tuprolog: remove unused patches
authorMichael Mair-Keimberger <m.mairkeimberger@gmail.com>
Sun, 3 Dec 2017 08:57:53 +0000 (09:57 +0100)
committerDavid Seifert <soap@gentoo.org>
Sat, 23 Dec 2017 13:11:52 +0000 (14:11 +0100)
Closes: https://github.com/gentoo/gentoo/pull/6416

dev-lang/tuprolog/files/build-3.0.0.xml [deleted file]
dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch [deleted file]
dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch [deleted file]
dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch [deleted file]

diff --git a/dev-lang/tuprolog/files/build-3.0.0.xml b/dev-lang/tuprolog/files/build-3.0.0.xml
deleted file mode 100644 (file)
index 823c237..0000000
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" ?><project default="jar" name="tuprolog">
-
-       <!-- some properties -->
-       <property name="src.dir" value="src"/>
-       <property name="build.dir" value="build"/>
-       <property name="docs.dir" value="docs"/>
-       <property name="dist.dir" value="dist"/>
-       <property name="test.dir" value="test"/>
-       <property name="test.build.dir" value="test.build"/>
-       <property name="jarfile" value="${ant.project.name}.jar"/>
-       <property file="build.properties"/>
-
-       <path id="compile.classpath">
-               <fileset dir="lib" includes="*.jar"/>
-               <pathelement path="${gentoo.classpath}"/>
-       </path>
-
-       <!-- init -->
-       <target name="init">
-               <tstamp/>
-               <mkdir dir="${dist.dir}"/>
-               <mkdir dir="${build.dir}"/>
-               <mkdir dir="${docs.dir}"/>
-               <mkdir dir="${test.build.dir}"/>
-       </target>       
-
-       <!-- compile everything -->
-       <target depends="init" name="compile">
-               <javac deprecation="off"
-                       destdir="${build.dir}"
-                       encoding="ISO-8859-1"
-                       srcdir="${src.dir}"
-                       target="1.7">
-                       <classpath>
-                               <path refid="compile.classpath"/>
-                       </classpath>
-               </javac>
-               <copy todir="${build.dir}">
-                       <fileset dir="${src.dir}">
-                               <exclude name="**/*.java"/>
-                       </fileset>
-               </copy>
-       </target>
-
-       <!-- build the jar file -->
-       <target depends="compile" name="jar">
-               <jar basedir="${build.dir}" jarfile="${dist.dir}/${jarfile}"/>
-               <jar basedir="${build.dir}" jarfile="${dist.dir}/2p.jar">
-                       <manifest>
-                               <attribute name="Main-Class" value="alice.tuprologx.ide.GUILauncher"/>
-                               <attribute name="Class-Path" value="."/>
-                       </manifest>
-                       <zipgroupfileset dir="lib" includes="*.jar"/>
-               </jar>
-       </target>
-
-       <!-- generate javadocs -->
-       <target depends="init" name="javadoc">
-               <javadoc
-                       author="false"
-                       destdir="${docs.dir}"
-                       encoding="ISO-8859-1"
-                       breakiterator="yes"
-                       packagenames="alice.*"
-                       sourcepath="${src.dir}"
-                       use="true"
-                       version="true"
-                       verbose="no"
-                       windowtitle="${ant.project.name} API">
-                       <classpath>
-                               <path refid="compile.classpath"/>
-                       </classpath>
-               </javadoc>
-       </target>
-
-       <!-- clean up -->
-       <target name="clean">
-               <delete dir="${build.dir}"/>
-               <delete dir="${dist.dir}"/>
-               <delete dir="${docs.dir}"/>
-               <delete dir="${test.build.dir}"/>
-       </target>
-
-       <!-- run testsuite -->
-       <target name="test">
-               <path id="dist.classpath">
-                       <fileset dir="${dist.dir}">
-                               <include name="*.jar"/>
-                       </fileset>
-               </path>
-               <javac classpathref="dist.classpath"
-                       deprecation="off"
-                       destdir="${test.build.dir}"
-                       encoding="ISO-8859-1"
-                       srcdir="${test.dir}/unit"
-                       target="1.7"/>
-               <junit haltonfailure="on" showoutput="no" printsummary="yes">
-                       <classpath>
-                               <path refid="dist.classpath"/>
-                               <pathelement path="${test.build.dir}"/>
-                       </classpath>
-                       <formatter type="xml"/>
-                       <batchtest todir="${test.build.dir}">
-                               <fileset dir="${test.build.dir}">
-                                       <include name="**/*TestCase.class"/>
-                               </fileset>
-                       </batchtest>
-               </junit>
-       </target>
-</project>
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-dynamic-object-test.patch
deleted file mode 100644 (file)
index 36e683f..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
---- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/JavaLibraryTestCase.java      2016-10-08 14:34:12.000000000 +0200
-+++ tuprolog-3.0.0/test/unit/alice/tuprolog/JavaLibraryTestCase.java   2016-10-08 17:30:18.525111794 +0200
-@@ -39,7 +39,7 @@
-               SolveInfo goal = engine.solve(new Struct("demo", t));\r
-               assertFalse(goal.isSuccess());\r
-       }\r
--\r
-+/*\r
-       public void testDynamicObjectsRetrival() throws PrologException {\r
-               Prolog engine = new Prolog();\r
-               OOLibrary lib = (OOLibrary) engine.getLibrary("alice.tuprolog.lib.OOLibrary");\r
-@@ -53,7 +53,7 @@
-               TestCounter counter = (TestCounter) lib.getRegisteredDynamicObject(id);\r
-               assertEquals(2, counter.getValue());\r
-       }\r
--\r
-+*/\r
-       \r
-       public void test_java_object() throws PrologException, IOException\r
-       {\r
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-no-ikvm.patch
deleted file mode 100644 (file)
index e0ee85c..0000000
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -urN tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java
---- tuprolog-3.0.0.orig/src/alice/tuprolog/LibraryManager.java 2016-10-08 14:33:19.000000000 +0200
-+++ tuprolog-3.0.0/src/alice/tuprolog/LibraryManager.java      2016-10-08 16:49:12.005214951 +0200
-@@ -9,11 +9,11 @@
- import java.net.URL;
- import java.net.URLClassLoader;
- import java.util.*;
--import cli.System.Reflection.Assembly;
-+//import cli.System.Reflection.Assembly;
- import alice.tuprolog.event.LibraryEvent;
- import alice.tuprolog.event.WarningEvent;
--import alice.util.AssemblyCustomClassLoader;
-+//import alice.util.AssemblyCustomClassLoader;
- /**
-  * @author Alex Benini
-@@ -179,31 +179,7 @@
-                               } else
-                               // .NET
-                               {
--                                      Assembly asm = null;
--                                      boolean classFound = false;
--                                      className = "cli."
--                                                      + className.substring(0, className.indexOf(","))
--                                                                      .trim();
--                                      for (int i = 0; i < paths.length; i++)
--                                      {
--                                              try
--                                              {
--                                                      asm = Assembly.LoadFrom(paths[i]);
--                                                      loader = new AssemblyCustomClassLoader(asm, urls);
--                                                      lib = (Library) Class.forName(className, true, loader).newInstance();
--                                                      if (lib != null)
--                                                      {
--                                                              classFound = true;
--                                                              break;
--                                                      }
--                                              } catch (Exception e)
--                                              {
--                                                      e.printStackTrace();
--                                                      continue;
--                                              }
--                                      }
--                                      if (!classFound)
--                                              throw new InvalidLibraryException(className, -1, -1);
-+                                      throw new InvalidLibraryException(className, -1, -1);
-                               }
-                       }
-@@ -462,4 +438,4 @@
-               return optimizedDirectory;
-       }
--}
-\ No newline at end of file
-+}
-diff -urN tuprolog-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java
---- tuprolog-3.0.0.orig/src/alice/tuprologx/ide/LibraryManager.java    2016-10-08 14:33:19.000000000 +0200
-+++ tuprolog-3.0.0/src/alice/tuprologx/ide/LibraryManager.java 2016-10-08 16:49:12.006214951 +0200
-@@ -18,7 +18,7 @@
- package alice.tuprologx.ide;\r
\r
- import alice.tuprolog.*;\r
--import alice.util.AssemblyCustomClassLoader;\r
-+//import alice.util.AssemblyCustomClassLoader;\r
\r
- import java.io.File;\r
- import java.net.URL;\r
-@@ -26,7 +26,7 @@
- import java.util.ArrayList;\r
- import java.util.Hashtable;\r
- import java.util.StringTokenizer;\r
--import cli.System.Reflection.Assembly;\r
-+//import cli.System.Reflection.Assembly;\r
\r
- /**\r
-  * A dynamic manager for tuProlog libraries.\r
-@@ -155,10 +155,7 @@
-                       // .NET\r
-                       if(System.getProperty("java.vm.name").equals("IKVM.NET"))\r
-                       {\r
--                              Assembly asm = Assembly.LoadFrom(file.getPath());\r
--                              loader = new AssemblyCustomClassLoader(asm, new URL[]{url});\r
--                              libraryClassname = "cli." + libraryClassname.substring(0, \r
--                                              libraryClassname.indexOf(",")).trim();\r
-+                              throw new InvalidLibraryException(libraryClassname,-1,-1);\r
-                       }\r
-                       // JVM\r
-                       else\r
-diff -urN tuprolog-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-3.0.0/src/alice/util/AssemblyCustomClassLoader.java
---- tuprolog-3.0.0.orig/src/alice/util/AssemblyCustomClassLoader.java  2016-10-08 14:33:19.000000000 +0200
-+++ tuprolog-3.0.0/src/alice/util/AssemblyCustomClassLoader.java       1970-01-01 01:00:00.000000000 +0100
-@@ -1,21 +0,0 @@
--package alice.util;\r
--\r
--import java.net.URL;\r
--\r
--public class AssemblyCustomClassLoader extends java.net.URLClassLoader\r
--{\r
--  public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls)\r
--  {\r
--    super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm));\r
--    // explicitly calling addURL() is safer than passing it to the super constructor,\r
--    // because this class loader instance may be used during the URL construction.\r
--    for (URL url : urls) {\r
--      addURL(url);\r
--      }    \r
--  }\r
--  \r
--  public void addUrl(URL url)\r
--  {\r
--        addURL(url);\r
--  }\r
--}
-\ No newline at end of file
-diff -urN tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java
---- tuprolog-3.0.0.orig/src/alice/util/proxyGenerator/Generator.java   2016-10-08 14:33:19.000000000 +0200
-+++ tuprolog-3.0.0/src/alice/util/proxyGenerator/Generator.java        2016-10-08 17:03:17.816179576 +0200
-@@ -1,7 +1,7 @@
- package alice.util.proxyGenerator;\r
- import javax.tools.*;\r
\r
--import cli.System.Reflection.Assembly;\r
-+//import cli.System.Reflection.Assembly;\r
\r
- import java.lang.reflect.*;\r
- import java.util.*;\r
-@@ -29,7 +29,7 @@
-     }\r
-     \r
-     if(System.getProperty("java.vm.name").equals("IKVM.NET"))\r
--      ikvm.runtime.Startup.addBootClassPathAssemby(Assembly.Load("IKVM.OpenJDK.Tools"));\r
-+      throw new UnsupportedOperationException("IKVM.NET not supported!");\r
-     \r
-     jc = ToolProvider.getSystemJavaCompiler();\r
-     if (jc == null) {\r
diff --git a/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch b/dev-lang/tuprolog/files/tuprolog-3.0.0-oolibrary-unit-test.patch
deleted file mode 100644 (file)
index f9c13ae..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuprolog-3.0.0.orig/test/unit/alice/tuprolog/PrologTestCase.java   2016-10-08 14:34:12.000000000 +0200
-+++ tuprolog-3.0.0/test/unit/alice/tuprolog/PrologTestCase.java        2016-10-08 17:43:28.339078761 +0200
-@@ -32,7 +32,7 @@
-               assertNotNull(engine.getLibrary("alice.tuprolog.StringLibrary"));
-               Library javaLibrary = new alice.tuprolog.lib.OOLibrary();
-               engine.loadLibrary(javaLibrary);
--              assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.JavaLibrary"));
-+              assertSame(javaLibrary, engine.getLibrary("alice.tuprolog.lib.OOLibrary"));
-       }
-       
-       public void testGetLibraryWithName() throws InvalidLibraryException {