[sikuli] 236/385: minor

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 19:26:18 UTC 2014


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 48077dabcb88ec98a1236363c00c98b845e40798
Author: Raimund Hocke <info at its-me-raiman.de>
Date:   Thu Feb 20 11:29:38 2014 +0100

    minor
---
 .../src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java | 9 +--------
 .../main/java/org/sikuli/scriptrunner/JythonScriptRunner.java    | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
index 3c791d5..c1f755b 100755
--- a/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
+++ b/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java
@@ -84,9 +84,6 @@ 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
@@ -99,8 +96,6 @@ public class JRubyScriptRunner implements IScriptRunner {
 			//run the Ruby statements from argv (special for setup functional test)
 			fillSysArgv(null, null);
 			createScriptingContainer();
-			interpreter.put("SIKULI_IMAGE_PATH",
-							imagedirectory.getAbsolutePath());
 			executeScriptHeader(new String[0]);
 			SikuliX.displaySplash(null);
 			return runRuby(null, scriptArgs, null);
@@ -108,8 +103,6 @@ public class JRubyScriptRunner implements IScriptRunner {
 		scriptfile = new File(scriptfile.getAbsolutePath());
 		fillSysArgv(scriptfile, scriptArgs);
 		createScriptingContainer();
-		interpreter.put("SIKULI_IMAGE_PATH",
-						imagedirectory.getAbsolutePath());
 		if (forIDE == null) {
 			executeScriptHeader(new String[]{
 				scriptfile.getParentFile().getAbsolutePath(),
@@ -428,7 +421,7 @@ public class JRubyScriptRunner implements IScriptRunner {
 	}
 
 	/**
-	 * Executes the defined header for the jython script.
+	 * Executes the defined header for the jruby script.
 	 *
 	 * @param syspaths List of all syspath entries
 	 */
diff --git a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
index 57b1303..484c0e6 100644
--- a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
+++ b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
@@ -128,7 +128,7 @@ public class JythonScriptRunner implements IScriptRunner {
   @Override
   public int runScript(File pyFile, File imagePath, String[] argv, String[] forIDE) {
     if (null == pyFile) {
-      //run the Python statements from argv (special for setup fgunctional test)
+      //run the Python statements from argv (special for setup functional test)
       fillSysArgv(null, null);
       createPythonInterpreter();
       executeScriptHeader(new String[0]);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git



More information about the pkg-java-commits mailing list