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 8c94a8021157d8c8a1153e2b89a5d58a4031b461 Author: hankin <[email protected]> Date: Fri Dec 27 13:16:27 2013 +1100 Capitialization fixes for linux. On startup, don't replace Natives -> Libs --- Basics/src/main/java/org/sikuli/basics/ResourceLoader.java | 2 +- IDE/pom.xml | 2 +- Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java index 40d2d05..fd9faba 100755 --- a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java +++ b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java @@ -163,7 +163,7 @@ public class ResourceLoader implements IResourceLoader { RunSetup.popError("Terminating: The jar in use was not built with setup!\n" + jarPath); System.exit(1); } else { - jarPath = jarPath.replace("Natives", "Libs"); +// jarPath = jarPath.replace("Natives", "Libs"); log(-1, "The jar in use was not built with setup!\nRunning in Netbeans? trying:\n" + jarPath); // System.exit(1); } diff --git a/IDE/pom.xml b/IDE/pom.xml index c446edf..d188ae5 100755 --- a/IDE/pom.xml +++ b/IDE/pom.xml @@ -72,7 +72,7 @@ <configuration> <archive> <manifest> - <mainClass>org.sikuli.IDE.SikuliIDE</mainClass> + <mainClass>org.sikuli.ide.SikuliIDE</mainClass> </manifest> </archive> </configuration> diff --git a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java index 44fe8ce..b31ad9f 100644 --- a/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java +++ b/Jython/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java @@ -60,7 +60,7 @@ public class JythonScriptRunner implements IScriptRunner { "import sys", "print '[debug] Running Jython:', sys.version.split('\\n')[0]", "from __future__ import with_statement", - "from sikuli import *", + "from Sikuli import *", "use() #resetROI()", "setShowActions(False)" }; @@ -379,7 +379,7 @@ public class JythonScriptRunner implements IScriptRunner { String[] jy_args = null; String[] iargs = {"-i", "-c", - "from sikuli import *; SikuliScript.runningInteractive(); " + "from Sikuli import *; SikuliScript.runningInteractive(); " + "print \"Hello, this is your interactive Sikuli (rules for interactive Python apply)\\n" + "use the UP/DOWN arrow keys to walk through the input history\\n" + "help()<enter> will output some basic Python information\\n" -- 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
