From ba840b81f4bfcf87753284f4a60a22b3b09872d2 Mon Sep 17 00:00:00 2001
From: Endolf <endolf@computerbooth.com>
Date: Sat, 12 May 2018 19:24:07 +0100
Subject: [PATCH] Wintab changes

---
 plugins/OSX/src/main/native/.gitignore        |  3 -
 plugins/windows/src/main/native/.gitignore    |  1 -
 .../windows/src/main/native/dx8/.gitignore    |  3 -
 .../windows/src/main/native/raw/.gitignore    |  4 -
 plugins/wintab/build.xml                      | 76 -------------------
 plugins/wintab/pom.xml                        | 75 ++++++++++++++++++
 .../games/input/WinTabButtonComponent.java    |  0
 .../net/java/games/input/WinTabComponent.java |  0
 .../net/java/games/input/WinTabContext.java   |  0
 .../games/input/WinTabCursorComponent.java    |  0
 .../net/java/games/input/WinTabDevice.java    |  0
 .../games/input/WinTabEnvironmentPlugin.java  |  0
 .../net/java/games/input/WinTabPacket.java    |  0
 .../wintab/src/{ => main}/native/build.xml    |  0
 .../net_java_games_input_WinTabContext.c      |  0
 .../net_java_games_input_WinTabDevice.c       |  0
 plugins/wintab/src/native/.gitignore          |  4 -
 17 files changed, 75 insertions(+), 91 deletions(-)
 delete mode 100644 plugins/OSX/src/main/native/.gitignore
 delete mode 100644 plugins/windows/src/main/native/.gitignore
 delete mode 100644 plugins/windows/src/main/native/dx8/.gitignore
 delete mode 100644 plugins/windows/src/main/native/raw/.gitignore
 delete mode 100644 plugins/wintab/build.xml
 create mode 100644 plugins/wintab/pom.xml
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabButtonComponent.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabComponent.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabContext.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabCursorComponent.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabDevice.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabEnvironmentPlugin.java (100%)
 rename plugins/wintab/src/{ => main}/java/net/java/games/input/WinTabPacket.java (100%)
 rename plugins/wintab/src/{ => main}/native/build.xml (100%)
 rename plugins/wintab/src/{ => main}/native/net_java_games_input_WinTabContext.c (100%)
 rename plugins/wintab/src/{ => main}/native/net_java_games_input_WinTabDevice.c (100%)
 delete mode 100644 plugins/wintab/src/native/.gitignore

