Load jpl module for JRef test.

Package-Manager: portage-2.1.2-r11

4 files changed, 52 insertions, 11 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/Manifest b/dev-lang/swi-prolog/Manifest
index bf3012b63c67..c622af2784ba 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -82,6 +82,10 @@ AUX swi-prolog-jpl-PLARCH.patch 311 RMD160 91a4b95a41b7986da49e8b3443617bf51e287
 MD5 8d505cb837b5d78743b1be627063db3d files/swi-prolog-jpl-PLARCH.patch 311
 RMD160 91a4b95a41b7986da49e8b3443617bf51e287523 files/swi-prolog-jpl-PLARCH.patch 311
 SHA256 c3be68aad2be2e0bf08769cb743cece20b47fe198f3d3e87601554188bf0ec89 files/swi-prolog-jpl-PLARCH.patch 311
+AUX swi-prolog-jpl-check_java-r1.patch 1898 RMD160 82f382273945b3516253c88f7dd825c2efe9bf0a SHA1 10f91fec428bf53072682dff260ab42b22aeb875 SHA256 fb188220963c758746f2f95b3849466ad52b1aea2b4f1d414fd3c553ee15940c
+MD5 f9b976888861710f6d43158d7b44f5a9 files/swi-prolog-jpl-check_java-r1.patch 1898
+RMD160 82f382273945b3516253c88f7dd825c2efe9bf0a files/swi-prolog-jpl-check_java-r1.patch 1898
+SHA256 fb188220963c758746f2f95b3849466ad52b1aea2b4f1d414fd3c553ee15940c files/swi-prolog-jpl-check_java-r1.patch 1898
 AUX swi-prolog-jpl-check_java.patch 1393 RMD160 792b9a91c16d9f8f5ab918d62461a6f5879d9ed5 SHA1 ac60bc1cd23547ea812f86635163c157f9481d4c SHA256 f81f7cfd1feb56ccb8ec54e403179210901c239b1f1036f4c9ae8739192d8081
 MD5 9cc6037fda797f0abbf2ef9a4745a413 files/swi-prolog-jpl-check_java.patch 1393
 RMD160 792b9a91c16d9f8f5ab918d62461a6f5879d9ed5 files/swi-prolog-jpl-check_java.patch 1393
@@ -221,14 +225,14 @@ EBUILD swi-prolog-5.6.27.ebuild 3626 RMD160 8f69edb8f1f827f89326eded518df97aff49
 MD5 7c8223ff19ce5ba9e1556dc7b93ad154 swi-prolog-5.6.27.ebuild 3626
 RMD160 8f69edb8f1f827f89326eded518df97aff494a6c swi-prolog-5.6.27.ebuild 3626
 SHA256 a33f6bd214218b66970120daf0d7d711d0d796e00d7af14bf96c273174d438a6 swi-prolog-5.6.27.ebuild 3626
-EBUILD swi-prolog-5.6.28.ebuild 3666 RMD160 e78791726486e02350aa9e9b0d64e1210d178a76 SHA1 625c950ad3467003a55fb2099da0c995c8c6307e SHA256 c6db51bade8fde8090f4472eed34738b390acfb742e0c0af3b02e5e624aa0090
-MD5 934d334db2f5f5cbc5890d5df07e7ce6 swi-prolog-5.6.28.ebuild 3666
-RMD160 e78791726486e02350aa9e9b0d64e1210d178a76 swi-prolog-5.6.28.ebuild 3666
-SHA256 c6db51bade8fde8090f4472eed34738b390acfb742e0c0af3b02e5e624aa0090 swi-prolog-5.6.28.ebuild 3666
-MISC ChangeLog 12966 RMD160 53d523525852dabe8cf6c4d58d244e3587439027 SHA1 f6552339bda4249df076780d8150954957fe1e30 SHA256 0dc3b04d378c162d44d218314e140f5dbcec259a8854352d3478bcc61b4c41c9
-MD5 1d772590816fa26bca155464629640e0 ChangeLog 12966
-RMD160 53d523525852dabe8cf6c4d58d244e3587439027 ChangeLog 12966
-SHA256 0dc3b04d378c162d44d218314e140f5dbcec259a8854352d3478bcc61b4c41c9 ChangeLog 12966
+EBUILD swi-prolog-5.6.28.ebuild 3669 RMD160 09263dc6b77c9c06b35c8fddb215f009a942e995 SHA1 13c3552f8328a30c2c76206b245e1b602d12bcf4 SHA256 03a95e352a23ee98dc43cd315040f30503ff4df2407a33b455887bb1befade4e
+MD5 a485d547dcd294bb97f96510cc85e3a7 swi-prolog-5.6.28.ebuild 3669
+RMD160 09263dc6b77c9c06b35c8fddb215f009a942e995 swi-prolog-5.6.28.ebuild 3669
+SHA256 03a95e352a23ee98dc43cd315040f30503ff4df2407a33b455887bb1befade4e swi-prolog-5.6.28.ebuild 3669
+MISC ChangeLog 13109 RMD160 6c3f553fd160f56ce415dcd6311f55a49280b932 SHA1 904efa42b02bb2e53c4b1cade214f7ac8ea995b0 SHA256 1dd3508ca3e194d4edfe28a15458f43b604d70276270321f66908557ea206d8c
+MD5 f3e1af40cfb65e03b8d05c3089ed628b ChangeLog 13109
+RMD160 6c3f553fd160f56ce415dcd6311f55a49280b932 ChangeLog 13109
+SHA256 1dd3508ca3e194d4edfe28a15458f43b604d70276270321f66908557ea206d8c ChangeLog 13109
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
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