keri 15/01/11 14:11:56 Modified: build.xml Added: tuprolog-2.9.0-no-ikvm.patch Log: Version bump (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A138F5ED)
Revision Changes Path 1.6 dev-lang/tuprolog/files/build.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tuprolog/files/build.xml?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tuprolog/files/build.xml?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tuprolog/files/build.xml?r1=1.5&r2=1.6 Index: build.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-lang/tuprolog/files/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 1 Jul 2012 11:37:18 -0000 1.5 +++ build.xml 11 Jan 2015 14:11:56 -0000 1.6 @@ -38,6 +38,11 @@ <!-- 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"/> + </manifest> + </jar> </target> <!-- generate javadocs --> 1.1 dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/tuprolog/files/tuprolog-2.9.0-no-ikvm.patch?rev=1.1&content-type=text/plain Index: tuprolog-2.9.0-no-ikvm.patch =================================================================== diff -urN tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java --- tuprolog-2.9.0.orig/src/alice/tuprolog/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 +++ tuprolog-2.9.0/src/alice/tuprolog/LibraryManager.java 2015-01-11 14:48:57.000000000 +0100 @@ -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-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java --- tuprolog-2.9.0.orig/src/alice/tuprologx/ide/LibraryManager.java 2014-09-29 18:14:21.000000000 +0200 +++ tuprolog-2.9.0/src/alice/tuprologx/ide/LibraryManager.java 2015-01-11 14:46:23.000000000 +0100 @@ -18,7 +18,7 @@ package alice.tuprologx.ide; import alice.tuprolog.*; -import alice.util.AssemblyCustomClassLoader; +//import alice.util.AssemblyCustomClassLoader; import java.io.File; import java.net.URL; @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.StringTokenizer; -import cli.System.Reflection.Assembly; +//import cli.System.Reflection.Assembly; /** * A dynamic manager for tuProlog libraries. @@ -155,10 +155,7 @@ // .NET if(System.getProperty("java.vm.name").equals("IKVM.NET")) { - Assembly asm = Assembly.LoadFrom(file.getPath()); - loader = new AssemblyCustomClassLoader(asm, new URL[]{url}); - libraryClassname = "cli." + libraryClassname.substring(0, - libraryClassname.indexOf(",")).trim(); + throw new InvalidLibraryException(libraryClassname,-1,-1); } // JVM else diff -urN tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java --- tuprolog-2.9.0.orig/src/alice/util/AssemblyCustomClassLoader.java 2014-09-29 18:14:21.000000000 +0200 +++ tuprolog-2.9.0/src/alice/util/AssemblyCustomClassLoader.java 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -package alice.util; - -import java.net.URL; - -public class AssemblyCustomClassLoader extends java.net.URLClassLoader -{ - public AssemblyCustomClassLoader(cli.System.Reflection.Assembly asm, URL[] urls) - { - super(new java.net.URL[0], new ikvm.runtime.AssemblyClassLoader(asm)); - // explicitly calling addURL() is safer than passing it to the super constructor, - // because this class loader instance may be used during the URL construction. - for (URL url : urls) { - addURL(url); - } - } - - public void addUrl(URL url) - { - addURL(url); - } -} \ No newline at end of file
