From ac3af97f2d556c3738e904188c571ee0833fc1dc Mon Sep 17 00:00:00 2001
From: Alexander Barker <alex@1stleg.com>
Date: Tue, 21 Jan 2014 17:13:33 -0800
Subject: [PATCH] Cleaned up native code compilation.

---
 build.num                                  |   6 +-
 build.xml                                  | 207 +++++++++++----------
 src/java/org/jnativehook/GlobalScreen.java |   2 +-
 3 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/build.num b/build.num
index a47da75d..5716f8f5 100644
--- a/build.num
+++ b/build.num
@@ -1,5 +1,5 @@
 #Build Number for ANT. Do not edit!
 
-build.major=1
-build.minor=2
-build.revision=0
+ant.build.major=1
+ant.build.minor=2
+ant.build.revision=0
diff --git a/build.xml b/build.xml
index 6c0066ec..2efe4711 100644
--- a/build.xml
+++ b/build.xml
@@ -24,18 +24,23 @@
 	<property file="build.num" />
 
 	<property name="ant.project.vendor" value="Alexander Barker (alex@1stleg.com)" />
-	<property name="ant.project.version" value="${build.major}.${build.minor}.${build.revision}" />
+	<property name="ant.project.version" value="${ant.build.major}.${ant.build.minor}.${ant.build.revision}" />
 
     <property file="build.properties" />
-    <property name="ant.project.debug" value="true" />
+    <property name="ant.build.debug" value="true" />
+    <property name="ant.build.javac.compiler" value="modern" />
+    <property name="ant.build.javac.source" value="1.5" />
+    <property name="ant.build.javac.target" value="1.5" />
     <property name="ant.build.javac.args" value="" />
 
-    <!-- property name="build.compiler" value="modern" /-->
-    <!-- property name="ant.build.javac.compiler" value="modern" /-->
-
-    <!-- property name="ant.build.javac.target" value="1.5" /-->
-    <property name="ant.build.javac.source" value="1.5" />
-    <!-- property name="ant.build.javac.args" value="" /-->
+    <!-- Set the compiler flags. -->
+    <condition property="ant.build.native.cflags" value="${env.CFLAGS}" else="-O2 -g -pipe">
+        <isset property="${env.CFLAGS}" />
+    </condition>
+    <!-- Set the linker flags. -->
+    <condition property="ant.build.native.ldflags" value="${env.LDFLAGS}" else="-Wl,-O1">
+        <isset property="${env.LDFLAGS}" />
+    </condition>
 
     <property name="ant.build.native.toolchain" value="gcc" />
     <property name="ant.build.native.jobs" value="auto" />
@@ -52,7 +57,7 @@
 
 	<!-- Class Path Settings -->
 	<!-- NOTE Gentoo requires `CLASSPATH="$(java-config -p ant-junit,junit-4)" ant test` -->
-	<path id="project.class.path">
+	<path id="ant.project.class.path">
 		<pathelement location="${dir.bin}/class/java" />
 		<pathelement location="${dir.bin}/class/test" />
 		<pathelement location="${dir.jar}" />
@@ -72,24 +77,18 @@
 	</target>
 
 
-	<target name="distclean" depends="clean" description="Removes all items generated by the build system.">
-		<echo>Cleaning all build related items...</echo>
 
-		<delete includeEmptyDirs="true" verbose="true" failonerror="false">
-			<fileset dir="${dir.bin}" />
-			<fileset dir="${dir.dist}" />
-			<fileset dir="${dir.doc}" />
-			<fileset dir="${dir.jar}" />
-			<fileset dir="${dir.lib}" />
+    <target name="mostlyclean" depends="clean" description="Removes all items except previously built libs.">
+        <echo>Cleaning all build related items...</echo>
 
-            <!-- Brilliant!
-            <fileset dir="${dir.src}/jnitasks" />
-            <fileset dir="${dir.src}/libuiohook" />
-            -->
+        <delete includeEmptyDirs="true" verbose="true" failonerror="false">
+            <fileset dir="${dir.dist}" />
+            <fileset dir="${dir.doc}" />
+            <fileset dir="${dir.jar}" />
 
             <fileset dir="${dir.src}/libuiohook" casesensitive="yes">
-                <include name="autom4te.cache/*" />
-                <include name="config/*" />
+                <include name="autom4te.cache" />
+                <include name="config" />
 
                 <include name="include/*" />
                 <exclude name="include/uiohook.h"/>