diff --git a/plugins/OSX/src/main/native/.gitignore b/plugins/OSX/src/main/native/.gitignore
deleted file mode 100644
index 2b1c8e9..0000000
--- a/plugins/OSX/src/main/native/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/net_java_games_input_OSXHIDDevice.h
-/net_java_games_input_OSXHIDDeviceIterator.h
-/net_java_games_input_OSXHIDQueue.h
diff --git a/plugins/windows/src/main/native/.gitignore b/plugins/windows/src/main/native/.gitignore
deleted file mode 100644
index 04fb3ee..0000000
--- a/plugins/windows/src/main/native/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/net_java_games_input_DummyWindow.h
diff --git a/plugins/windows/src/main/native/dx8/.gitignore b/plugins/windows/src/main/native/dx8/.gitignore
deleted file mode 100644
index 0fd0ace..0000000
--- a/plugins/windows/src/main/native/dx8/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/net_java_games_input_IDirectInput.h
-/net_java_games_input_IDirectInputDevice.h
-/net_java_games_input_IDirectInputEffect.h
diff --git a/plugins/windows/src/main/native/raw/.gitignore b/plugins/windows/src/main/native/raw/.gitignore
deleted file mode 100644
index fb0c52f..0000000
--- a/plugins/windows/src/main/native/raw/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/net_java_games_input_RawDevice.h
-/net_java_games_input_RawInputEnvironmentPlugin.h
-/net_java_games_input_RawInputEventQueue_QueueThread.h
-/net_java_games_input_RawInputEventQueue.h
diff --git a/plugins/wintab/build.xml b/plugins/wintab/build.xml
deleted file mode 100644
index 6e47c64..0000000
--- a/plugins/wintab/build.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0"?>
-<project name="WinTab Input Plugin" basedir="." default="all">
-    <target name="init">
-        <mkdir dir="classes"/>
-        <mkdir dir="bin"/>
-        <condition property="wintab" >
-            <os family="Windows" arch="x86"/>
-        </condition>
-    </target>
-
-    <target name="compile" depends="init">
-        <javac srcdir="../windows/src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
-        	<include name="**/DummyWindow.java"/>
-		</javac>
-
-    	<javac srcdir="src/java" destdir="classes" debug="true" deprecation="true" source="1.4" target="1.4">
-            <!-- To add something to the classpath: -->
-            <classpath>
-				<pathelement location="../../coreAPI/bin/jinput-core.jar"/>
-				<pathelement location="../../lib/jutils.jar"/>
-            </classpath>
-		</javac>
-	</target>
-
-    <target depends="init,compile" name="create_jniheaders">
-		<javah destdir="src/native">
-            <classpath>
-                <pathelement path="classes"/>
-                <pathelement location="../../coreAPI/classes"/>
-            </classpath>
-			<class name="net.java.games.input.DummyWindow"/>
-			<class name="net.java.games.input.WinTabContext"/>
-			<class name="net.java.games.input.WinTabDevice"/>
-			<class name="net.java.games.input.WinTabComponent"/>
-		</javah>
-	</target>
-
-    <target name="compile_native" depends="init,create_jniheaders" if="wintab">
-        <ant dir="src/native" target="compile"/>
-		<copy todir="bin">
-			<fileset dir="src/native" includes="*.dll"/>
-		</copy>
-    </target>
-
-    <target name="jar" depends="init,compile">
-        <jar jarfile="bin/wintab.jar" compress="true" basedir="classes">
-            <include name="**/*.class"/>
-        </jar> 
-    </target>
-
-    <target name="all" depends="compile,compile_native,jar" description="Build everything.">
-    </target>
-
-    <target name="javadoc" depends="init" description="Javadoc for my API.">
-        <mkdir dir="apidocs"/>
-        <javadoc packagenames="net.*" 
-                 destdir="apidocs"
-                 additionalparam="-source 1.4">
-            <sourcepath>
-                <pathelement location="src/java"/>
-            </sourcepath>
-             <classpath>
-                <pathelement location="../windows/src/java"/>
-				 <pathelement location="../../bin/jinput-core.jar"/>
-				<pathelement location="../../lib/jutils.jar"/>
-            </classpath>
-        </javadoc>
-    </target>
-
-    <target name="clean" depends="init" description="Clean all build products.">
-		<delete dir="classes" failonerror="no"/>
-		<delete dir="bin" failonerror="no"/>
-		<delete dir="apidocs" failonerror="no"/>
-		<ant inheritAll="false" antfile="src/native/build.xml" target="clean"/>
-    </target>
-</project>
diff --git a/plugins/wintab/pom.xml b/plugins/wintab/pom.xml
new file mode 100644
index 0000000..030fa71
--- /dev/null
+++ b/plugins/wintab/pom.xml
@@ -0,0 +1,75 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wintab-plugin</artifactId>
+    <packaging>jar</packaging>
+    <name>JInput - Wintab Plugin</name>
+
+    <parent>
+        <groupId>net.java.jinput</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.0.8-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>net.java.jinput</groupId>
+            <artifactId>coreapi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-h</arg>
+                        <arg>${project.build.directory}/generated-sources/natives</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <configuration>
+                            <target>
+                                <ant dir="${project.build.sourceDirectory}/../native"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <configuration>
+                            <classesDirectory>${project.build.directory}/natives</classesDirectory>
+                            <classifier>natives-wintab</classifier>
+                            <includes>
+                                <include>*.dll</include>
+                            </includes>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabButtonComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabButtonComponent.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabButtonComponent.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabButtonComponent.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabComponent.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabComponent.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabComponent.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabContext.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabContext.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabContext.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabContext.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabCursorComponent.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabCursorComponent.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabCursorComponent.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabCursorComponent.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabDevice.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabDevice.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabDevice.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabDevice.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabEnvironmentPlugin.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabEnvironmentPlugin.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabEnvironmentPlugin.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabEnvironmentPlugin.java
diff --git a/plugins/wintab/src/java/net/java/games/input/WinTabPacket.java b/plugins/wintab/src/main/java/net/java/games/input/WinTabPacket.java
similarity index 100%
rename from plugins/wintab/src/java/net/java/games/input/WinTabPacket.java
rename to plugins/wintab/src/main/java/net/java/games/input/WinTabPacket.java
diff --git a/plugins/wintab/src/native/build.xml b/plugins/wintab/src/main/native/build.xml
similarity index 100%
rename from plugins/wintab/src/native/build.xml
rename to plugins/wintab/src/main/native/build.xml
diff --git a/plugins/wintab/src/native/net_java_games_input_WinTabContext.c b/plugins/wintab/src/main/native/net_java_games_input_WinTabContext.c
similarity index 100%
rename from plugins/wintab/src/native/net_java_games_input_WinTabContext.c
rename to plugins/wintab/src/main/native/net_java_games_input_WinTabContext.c
diff --git a/plugins/wintab/src/native/net_java_games_input_WinTabDevice.c b/plugins/wintab/src/main/native/net_java_games_input_WinTabDevice.c
similarity index 100%
rename from plugins/wintab/src/native/net_java_games_input_WinTabDevice.c
rename to plugins/wintab/src/main/native/net_java_games_input_WinTabDevice.c
diff --git a/plugins/wintab/src/native/.gitignore b/plugins/wintab/src/native/.gitignore
deleted file mode 100644
index 85b86d0..0000000
--- a/plugins/wintab/src/native/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/net_java_games_input_DummyWindow.h
-/net_java_games_input_WinTabComponent.h
-/net_java_games_input_WinTabContext.h
-/net_java_games_input_WinTabDevice.h