diff options
author | Keri Harris <keri@gentoo.org> | 2007-02-25 00:36:18 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2007-02-25 00:36:18 +0000 |
commit | df972976eab25fff4b68371b9cb03f6a83f8610b (patch) | |
tree | 686d687a58924cae5060fe0536f786314c355daf /dev-lang | |
parent | Fix broken Manifest due to Attic/ in the header of hplip-1.6.10.ebuild. (diff) | |
download | gentoo-2-df972976eab25fff4b68371b9cb03f6a83f8610b.tar.gz gentoo-2-df972976eab25fff4b68371b9cb03f6a83f8610b.tar.bz2 gentoo-2-df972976eab25fff4b68371b9cb03f6a83f8610b.zip |
Load jpl module for JRef test.
(Portage version: 2.1.2-r11)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/swi-prolog/ChangeLog | 6 | ||||
-rw-r--r-- | dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch | 33 | ||||
-rw-r--r-- | dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild | 4 |
3 files changed, 40 insertions, 3 deletions
diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog index b84e94943393..264f8aa1eae8 100644 --- a/dev-lang/swi-prolog/ChangeLog +++ b/dev-lang/swi-prolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/swi-prolog # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.65 2007/02/24 04:38:44 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.66 2007/02/25 00:36:18 keri Exp $ + + 25 Feb 2007; keri <keri@gentoo.org> + +files/swi-prolog-jpl-check_java-r1.patch, swi-prolog-5.6.28.ebuild: + Load jpl module for JRef test. 24 Feb 2007; keri <keri@gentoo.org> files/swi-prolog-jpl-LDPATH-r2.patch: Ensure JVM stack size is sufficient to run JPL test-suite on 32bit ppc. diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch new file mode 100644 index 000000000000..2c961414e01f --- /dev/null +++ b/dev-lang/swi-prolog/files/swi-prolog-jpl-check_java-r1.patch @@ -0,0 +1,33 @@ +--- pl-5.6.28.orig/packages/jpl/src/java/jpl/test/TestJUnit.java 2007-01-30 22:48:09.000000000 +1300 ++++ pl-5.6.28/packages/jpl/src/java/jpl/test/TestJUnit.java 2007-02-25 13:15:51.000000000 +1300 +@@ -32,7 +32,7 @@ + protected void setUp() { + // initialization code + // Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "set_prolog_flag(debug_on_error,false)", "-q" }); +- Prolog.set_default_init_args(new String[] { "libpl.dll", "-f", "none", "-g", "true", "-q" }); ++ Prolog.set_default_init_args(new String[] { "libpl.dll", "-x", "../../src/pl.prc", "-f", "none", "-g", "true", "-q" }); + assertTrue((new Query("consult(test_jpl)")).hasSolution()); + } + protected void tearDown() { +@@ -50,7 +50,7 @@ + } + public void testSameLibVersions2() { + String java_lib_version = JPL.version_string(); +- String pl_lib_version = ((Term) (new Query(new Compound("jpl_pl_lib_version", new Term[] { new Variable("V") })).oneSolution().get("V"))).name(); ++ String pl_lib_version = ((Term) Query.oneSolution("jpl:jpl_pl_lib_version(V)").get("V")).name(); + assertTrue("java_lib_version(" + java_lib_version + ") is same as pl_lib_version(" + pl_lib_version + ")", java_lib_version.equals(pl_lib_version)); + } + public void testAtomName1() { +@@ -512,11 +512,9 @@ + assertTrue(array[2].isAtom() && array[2].name().equals("c")); + } + public void testJRef1() { +- System.out.println("java.library.path=" + System.getProperties().get("java.library.path")); +- System.out.println("jpl.c version = " + jpl.fli.Prolog.get_c_lib_version()); + int i = 76543; + Integer I = new Integer(i); +- Query q = new Query("jpl_call(?,intValue,[],I2)", new Term[] {new JRef(I)}); ++ Query q = new Query("use_module(library(jpl)),jpl_call(?,intValue,[],I2)", new Term[] {new JRef(I)}); + Term I2 = (Term) q.oneSolution().get("I2"); + assertTrue(I2.isInteger() && I2.intValue() == i); + } diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild index c17b1d725875..26befba6cd7e 100644 --- a/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild +++ b/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.4 2007/02/23 22:03:15 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.28.ebuild,v 1.5 2007/02/25 00:36:18 keri Exp $ inherit eutils java-pkg-opt-2 @@ -48,7 +48,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r2.patch epatch "${FILESDIR}"/${PN}-jpl-junit.patch - epatch "${FILESDIR}"/${PN}-jpl-check_java.patch + epatch "${FILESDIR}"/${PN}-jpl-check_java-r1.patch epatch "${FILESDIR}"/${PN}-ltx2htm.patch epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch epatch "${FILESDIR}"/${PN}-ssl-cert.patch |