@@ -100,12 +99,28 @@
                 <include name="pc/*" />
                 <exclude name="pc/uiohook.pc.in" />
 
+                <include name="Makefile" />
                 <include name="Makefile.in" />
                 <include name="aclocal.m4" />
+                <include name="config.log" />
+                <include name="config.status" />
                 <include name="configure" />
             </fileset>
 
-			<fileset file="${dir.src}/jni/include/org_jnativehook_GlobalScreen.h" />
+            <fileset file="${dir.src}/jni/include/org_jnativehook_GlobalScreen.h" />
+        </delete>
+    </target>
+
+	<target name="distclean" depends="mostlyclean" description="Removes all items generated by the build system.">
+		<echo>Cleaning all build related items...</echo>
+
+		<delete includeEmptyDirs="true" verbose="true" failonerror="false">
+            <!-- Brilliant!
+            <fileset dir="${dir.src}/jnitasks" />
+            <fileset dir="${dir.src}/libuiohook" />
+            -->
+
+			<fileset dir="${dir.lib}" />
 		</delete>
 	</target>
 
@@ -118,9 +133,9 @@
             <condition>
                 <not>
                     <and>
-                        <isset property="build.major" />
-                        <isset property="build.minor" />
-                        <isset property="build.revision" />
+                        <isset property="ant.build.major" />
+                        <isset property="ant.build.minor" />
+                        <isset property="ant.build.revision" />
                     </and>
                 </not>
             </condition>
@@ -208,34 +223,34 @@
 
 
 		<!-- Set the operating system name used for organizing native libraries -->
-		<condition property="build.native.os" value="freebsd">
+		<condition property="ant.build.native.os" value="freebsd">
 			<os family="unix" name="FreeBSD" />
 		</condition>
-		<condition property="build.native.os" value="openbsd">
+		<condition property="ant.build.native.os" value="openbsd">
 			<os family="unix" name="OpenBSD" />
 		</condition>
-		<condition property="build.native.os" value="darwin">
+		<condition property="ant.build.native.os" value="darwin">
 			<and>
 				<os family="mac" />
 				<os family="unix" />
 			</and>
 		</condition>
-		<condition property="build.native.os" value="solaris">
+		<condition property="ant.build.native.os" value="solaris">
 			<or>
 				<os family="unix" name="Solaris" />
 				<os family="unix" name="SunOS" />
 			</or>
 		</condition>
-		<condition property="build.native.os" value="linux">
+		<condition property="ant.build.native.os" value="linux">
 			<os family="unix" name="Linux" />
 		</condition>
-		<condition property="build.native.os" value="windows">
+		<condition property="ant.build.native.os" value="windows">
 			<os family="winnt" />
 		</condition>
 
 
 		<!-- Set the system arch name used for organizing native libraries -->
-		<condition property="build.native.arch" value="x86">
+		<condition property="ant.build.native.arch" value="x86">
 			<or>
 				<os arch="x86" />
 				<os arch="i386" />
@@ -244,7 +259,7 @@
 				<os arch="i686" />
 			</or>
 		</condition>
-		<condition property="build.native.arch" value="x86_64">
+		<condition property="ant.build.native.arch" value="x86_64">
 			<or>
 				<os arch="x86-64" />
 				<os arch="x86_64" />
@@ -252,19 +267,19 @@
 				<os arch="k8" />
 			</or>
 		</condition>
-		<condition property="build.native.arch" value="ppc">
+		<condition property="ant.build.native.arch" value="ppc">
 			<or>
 				<os arch="ppc" />
 				<os arch="PowerPC" />
 			</or>
 		</condition>
-		<condition property="build.native.arch" value="ppc64">
+		<condition property="ant.build.native.arch" value="ppc64">
 			<or>
 				<os arch="ppc64" />
 				<os arch="PowerPC64" />
 			</or>
 		</condition>
-		<property name="build.native.arch" value="${os.arch}" />
+		<property name="ant.build.native.arch" value="${os.arch}" />
 		<!-- TODO Testing Needed
 		<condition property="native.arch" value="sparc">
 			<os arch="sparc" />
@@ -272,19 +287,36 @@
 		-->
 
 
