[sikuli] 08/53: Update patch basics-exclude-windows-mac.patch

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository sikuli.

commit 754427342ca5ac8c9a82e0d935be183022eb0945
Author: Gilles Filippini <pini at debian.org>
Date:   Thu May 8 18:22:26 2014 +0200

    Update patch basics-exclude-windows-mac.patch
    
    Don't build SysJNA.java which is Windows specific and depends on
    BridJ which is not packaged for Debian.
---
 debian/patches/basics-exclude-windows-mac.patch | 63 +++++++++++++++++++------
 debian/patches/series                           |  2 +-
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch
index 8ce364e..7c42798 100644
--- a/debian/patches/basics-exclude-windows-mac.patch
+++ b/debian/patches/basics-exclude-windows-mac.patch
@@ -4,18 +4,51 @@ Description: Exclude Windows and Mac specific source file from the build.
 Author: Gilles Filippini <pini at debian>
 Index: sikuli/Basics/pom.xml
 ===================================================================
---- sikuli.orig/Basics/pom.xml	2013-11-03 21:25:32.000000000 +0100
-+++ sikuli/Basics/pom.xml	2013-11-03 21:25:32.000000000 +0100
-@@ -123,6 +123,12 @@
-           <source>1.6</source>
-           <target>1.6</target>
-           <encoding>UTF-8</encoding>
-+          <excludes>
-+            <exclude>**/basics/WindowsHotkeyManager.java</exclude>
-+            <exclude>**/basics/WinUtil.java</exclude>
-+            <exclude>**/basics/MacHotkeyManager.java</exclude>
-+            <exclude>**/basics/MacUtil.java</exclude>
-+          </excludes>
-         </configuration>
-       </plugin>
-     </plugins>
+--- sikuli.orig/Basics/pom.xml	2014-05-08 18:14:42.973872273 +0200
++++ sikuli/Basics/pom.xml	2014-05-08 18:15:08.262042501 +0200
+@@ -94,6 +94,20 @@
+ 					<mainClass>org.sikuli.basics.RunSetup</mainClass>
+ 				</configuration>
+ 			</plugin>
++			<plugin>
++				<artifactId>maven-compiler-plugin</artifactId>
++				<version>debian</version>
++				<configuration>
++					<encoding>UTF-8</encoding>
++					<excludes>
++						<exclude>**/basics/WindowsHotkeyManager.java</exclude>
++						<exclude>**/basics/WinUtil.java</exclude>
++						<exclude>**/basics/MacHotkeyManager.java</exclude>
++						<exclude>**/basics/MacUtil.java</exclude>
++						<exclude>**/basics/SysJNA.java</exclude>
++					</excludes>
++				</configuration>
++			</plugin>
+ 		</plugins>
+ 	</build>
+ </project>
+Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java
+===================================================================
+--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java	2014-05-08 18:09:35.367796319 +0200
++++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java	2014-05-08 18:18:01.703208309 +0200
+@@ -479,17 +479,17 @@
+       log(lvl, "trying: " + path);
+       if (Settings.isWindows()) {
+         log(lvl, "Running on Windows - checking system path!");
+-        String syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
++        String syspath = "";
+         if (syspath == null) {
+           SikuliX.terminate(1);
+         } else {
+           path = (new File(path).getAbsolutePath()).replaceAll("/", "\\");
+           if (!syspath.toUpperCase().contains(path.toUpperCase())) {
+-            if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", syspath + ";" + path)) {
++            if (true) {
+               SikuliX.terminate(1);
+             }
+             log(lvl, "Added libs dir to path: " + path);
+-            syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
++            syspath = "";
+             if (!syspath.toUpperCase().contains(path.toUpperCase())) {
+               log(-1, "Adding to path did not work:\n%s", syspath);
+               System.exit(1);
diff --git a/debian/patches/series b/debian/patches/series
index 467c592..18e82fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,7 @@ setTextAndMnemonic.patch
 #parent-pom.patch
 #add-classpath.patch
 #preserve-source-utf-8.patch
-#basics-exclude-windows-mac.patch
+basics-exclude-windows-mac.patch
 #no-maven-repo-dependencies.patch
 #resources-out-of-jar.patch
 pom-removed-modules.patch

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