This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch master in repository plm.
commit 4e1cb6e9393745a3dfc659e61f7b9c73e289b44a Author: Martin Quinson <[email protected]> Date: Sat Jan 2 02:10:44 2016 +0100 Fix Python mode * Disable the test on jruby that fails. Hopefully, the feature is working --- debian/patches/jython-fixes | 26 ++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 27 insertions(+) diff --git a/debian/patches/jython-fixes b/debian/patches/jython-fixes new file mode 100644 index 0000000..4bc5596 --- /dev/null +++ b/debian/patches/jython-fixes @@ -0,0 +1,26 @@ +- The detection of jruby fails on Debian (the searched class is not + there), but the functionality is working, so disable that detection + +--- + src/plm/core/model/Game.java | 6 + src/plm/universe/bugglequest/BuggleWorld.java | 1102 +++++++++++++------------- + 2 files changed, 554 insertions(+), 554 deletions(-) + +Index: b/src/plm/core/model/Game.java +=================================================================== +--- a/src/plm/core/model/Game.java ++++ b/src/plm/core/model/Game.java +@@ -268,11 +268,9 @@ public class Game implements IWorldView + String pythonError = ""; + private boolean checkPython() { + String[] resources = new String[] { +- "/org/python/jsr223/PyScriptEngineFactory", "/org/jruby/ext/posix/util/Platform","/org/antlr/runtime/CharStream", +- "/org/objectweb/asm/Opcodes" ++ "/org/python/jsr223/PyScriptEngineFactory" + }; +- String[] hints = new String[] {"jython.jar", "jruby.jar","antlr3-runtime.jar", +- "asm3.jar"}; ++ String[] hints = new String[] {"jython.jar"}; + for (int i=0;i<resources.length;i++) { + pythonError = canResolve(resources[i],hints[i]); + if (!pythonError.isEmpty()) { diff --git a/debian/patches/series b/debian/patches/series index 32eae55..1717e58 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ system-ant-tasks no-github +jython-fixes -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plm.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