+        <!-- Figure out the operating system we are building for. -->
+        <condition property="native.os.isApple" value="true">
+            <equals arg1="${ant.build.native.os}" arg2="darwin" />
+        </condition>
+        <condition property="native.os.isUnix" value="true">
+            <or>
+                <equals arg1="${ant.build.native.os}" arg2="freebsd" />
+                <equals arg1="${ant.build.native.os}" arg2="openbsd" />
+                <equals arg1="${ant.build.native.os}" arg2="solaris" />
+                <equals arg1="${ant.build.native.os}" arg2="linux" />
+            </or>
+        </condition>
+        <condition property="native.os.isWindows" value="true">
+            <equals arg1="${ant.build.native.os}" arg2="windows" />
+        </condition>
+
+
 		<!-- Set system specific library name -->
-		<condition property="build.native.executable" value="lib${ant.project.name}.dylib">
-			<equals arg1="${build.native.os}" arg2="darwin" />
+		<condition property="ant.build.native.executable" value="lib${ant.project.name}.dylib">
+			<equals arg1="${ant.build.native.os}" arg2="darwin" />
 		</condition>
-		<condition property="build.native.executable" value="${ant.project.name}.dll">
-            <equals arg1="${build.native.os}" arg2="windows" />
+		<condition property="ant.build.native.executable" value="${ant.project.name}.dll">
+            <equals arg1="${ant.build.native.os}" arg2="windows" />
 		</condition>
-        <property name="build.native.executable" value="lib${ant.project.name}.so" />
+        <property name="ant.build.native.executable" value="lib${ant.project.name}.so" />
 
 
         <!-- Create property file for the descovered values -->
-        <propertyfile file="build.properties" comment="auto-generated by ant configure">
-            <entry key="ant.project.debug" value="${ant.project.debug}" />
+        <propertyfile file="ant.build.properties" comment="auto-generated by ant configure">
+            <entry key="ant.build.debug" value="${ant.build.debug}" />
             <entry key="ant.build.javac.args" value="${ant.build.javac.args}" />
         </propertyfile>
 	</target>
@@ -325,7 +357,7 @@
     <target name="bootstrap-libuiohook" depends="compile-jnitasks,download-libuiohook" unless="project.check.libuiohook.bootstrap" description="Initialize the native library build system.">
         <echo>Bootstrapping libUIOHook...</echo>
         <autoreconf dir="${dir.src}/libuiohook" force="true" install="true">
-            <include path="/opt/local/share/aclocal" os="darwin" />
+            <include path="/opt/local/share/aclocal" if="native.os.isApple" />
         </autoreconf>
     </target>
 
@@ -333,11 +365,10 @@
         <echo>Configuring libUIOHook source...</echo>
         <mkdir dir="${dir.bin}/libuiohook" />
         <configure dir="${dir.bin}/libuiohook" path="${dir.src}/libuiohook" prefix="${dir.bin}">
-            <enable>debug</enable>
+            <enable if="ant.build.debug">debug</enable>
             <enable>quiet</enable>
             <enable>static</enable>
             <disable>shared</disable>
-            <enable>demo</enable>
             <with>pic</with>
         </configure>
     </target>
@@ -354,7 +385,7 @@
 
 		<javac
 			destdir="${dir.bin}/class/java"
-			debug="${ant.project.debug}"
+			debug="${ant.build.debug}"
 			debuglevel="lines,vars,source"
 			optimize="true"
 			deprecation="false"
@@ -365,7 +396,7 @@
             <compilerarg line="${ant.build.javac.args}"/>
 			<src path="${dir.src}/java" />
 
-			<classpath refid="project.class.path" />
+			<classpath refid="ant.project.class.path" />
             <bootclasspath path="${ant.build.javac.bootclasspath}" />
 		</javac>
 	</target>
@@ -375,13 +406,13 @@
 		<echo>Creating JNI Headers...</echo>
 		<javah destdir="${dir.src}/jni/include" verbose="true">
 			<class name="org.jnativehook.GlobalScreen"/>
-			<classpath refid="project.class.path" />
+			<classpath refid="ant.project.class.path" />
 			<bootclasspath path="${ant.build.javac.bootclasspath}" />
 		</javah>
 
 
         <!-- Call pkg-config to determin what libraries to link against. -->
-        <pkgconfig libs="true" packages="uiohook" outputproperty="build.native.ld.libs">
+        <pkgconfig libs="true" packages="uiohook" outputproperty="ant.build.native.ld.libs">
             <dirset dir="${dir.bin}">
                 <include name="lib/pc"/>
                 <include name="bin/pc"/>
