This is an automated email from the git hooks/post-receive script. pini pushed a commit to tag upstream/1.1.0_beta1 in repository sikuli.
commit c4cac9734779187ccceff7cd460c0bb6982c5543 Author: Raimund Hocke <[email protected]> Date: Fri Feb 14 09:48:05 2014 +0100 set to version Feb 14 from fork --- .../java/org/sikuli/scriptrunner/JRubyScriptRunner.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java index 5cf5730..4d13de1 100644 --- a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java +++ b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java @@ -2,7 +2,7 @@ * Copyright 2010-2014, Sikuli.org * Released under the MIT License. * - * Roman S Samarev 2014 + * WhoIsWho 2014 */ package org.sikuli.scriptrunner; @@ -33,6 +33,7 @@ import org.jruby.javasupport.JavaEmbedUtils.EvalUnit; import org.jruby.CompatVersion; import org.jruby.embed.LocalContextScope; import org.jruby.RubyInstanceConfig.CompileMode; +import org.jruby.embed.PathType; public class JRubyScriptRunner implements IScriptRunner { @@ -61,13 +62,10 @@ public class JRubyScriptRunner implements IScriptRunner { */ private final static String SCRIPT_HEADER = "# coding: utf-8\n" - + "require 'java'\n" - + "require 'rukuli'\n" + "require 'sikulix'\n" - + "Rukuli::Config.run do |config|\n" - + " config.image_path = SIKULI_IMAGE_PATH + '/'\n" - + " config.logging = true\n" - + "end\n"; + + "include SikuliX4Ruby\n" + + "SikuliX4Ruby::image_path = SIKULI_IMAGE_PATH + '/'\n" + + "SikuliX4Ruby::logging = true\n"; private static ArrayList<String> codeBefore = null; private static ArrayList<String> codeAfter = null; @@ -88,6 +86,9 @@ public class JRubyScriptRunner implements IScriptRunner { private static String sikuliLibPath; + private static String timestampBuilt; + private static final String tsb = "##--##Fri Jan 28 13:06:44 MSD 2014##--##"; + @Override public void init(String[] args) { //TODO classpath and other path handlings @@ -320,7 +321,7 @@ public class JRubyScriptRunner implements IScriptRunner { //org.jruby.parser.ParserSyntaxException //(SyntaxError) /tmp/sikuli-3213678404470696048.rb:2: syntax error, unexpected tRCURLY - Pattern pLineS = Pattern.compile("(?<=:)(.*):(.*)"); + Pattern pLineS = Pattern.compile("(?<=:)(\\d+):(.*)"); java.util.regex.Matcher mLine = pLineS.matcher(err); if (mLine.find()) { log(lvl + 2, "SyntaxError error line: " + mLine.group(1)); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
