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 8a391d763aa0b20b3b032e7d15eef3c667817423 Author: Raimund Hocke <[email protected]> Date: Tue Feb 11 11:22:27 2014 +0100 should be done before loading first SikuliX lib --- .../java/org/sikuli/basics/ResourceLoader.java | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java index 9b140cd..950de8f 100755 --- a/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java +++ b/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java @@ -398,20 +398,6 @@ public class ResourceLoader implements IResourceLoader { } } - //convenience: jawt.dll in libsdir avoids need for java/bin in system path - if (Settings.isWindows()) { - String lib = "jawt.dll"; - try { - extractResource(javahome + "bin/" + lib, new File(libPath, lib), false); - } catch (IOException ex) { - log(-1, "Fatal error 107: problem copying " + lib + "\n" + ex.getMessage()); - RunSetup.popError("Trying to add jawt.dll from Java at\n" - + javahome + " to SikuliX libs folder ..." - + "... but did not work - see error log"); - SikuliX.terminate(107); - } - } - if (itIsJython) { export("Lib/sikuli", libsDir.getParent()); } @@ -454,6 +440,20 @@ public class ResourceLoader implements IResourceLoader { if ((new File(jarPath)).lastModified() > checkFile.lastModified()) { log(-1, "libs folder outdated!"); } else { + //convenience: jawt.dll in libsdir avoids need for java/bin in system path + if (Settings.isWindows()) { + String lib = "jawt.dll"; + try { + extractResource(javahome + "bin/" + lib, new File(libPath, lib), false); + log(lvl, "copied to libs: jawt.dll"); + } catch (IOException ex) { + log(-1, "Fatal error 107: problem copying " + lib + "\n" + ex.getMessage()); + RunSetup.popError("Trying to add jawt.dll from Java at\n" + + javahome + " to SikuliX libs folder ..." + + "... but did not work - see error log"); + SikuliX.terminate(107); + } + } loadLib(checkLib); log(lvl, "Using libs at: " + path); dir = new File(path); -- 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