@@ -393,17 +424,6 @@
 		<!-- Create required directories for compiling -->
 		<mkdir dir="${dir.bin}/obj/jni" />
 
-        <!-- Set compiler debug flags -->
-        <condition property="native.cc.flags.debug" value="-g -DDEBUG" else="-Werror -Wno-unused-parameter -Wno-unused-variable">
-            <istrue value="${ant.project.debug}" />
-        </condition>
-
-        <!-- Set the compiler flags. -->
-        <condition property="env.CFLAGS" value="${env.CFLAGS}" else="-O2 -g -pipe">
-            <isset property="${env.CFLAGS}" />
-        </condition>
-
-
         <!--
         TODO Test without  -fno-strict-aliasing
 
@@ -411,7 +431,7 @@
         -F/System/Library/Frameworks/ApplicationServices.framework/Frameworks
         -I${dir.bin}/obj/native/include -I${dir.src}/jni/include -I/usr/lib -I${java.include} -I${java.include}/darwin
         -c ${native.cc.flags} -fPIC -Wall -Wextra ${native.cc.flags.debug} ${native.cc.includes}
-        -dynamiclib -Wl,-dead_strip,-dead_strip_dylibs,-install_name,${native.executable}.${build.major}.${build.minor},-compatibility_version,${build.major}.${build.minor},-current_version,${build.major}.${build.minor}.${build.revision}
+        -dynamiclib -Wl,-dead_strip,-dead_strip_dylibs,-install_name,${native.executable}.${ant.build.major}.${ant.build.minor},-compatibility_version,${ant.build.major}.${ant.build.minor},-current_version,${ant.build.major}.${ant.build.minor}.${ant.build.revision}
 
         Unix
         -I${dir.bin}/include -I${dir.src}/jni/include -I${java.include} -I${java.include}/linux
@@ -427,21 +447,18 @@
 		<!-- Execute the native compiler on the soruce files -->
         <cc toolchain="gcc" jobs="${ant.build.native.jobs}" objdir="${dir.bin}/obj/jni">
             <arg value="-Wall -Wextra -Wno-unused-parameter" />
-            <arg value="-fPIC"  osfamily="unix" />
-            <arg value="${env.CFLAGS}" />
+            <arg value="-fPIC" unless="native.os.isWindows" />
+            <arg value="${ant.build.native.cflags}" />
 
-            <define name="DEBUG" />
-            <define name="__int64" value="int64_t" />
+            <define name="DEBUG" if="ant.build.debug"/>
+            <define name="__int64" value="int64_t" if="native.os.isWindows" />
 
             <include path="${dir.bin}/include" />
             <include path="${dir.src}/jni/include" />
 
             <include path="${ant.build.javac.include}" />
-            <include path="${ant.build.javac.include}/darwin" osfamily="mac" />
-            <include path="${ant.build.javac.include}/linux" os="linux" />
-            <include path="${ant.build.javac.include}/solaris" os="solaris" />
-            <include path="${ant.build.javac.include}/unix" os="unix" />
-            <include path="${ant.build.javac.include}/win32" osfamily="windows" />
+            <include path="${ant.build.javac.include}/win32" if="native.os.isWindows"/>
+            <include path="${ant.build.javac.include}/${ant.build.native.os}" unless="native.os.isWindows"/>
 
             <fileset dir="${dir.src}/jni">
                 <include name="**/*.c" />
@@ -451,35 +468,21 @@
 
 		<echo>Linking C objects...</echo>
 		<!-- Create required directory for linking -->
-		<mkdir dir="${dir.lib}/${build.native.os}/${build.native.arch}" />
+		<mkdir dir="${dir.lib}/${ant.build.native.os}/${ant.build.native.arch}" />
 
-        <!-- Set the linker flags. -->
-        <condition property="env.LDFLAGS" value="${env.LDFLAGS}" else="">
-            <isset property="${env.LDFLAGS}" />
-        </condition>
-
-		<ld toolchain="gcc" outfile="${dir.lib}/${build.native.os}/${build.native.arch}/${build.native.executable}">
+		<ld toolchain="gcc" outfile="${dir.lib}/${ant.build.native.os}/${ant.build.native.arch}/${ant.build.native.executable}">
             <!-- weak linker options for darwin: -Wl,-flat_namespace,-undefined,dynamic_lookup -->
