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 6c85291be80144671b7d40382c562b44d4288d45 Author: Raimund Hocke <[email protected]> Date: Fri Jan 3 18:54:08 2014 +0100 fixed problems with MacApp --- Basics/src/main/java/org/sikuli/basics/RunSetup.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Basics/src/main/java/org/sikuli/basics/RunSetup.java b/Basics/src/main/java/org/sikuli/basics/RunSetup.java index 50c558e..2f335be 100644 --- a/Basics/src/main/java/org/sikuli/basics/RunSetup.java +++ b/Basics/src/main/java/org/sikuli/basics/RunSetup.java @@ -705,6 +705,7 @@ public class RunSetup { if (dlOK) { FileManager.deleteFileOrFolder((new File(workDir, folderMacApp)).getAbsolutePath()); FileManager.unpackJar(targetJar, workDir, false); + FileManager.deleteFileOrFolder(new File(workDir, "META-INF").getAbsolutePath()); } downloadOK &= dlOK; } @@ -837,8 +838,7 @@ public class RunSetup { success &= (new File(workDir, localTemp)).renameTo(new File(localJar)); } - if (Settings.isMac() - && getIDE) { + if (Settings.isMac() && getIDE) { closeSplash(splash); log1(lvl, "preparing Mac app as SikuliX-IDE.app"); splash = showSplash("Now preparing Mac app SikuliX-IDE.app.", "please wait - may take some seconds ..."); @@ -865,8 +865,12 @@ public class RunSetup { String fmac = new File(workDir, folderMacAppContent).getAbsolutePath(); loader.export("Commands/mac#runIDE", fmac); loader.export("Commands/mac#runIDE", workDir); - loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(fmac, "runIDE").getAbsolutePath()}); - loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", new File(workDir, "runIDE").getAbsolutePath()}); + loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", + new File(fmac, "runIDE").getAbsolutePath()}); + loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", + new File(fmac, "MacOS/droplet").getAbsolutePath()}); + loader.doSomethingSpecial("runcmd", new String[]{"chmod", "ugo+x", + new File(workDir, "runIDE").getAbsolutePath()}); // FileManager.deleteFileOrFolder(new File(workDir, localIDE).getAbsolutePath()); FileManager.deleteFileOrFolder(new File(workDir, localMacApp).getAbsolutePath()); localTestJar = new File(fmac, localIDE).getAbsolutePath(); -- 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