-            <!-- -Wl,- -as-needed -->
-            <arg value="-dynamiclib" osfamily="mac" />
-            <arg value="-shared -Wl,--as-needed" os="linux" />
-            <arg value="-shared" os="solaris" />
-            <arg value="-shared" os="unix" />
-            <arg value="-shared -Wl,--kill-at" osfamily="windows" />
-            <arg value="${env.LDFLAGS}" />
+            <arg value="-dynamiclib" if="native.os.isApple" />
+            <arg value="-shared" unless="native.os.isApple" />
+
+            <arg value="${ant.build.native.ldflags}" />
 
             <fileset dir="${dir.bin}">
                 <include name="obj/jni/**/*.o" />
             </fileset>
 
-
-            <!-- fileset dir="${dir.bin}">
-                <include name="lib/*.a" />
-                <include name="lib/*.dll.a" />
-            </fileset -->
-
             <!-- Linking order matters and libraries should come after obj files. -->
-            <arg value="${build.native.ld.libs}" />
+            <arg value="${ant.build.native.ld.libs}" />
 		</ld>
 	</target>
 
@@ -494,7 +497,7 @@
 
 		<javac
 			destdir="${dir.bin}/class/test"
-			debug="${ant.project.debug}"
+			debug="${ant.build.debug}"
 			debuglevel="lines,vars,source"
 			optimize="true"
 			deprecation="false"
@@ -504,7 +507,7 @@
 		>
 			<src path="${dir.src}/test" />
 
-			<classpath refid="project.class.path" />
+			<classpath refid="ant.project.class.path" />
 			<bootclasspath path="${ant.build.javac.bootclasspath}" />
 
 			<compilerarg value="-Xlint:unchecked" />
@@ -512,9 +515,9 @@
 
 		<echo>Performing JUnit tests...</echo>
 		<junit fork="true" printsummary="true" haltonerror="true">
-			<jvmarg value="-Djava.library.path=${dir.lib}/${build.native.os}/${build.native.arch}" />
+			<jvmarg value="-Djava.library.path=${dir.lib}/${ant.build.native.os}/${ant.build.native.arch}" />
 
-			<classpath refid="project.class.path" />
+			<classpath refid="ant.project.class.path" />
 
 			<formatter type="brief" usefile="false" />
 			<!-- test name="TestExample" / -->
@@ -553,7 +556,7 @@
 
 	<target name="run" depends="compile" description="Execute the bundled example.">
 		<java classname="org.jnativehook.example.NativeHookDemo" fork="true" failonerror="true">
-			<jvmarg value="-Djava.library.path=${dir.lib}/${build.native.os}/${build.native.arch}" />
+			<jvmarg value="-Djava.library.path=${dir.lib}/${ant.build.native.os}/${ant.build.native.arch}" />
 			<classpath>
 				<pathelement location="${dir.jar}/${ant.project.name}.jar" />
 				<pathelement path="${dir.bin}/class/java" />
@@ -626,9 +629,9 @@
 
 		<!-- Increment and write out the build numbers
 		<propertyfile file="build.num" comment="Build Number for ANT. Do not edit!">
-			<entry key="build.major" type="int" value="${build.major}" />
-			<entry key="build.minor" type="int" value="${build.minor}" />
-			<entry key="build.revision" type="int" value="1" operation="+" />
+			<entry key="ant.build.major" type="int" value="${ant.build.major}" />
+			<entry key="ant.build.minor" type="int" value="${ant.build.minor}" />
+			<entry key="ant.build.revision" type="int" value="1" operation="+" />
 		</propertyfile>
 		 -->
 	</target>
diff --git a/src/java/org/jnativehook/GlobalScreen.java b/src/java/org/jnativehook/GlobalScreen.java
index 139c1827..8f6f262b 100644
--- a/src/java/org/jnativehook/GlobalScreen.java
+++ b/src/java/org/jnativehook/GlobalScreen.java
@@ -445,7 +445,7 @@ public final void setEventDispatcher(ExecutorService dispatcher) {
 	 * include unpacking and loading the library into the Java Virtual Machine.
 	 */
 	private static void loadNativeLibrary() {
-		System.out.println(
+		System.out.println("\n" +
 			"JNativeHook: Global keyboard and mouse hooking for Java.\n" +
 			"Copyright (C) 2006-2014 Alexander Barker.  All Rights Received.\n" +
 			"https://github.com/kwhat/libuiohook/\n" +