Merge branch 'master' of github.com:/atgreen/libffi

Conflicts:
	ChangeLog

.gitignore

@@ -1,8 +1,21 @@
-build
-build.eclipse
-build.number
-.metadata
-bin
-jnalib/contrib/ntservice/dist
-jnalib/contrib/platform/dist
-
+.libs
+.deps
+*.o
+*.lo
+.dirstamp
+*.la
+Makefile
+config.log
+config.status
+*~
+fficonfig.h
+include/ffi.h
+include/ffitarget.h
+libffi.pc
+libtool
+stamp-h1
+libffi*gz
+autom4te.cache
+libffi.xcodeproj/xcuserdata
+libffi.xcodeproj/project.xcworkspace
+ios/

.travis.yml

@@ -0,0 +1,8 @@
+language: c
+compiler:
+  - gcc
+  - clang
+
+before_script: sudo apt-get install dejagnu
+
+script: ./configure && make && make check

CHANGES.md

@@ -1,479 +0,0 @@
-Release 3.3.0
-=============
-
-Features
---------
-
-* Facilitate `Memory` subclasses (jbellis).
-* Allow multiple fields of the same type in Unions (Francis Barber).
-* Add `platform.win32.Advapi32.AdjustTokenPrivileges`, `platform.win32.Advapi32.LookupPrivilegeName`, `platform.win32.Advapi32.LookupPrivilegeValue`, `platform.win32.Advapi32.ImpersonateSelf`.
-* Add `platform.win32.Advapi32.DuplicateTokenEx`, `platform.win32.Advapi32.CreateProcessAsUser`, `platform.win32.Kernel32.GetExitCodeProcess`, `platform.win32.Kernel32.TerminateProcess`, `platform.win32.Kernel32.ReadFile`, `platform.win32.Kernel32.CreatePipe`, `platform.win32.Kernel32.SetHandleInformation` and related constants / structures in `platform.win32.WinBase` and `platform.win32.WinNT`. Please note that the `SECURITY_ATTRIBUTES` structure has been moved from `platform.win32.WinNT` to `platform.win32.WinBase`.
-* Add `platform.win32.Kernel32.DeleteFile` and `platform.win32.Kernel32Util.deleteFile`.
-* Add `platform.win32.Kernel32.GetFileAttributes` and `platform.win32.Kernel32Util.getFileAttributes`.
-* Add `platform.win32.Kernel32.GetTickCount`.
-* Add Win32 Service functions to `platform.win32.Advapi32`.
-* Add `platform.win32.W32ServiceManager` and `W32Service`.
-* Add Win32 Event Logging functions to `platform.win32.Advapi32` and `platform.win32.Advapi32Util.EventLogIterator`.
-* `platform.win32.Advapi32Util.registryCreateKey` returns `true` if key was created, `false` if it already exists.
-* Add `REG_BINARY`, `REG_EXPAND_SZ` and `REG_MULTI_SZ` support to `platform.win32.Advapi32Util` registry functions.
-* Reduce JNI crossings in a number of native methods, moving object creation out into pure Java code.
-
-Bug Fixes
----------
-
-* Move all native functions into `com.sun.jna.Native`, to ensure that all dependent classes must be disposed before the `Native` class is unloaded.  Note that this change is incompatible with all previous JNA native libraries.
-* Fix `platform.win32.Kernel32.GetNativeSystemInfo` and `GetSystemInfo` AV on Win64.
-* Fix several potential minor bugs as reported by TvT.
-* Fix bug in Structure.StructureSet.toString (Blair Zajac), exposed by Tomcat ThreadLocal cleanup.
-* Fix several bugs when using Structure(Pointer) ctor and array fields (Samuel Audet).
-
-Release 3.2.7
-=============
-
-Features
---------
-
-* Add native peer value accessors for Pointer
-* The `jna.library.path` property is now re-evaluated whenever a native library is loaded.  Previously this value was cached when the JNA classes loaded.
-* `Native.loadLibrary` can now load `.drv` files.
-* Refactor `com.sun.jna.platform.win32.WINBASE` into `WinDef`, `WinNT` and `BaseTSD`, matching Windows SDK headers.
-* Refactor constants from `com.sun.jna.platform.win32.GDI32` into `WinGDI`, matching Windows SDK headers.
-* Refactor constants from `com.sun.jna.platform.win32.User32` into `WinUser`, matching Windows SDK headers.
-* Refactor `platform.win32.WinNT.LARGE_INTEGER` into a union.
-* Add `platform.win32.ObjBase`, `com.sun.jna.platform.win32.Ole32.CoInitializeEx`, `CoUninitialize`, and `CoCreateInstance`.
-* Add `platform.win32.Oleaut32.SysAllocString` and `SysFreeString`.
-* Add `platform.win32.Secur32.ImpersonateSecurityContext` and `RevertSecurityContext`.
-* Add `platform.win32.WinNT.WELL_KNOWN_SID_TYPE`, `SECURITY_MAX_SID_SIZE` and other related SID-related constants.
-* Add `platform.win32.Advapi32.CreateWellKnownSid` and `IsWellKnownSid` and `com.sun.jna.platform.win32.Advapi32Util.isWellKnownSid`.
-* Add `platform.win32.Kernel32.GetVersion`, `GetVersionEx`, `GetSystemInfo`, `GetNativeSystemInfo`, `GlobalMemoryStatusEx`, `GetLogicalDriveStrings` and `IsWow64Process`.
-* Add `platform.win32.Kernel32Util.getLogicalDriveStrings`.
-* Add `platform.win32.User32.GetSystemMetrics`.
-* Add `platform.win32.BaseTSD.DWORD_PTR`.
-* Add `platform.win32.WinBase.SYSTEM_INFO` and `MEMORYSTATUSEX`.
-* Add `platform.win32.WinNT.OSVERSIONINFOEX`, `VER` constants.
-* Add `platform.win32.WinDef.ULONGLONG` and `DWORDLONG`.
-* Add `platform.win32.Shell32.SHGetDesktopFolder` (prep work for Com4JNA).
-* Add `platform.win32.Winspool.GetPrinterInfo`.
-* Add `platform.win32.WinspoolUtil.getPrinterInfo1`.
-* Add `platform.win32.GDI32.GetDeviceCaps`.
-* Add `platform.win32.GDI32.GetDIBits`.
-
-Bug Fixes
----------
-
-* Fix `ClassCastException` in `Structure.equals` (issue 152).
-* Fix bug initializing a structure object from existing memory when the structure has initialized fields (issue 133).
-* Fix NPE reading an array of string from a pointer when an element of the array is `NULL` (issue 151).
-* Avoid calling `UnregisterNatives` in native code (issue 154).
-* Compare unpacked library path against canonical (long) filename (issue 156).
-* Fix `read()` of uninitialized memory in `platform.win32.Advapi32Util.getTokenGroups` and `getTokenAccount`.
-* Fix `com.sun.jna.platform.win32.Secur32.QuerySecurityContextToken` to take a `CtxtHandle` instead of `PSecHandle`.
-* Fix definition of BITMAPINFO (platform/win32).
-
-Release 3.2.5
-=============
-
-Features
---------
-
-* Split code in examples.jar into a contrib platform.jar package and individual packages for demos.
-* Fix Eclipse build and added Eclipse projects for all contrib samples, import projects from jnalib and contrib.
-* Ensure Structure fields correctly ordered when inherited.
-* Use explicit Structure field whenever provided, regardless of whether the VM requires it.
-* Add Win32 mappings for two dozen functions from Kernel32.dll, Advapi32.dll, Netapi32.dll, Secur32.dll, NtDll.dll, Ole32.dll, Shell32.dll and Crypt32.dll to com.sun.jna.platform.win32.
-* Port parts of WinError.h, WinNT.h, LMAccess.h, LMCons.h, LMErr.h, LMJoin.h, NTStatus.h, ShlObj.h, WinDef.h, ShellApi.h, Wdm.h, WinReg.h, WinCrypt.h, Sspi.h, Guid.h, NtSecApi.h and DsGetDc.h.
-* Add Win32 simplified utility interfaces Kernel32Util, Advapi32Util, Netapi32Util, Crypt32Util, NtDllUtil, Shell32Util, Ole32Util and Secur32Util to com.sun.jna.platform.win32.
-* Support unicode paths in W32FileUtils.
-* Fix exception during dispose in W32FileMonitor.
-
-Bug Fixes
----------
-
-* Provide String.replace for 1.4 compatibility.
-* Avoid allocating memory when Structure is provided a pointer in the ctor.
-* Ensure proper value returned in Pointer.getValue() for non-null, unchanged NIO Buffer values.
-* Use 1.4-compatible URI generation (issue 149).
-
-Release 3.2.4
-=============
-
-Features
---------
-
-* Make Pointer ctor public.
-* Provide access to Function objects for arbitrary Pointer values.
-* Add linux/ia64 binaries (bpiwowar).  See issue 134 patch.
-
-Bug Fixes
----------
-
-* Use a more robust method to decode a file-based URL (issue 135).
-
-Release 3.2.3
-=============
-
-Features
---------
-
-* Include version information in code in case package information lost.
-
-Bug Fixes
----------
-
-* Fix WindowUtils exception on mouse over TrayIcon.
-* Fix bug toggling windows transparent/opaque (win32/OSX).
-* Avoid overwriting unchanged Pointer values in arrays (function calls with Pointer[] and Structure.read). 
-* Ensure Structure fields marked `final` are never written.
-* Fix bug preventing proper population Structure.ByReference fields on Structure read.
-* Ensure double buffering is disabled in components added to a transparent window.
-* Fix UnsatisfiedLinkError attempting to load system libraries under Web Start.
-* Fix loading Web Start-provided libraries on OSX (libraries must have a .jnilib suffix under Web Start).
-* Properly include sources in Maven zip file (Issue 129).
-
-Release 3.2.2
-=============
-
-Features
---------
-
-* Provide length-specified Pointer.getStringArray()
-
-Bug Fixes
----------
-
-* Fix crash with direct mapping if NULL struct* used (Issue 125).
-* Fix case where null-valued Structure fields would get non-null values on write. 
-* Synch callback Structure/Structure[] arguments on callback return.
-* Fix NPE when mapping an interface to the current process.
-* Automatically load proper C library version from current process on Linux (avoids crashing bug on Ubuntu with libc-i686 packages active).
-* Avoid scanning structure contents in Structure.toString if contents aren't actually used.
-
-Release 3.2.1
-==========
-
-Features
---------
-
-* Add HRESULT, LONG mapping to W32API (marc strapetz).
-
-
-Bug Fixes
----------
-
-* Fix definition of HWND_BROADCAST in W32API.
-* Fix memory alignment checking (Issue 121).
-* Fix Structure equals/hashCode implementation, based on current Java fields rather than strictly native memory contents.  Avoid using equals/hashCode when avoiding recursive reads/writes.
-
-Release 3.2.0
-=============
-
-Features
---------
-
-* Handle String, Structure, Callback, Buffer, and primitive arrays in direct mappings.  Handle NativeMapped and TypeMapper, with optimized paths for IntegerType and PointerType.
-* Optionally throw errno/GetLastError as an exception.  This is preferred to (and more efficient than) calling Native.getLastError().
-* Unload/delete native library unpacked from jna.jar if Native class is garbage collected.  Only install shutdown hook if using the system class loader. 
-* Auto-write contiguous Structure arrays when first element is written.
-* Support NativeMapped[] as function arguments for interface-mapped libraries (Issue 90).
-* Enable function lookup within current process on Windows.
-
-Bug Fixes
----------
-
-* Restrict recursive structure reads/writes by thread instead of globally. This avoids potentially missed reads/writes with concurrent access (Issue 120).
-* Ensure Memory is not GC'd and freed if direct NIO buffers mapped to it are extant.
-* Allow types derived from java.nio.Buffer as Structure fields.
-
-Release 3.1.0
-=============
-
-Features
---------
-
-* Add raw JNI mapping of static Java methods.  Performance is about 10X that of traditional JNA interface mapping, although with less type conversion functionality. 
-* Add library option to allow passing/return of Java Objects.
-* Allow handling of uncaught callback exceptions (Issue 63).
-* Object oriented interface to X server (see contrib/x11)
-* Make Memory class more accessible.
-* Provide Structure ctor with Pointer argument (issue 102).
-* Allow implicit library access to current process on linux (issue 98).
-* Open all shared libraries with RTLD_GLOBAL, if applicable.  This was the default behavior on OSX and changes the default behavior on linux.
-* Allow NIO Buffer as Structure field (with limitations) (Issue 57)
-* Add `size_t` size.
-
-Bug Fixes
----------
-
-* Run tests with libjsig.so, if available, which fixes some crashes when running tests on 64-bit platforms. 
-* Fix Issue 104.
-* Fix Issue 94 (Java 1.6 update 10 regression).
-* Fix Issue 51 (Java 1.6 update 10 regression).
-* Fix Issue 95.
-* Fix Issue 101.
-* Fix Issue 111, memory leak with String-returning Callback.
-* Fix missing storage of union type information (affects usage of struct/union by value as argument and return type).
-* Remove non-functional Structure ctors requiring explicit size.
-
-Release 3.0.9
-=============
-
-Bug Fixes
----------
-
-*  Fix issue 93 by only manually searching jna.library.path, then falling back to passing the mapped library name to dlopen/LoadLibrary.  This fixes an issue in JRUBY where the incorrect libc.so.6 was being loaded.
-
-Release 3.0.8
-==========
-
-Features
---------
-
-* Auto-map Pointer[]/String[]/WString[] return values.
-* Provide utility functions to convert String to primitive array.
-* Add jna.library.boot.path property to define the directory that the native stub library is loaded from
-
-Release 3.0.7
-==========
-
-Features
---------
-
-* Improve Win32 loading of libraries with dependencies.
-
-Bug Fixes
----------
-
-* Fix bug reading structures with PointerType fields, introduced with Pointer field preservation fix.
-
-Release 3.0.6
-=============
-
-Features
---------
-
-* Allow arbitrary callback method names if only one method is defined in the class which implements Callback (colinwalters).
-* Allow specification of callback type mappers by using a TYPE_MAPPER field (colinwalters).
-* Allow uninitialized (null-valued) boxed primitives in Structures (colinwalters).
-* Add convenience methods to set active Union field and value simultaneously (xylo).
-* Augment Union read/writeField to set the active field.
-* Allow Structure auto-synch across native calls to be disabled.
-* Win64 support.
-
-Bug Fixes
----------
-
-* Avoid overwriting unchanged Structure fields of type Pointer.
-* Avoid more content dragging on OSX or warn if it's too late.
-* Fix UnsatisfiedLinkError using transparent window on Win2K.
-* Fix memory leak with callbacks called from native threads with no Java context (johnwallace).  
-* Defer structure size calculation if type mapper not yet set, allowing type mapper to be set in derived constructors (colinwalters).
-* Ensure structure memory is allocated in Structure.read/writeField.
-
-Release 3.0.5
-=============
-
-Features
---------
-
-* Allow explicit declaration of field order for VMs which have an unpredictable field order.
-* Check for w32 libraries with a "lib" prefix in addition to normal lookup.
-* Allow String[]/WString[] as callback argument/return value (assume NULL-terminated array).
-* Add Solaris8 compatibility to sunos-sparc build (Corey Puffalt).
-* Look up libraries using web start library path, if appropriate (Corey Puffalt).
-* Use constants to return integer boolean values.
-
-Bug Fixes
----------
-
-* Properly track cursor on alpha-masked windows.
-* Avoid searching /lib or /usr/lib on 64-bit Linux.
-* Avoid using incorrect version of a library when both 32- and 64-bit versions are found.
-* Avoid transparent window events always dragging window bug on OSX.
-* Fix division by zero error calculating structure size on OSX/ppc.
-* Avoid overwriting initialized NativeMapped Structure fields when calculating structure size.
-* Fix NPE reading back into StringArray.
-
-Release 3.0.4
-=============
-
-Features
---------
-
-* Automatically write contents of Structure.ByReference fields on Structure.write().
-* Use the actual parameter type in Function invocations if no parameter type information is available (whether method is missing or untyped varargs).
-* Augmented X11 library mappings (xylo).
-* Support read/write of NativeMapped arrays within Structure (notably NativeLong).
-
-Bug Fixes
----------
-
-* Fix library load error when /usr/lib32 and /usr/lib both exist (linux) (Marek Slama).
-* Avoid incorrect matches against libraries named with the same prefix (e.g. libc-client.so vs libc.so) (xylo).
-* Properly handle arrays of NativeMapped (e.g. NativeLong) as a Structure field (stefan endrullis).
-* Ensure structure size calculated prior to setting union active type.
-* XID is 64-bits on 64-bit X clients (xylo).
-* Ensure proper arch name is used on Debian (amd64 instead of x86_64).
-
-Release 3.0.3
-=============
-
-Features
---------
-
-* Enable build/run using IBM's J9 VM (leonardo).
-* Make StdCallFunctionMapper attempt a leading underscore if the simpler mapping doesn't work.
-* Allow Structure.read to overwrite final fields (may not work on some 1.4 VMs). 
-
-Bug Fixes
----------
-
-* Fix NPE when passing an array of Structure.ByReference.
-* Compare entire linux library version when finding a match.
-* Don't pass struct by value unless the method signature declares it.
-* Restrict custom first element structure alignment to OSX/ppc.
-* Improve performance and reduce memory footprint for window masks. Optimize polygon-based masks on w32.  Use XFillRectangles on X11.
-* Fix linkage settings on sunos-amd64 to avoid relocation errors.
-* Fix callback allocation code on w32, solaris, freebsd, darwin (libffi was misconfigured).
-* Fix bug when NativeMapped fields are used in a Structure.ByValue instance.
-* Fix NPE calling Structure.read() before memory is initialized.
-* Fix NPE calling Structure.read/write with uninitialized NativeMapped fields. 
-
-Release 3.0.2
-=============
-
-Features
---------
-
-* Attempt to force unload of jnidispatch library prior to deleting it (w32).
-* Added amd64 targets for OSX, FreeBSD, and Solaris.
-
-Bug Fixes
----------
-
-* Reduce space allocated for invocation arguments.
-* Fix NPE when NativeMapped type is used in a Structure.
-* Fix some X11 type mappings for 64-bit.
-* Fix OSX Leopard/JRE1.5+ window transparency.
-* Fix window alpha compositing on X11.
-* Fix loading of libraries with unicode names on OSX.
-
-Release 3.0.1
-=============
-
-Features
---------
-
-* Improve transparent window drawing performance on w32
-* Use closure allocation from libffi
-
-Bug Fixes
----------
-
-* Ensure nested structure arrays initialized with Structure.toArray use the appropriate native memory.
-* Ensure structure size is calculated prior to converting to array
-* Avoid creating new windows when setting a window mask
-* Fix bug in Pointer.setChar.
-
-Release 3.0
-===========
-
-Features
---------
-
-* More supported platforms, via GCC's libffi (wmeissner)
-* Support struct by value as parameter and return value (duncan)
-* Support struct by reference within structures
-* Provide access to native peer for java.awt.Component 
-* Provide access to native peer on OS X.
-* Support MINGW32 builds (fullung)
-* Allow per-field Structure read/write by field name
-* Avoid writing Structure fields marked 'volatile'
-* Read and wrap function pointers in Structure fields when read with a Java proxy to allow easy Java-side invocation (Ken Larson)
-* Support array-backed Buffers as arguments (wmeissner)
-* Auto-conversion of custom types (wmeissner)
-* Allow pointer type-safety
-* Optional VM crash protection, via Native.setProtected(boolean)
-* Auto-convert WString[]
-* Provide library synchronization wrapper similar to Collections.synchronizedX
-* Support lookup of OSX framework libraries by name
-* Explicit access to shared library global data
-* Invocation interception to facilitate translation of C preprocessor macros and inline functions
-* Provide utility to determine Web Start native library cache location; auto-include this path if jnidispatch is included as a <nativelib> (robertengels) 
-* Provide access to aligned memory
-* Versioning information embedded in jna.jar and native library
-
-Bug Fixes
----------
-
-* Avoid attempts to free native library if it failed to load (wmeissner)
-* Explicitly check method signatures for varargs instead of heuristically guessing (wmeissner)
-* Disallow declaring Pointer-derived fields in Structures (Function, Memory)
-* Ensure Object.toString/hashCode/equals methods are intercepted on proxyied interfaces
-* Update X11 library for 64-bit use (wmeissner)
-* Properly map arrays of char*/wchar_t* under w32
-* Allow Pointer[] as a Structure field and Function argument
-* Fix some misleading Structure error messages
-* Properly preserve/return GetLastError/errno after native calls
-* Allocate executable memory on w32 to avoid errors with hardware-enforced data execution protection (DEP)
-* Fix VM crash on w32 stdcall callbacks
-* Use long offsets and sizes rather than ints (64-bit safe)
-* Properly clean up references and release closure memory on JNI_Unload
-* Use simpler AWT/JAWT library loading workaround
-* Avoid changing array references within a Structure on read
-
-Release 2.5
-===========
-
-Features
---------
-
-* Unions
-* Optimized shaped windows (chris deckers & olivier chafik); instantiation time improved by about 2-3 orders of magnitude for large, mostly contiguous shapes
-* Provide type mapping in callback arguments/results
-* Provide access to ByteBuffer direct address as a Pointer
-* Provide customization of native string encoding with jna.encoding system property 
-
-Bug Fixes
----------
-
-* Properly handle VMs with reversed Structure member storage
-* Avoid making window undecorated when clearing window mask on X11
-* Fix structure alignment bug on OSX/PPC when first element is > 4 bytes in size
-* Clearing OSX window mask by setting to MASK_NONE now works properly
-* Avoid index exceptions if native buffers are not NUL-terminated on string conversions
-* Write initialized Structure[] argument memory prior to function calls
-* Fix IllegalArgumentException reading WString into a Structure
-* Clear memory when allocating a structure block (fixes VM crash)
-* Remove versioned JAWT dependency on OSX, allowing use on 10.3/JRE1.4.
-
-Release 2.4
-===========
-
-Features
---------
-
-* Explicitly support unaligned structures
-* Auto-reallocate structure arrays
-* Automatic handling of w32 UNICODE/ASCII variants
-* Automatic mapping of decorated w32 stdcall function names
-* Customizable, automatic type conversion of arguments and results (wmeissner)
-* Support char*[] arguments as Java String[] 
-* Structure supports Callback members (wmeissner)
-* getByteBuffer from Pointer/Memory (wmeissner)
-* Allow GC of native libraries
-* Facilitate use from non-Java contexts (JRuby et al.) (wmeissner)
-* Improve library path searching (wmeissner)
-* Handle Structure[] arguments
-* Handle native long arguments and return values
-* Handle direct and array-based ByteBuffer arguments (wmeissner)
-* Change default w32 build to use GCC (it's free, yo)
-
-Bug Fixes
----------
-
-* Structure.toArray failed to initialize members
-* Disallow explicit free of Structure/Memory
-* Ensure native libraries are only loaded once until released
-* Properly handle NULL when the return value is a Structure
-* Proper conversion to wchar_t on linux
-* Copy full length of Java strings to C strings instead of stopping when a NUL character is encountered

ChangeLog.libffi

@@ -574,8 +574,8 @@
 	* Makefile.am, include/Makefile.am: Move headers to
 	libffi_la_SOURCES for new automake.
 	* Makefile.in, include/Makefile.in: Rebuilt.
-	
-	* testsuite/lib/wrapper.exp: Copied from gcc tree to allow for 
+
+	* testsuite/lib/wrapper.exp: Copied from gcc tree to allow for
 	execution outside of gcc tree.
 	* testsuite/lib/target-libpath.exp: Ditto.
 

LICENSE

@@ -1,504 +1,21 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
+libffi - Copyright (c) 1996-2012  Anthony Green, Red Hat, Inc and others.
+See source files for details.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+``Software''), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile.am

@@ -2,37 +2,50 @@
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = include testsuite man
 
 EXTRA_DIST = LICENSE ChangeLog.v1 ChangeLog.libgcj configure.host	\
-	src/alpha/ffi.c src/alpha/osf.S src/alpha/ffitarget.h		\
-	src/arm/ffi.c src/arm/sysv.S src/arm/trampoline.S		\
-	src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S		\
-	src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S		\
-	src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h	\
-	src/ia64/ia64_flags.h src/ia64/unix.S src/mips/ffi.c		\
-	src/mips/n32.S src/mips/o32.S src/mips/ffitarget.h		\
-	src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h		\
-	src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h		\
-	src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/linux64.S	\
-	src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S		\
-	src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S	\
-	src/powerpc/aix_closure.S src/powerpc/darwin_closure.S		\
-	src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h		\
-	src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h		\
-	src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c	\
-	src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S		\
-	src/sparc/v9.S src/sparc/ffitarget.h src/sparc/ffi.c		\
-	src/x86/darwin64.S src/x86/ffi.c src/x86/sysv.S			\
-	src/x86/win32.S src/x86/win64.S src/x86/darwin.S		\
-	src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S		\
-	src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c		\
-	src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/frv/eabi.S	\
-	src/frv/ffitarget.h src/dlmalloc.c src/moxie/ffi.c		\
-	src/moxie/eabi.S libtool-version ChangeLog.libffi		\
-	m4/libtool.m4 m4/lt~obsolete.m4 m4/ltoptions.m4 m4/ltsugar.m4	\
-	m4/ltversion.m4 build-ios.sh src/arm/gentramp.sh src/debug.c    \
-	msvcc.sh
+	 src/aarch64/ffi.c src/aarch64/ffitarget.h src/aarch64/sysv.S	\
+	 build-ios.sh src/alpha/ffi.c src/alpha/osf.S			\
+	 src/alpha/ffitarget.h src/arm/ffi.c src/arm/sysv.S		\
+	 src/arm/ffitarget.h src/avr32/ffi.c src/avr32/sysv.S		\
+	 src/avr32/ffitarget.h src/cris/ffi.c src/cris/sysv.S		\
+	 src/cris/ffitarget.h src/ia64/ffi.c src/ia64/ffitarget.h	\
+	 src/ia64/ia64_flags.h src/ia64/unix.S src/mips/ffi.c		\
+	 src/mips/n32.S src/mips/o32.S src/metag/ffi.c			\
+	 src/metag/ffitarget.h src/metag/sysv.S src/moxie/ffi.c		\
+	 src/moxie/ffitarget.h src/moxie/eabi.S src/mips/ffitarget.h	\
+	 src/m32r/ffi.c src/m32r/sysv.S src/m32r/ffitarget.h		\
+	 src/m68k/ffi.c src/m68k/sysv.S src/m68k/ffitarget.h		\
+	 src/microblaze/ffi.c src/microblaze/sysv.S			\
+	 src/microblaze/ffitarget.h src/powerpc/ffi.c			\
+	 src/powerpc/sysv.S src/powerpc/linux64.S			\
+	 src/powerpc/linux64_closure.S src/powerpc/ppc_closure.S	\
+	 src/powerpc/asm.h src/powerpc/aix.S src/powerpc/darwin.S	\
+	 src/powerpc/aix_closure.S src/powerpc/darwin_closure.S		\
+	 src/powerpc/ffi_darwin.c src/powerpc/ffitarget.h		\
+	 src/s390/ffi.c src/s390/sysv.S src/s390/ffitarget.h		\
+	 src/sh/ffi.c src/sh/sysv.S src/sh/ffitarget.h src/sh64/ffi.c	\
+	 src/sh64/sysv.S src/sh64/ffitarget.h src/sparc/v8.S		\
+	 src/sparc/v9.S src/sparc/ffitarget.h src/sparc/ffi.c		\
+	 src/x86/darwin64.S src/x86/ffi.c src/x86/sysv.S		\
+	 src/x86/win32.S src/x86/darwin.S src/x86/win64.S		\
+	 src/x86/freebsd.S src/x86/ffi64.c src/x86/unix64.S		\
+	 src/x86/ffitarget.h src/pa/ffitarget.h src/pa/ffi.c		\
+	 src/pa/linux.S src/pa/hpux32.S src/frv/ffi.c src/bfin/ffi.c	\
+	 src/bfin/ffitarget.h src/bfin/sysv.S src/frv/eabi.S		\
+	 src/frv/ffitarget.h src/dlmalloc.c src/tile/ffi.c		\
+	 src/tile/ffitarget.h src/tile/tile.S libtool-version		\
+	 src/xtensa/ffitarget.h src/xtensa/ffi.c src/xtensa/sysv.S	\
+	 ChangeLog.libffi m4/libtool.m4 m4/lt~obsolete.m4		\
+	 m4/ltoptions.m4 m4/ltsugar.m4 m4/ltversion.m4			\
+	 m4/ltversion.m4 src/arm/gentramp.sh src/debug.c msvcc.sh	\
+	 generate-ios-source-and-headers.py				\
+	 generate-osx-source-and-headers.py				\
+	 libffi.xcodeproj/project.pbxproj src/arm/trampoline.S		\
+	 libtool-ldflags
 
 info_TEXINFOS = doc/libffi.texi
 
@@ -80,11 +93,12 @@ AM_MAKEFLAGS = \
 	"RANLIB=$(RANLIB)" \
 	"DESTDIR=$(DESTDIR)"
 
+# Subdir rules rely on $(FLAGS_TO_PASS)
+FLAGS_TO_PASS = $(AM_MAKEFLAGS)
+
 MAKEOVERRIDES=
 
-ACLOCAL_AMFLAGS=$(ACLOCAL_AMFLAGS) -I m4
-
-lib_LTLIBRARIES = libffi.la
+toolexeclib_LTLIBRARIES = libffi.la
 noinst_LTLIBRARIES = libffi_convenience.la
 
 libffi_la_SOURCES = src/prep_cif.c src/types.c \
@@ -102,6 +116,9 @@ endif
 if MIPS
 nodist_libffi_la_SOURCES += src/mips/ffi.c src/mips/o32.S src/mips/n32.S
 endif
+if BFIN
+nodist_libffi_la_SOURCES += src/bfin/ffi.c src/bfin/sysv.S
+endif
 if X86
 nodist_libffi_la_SOURCES += src/x86/ffi.c src/x86/sysv.S
 endif
@@ -132,6 +149,12 @@ endif
 if M68K
 nodist_libffi_la_SOURCES += src/m68k/ffi.c src/m68k/sysv.S
 endif
+if MOXIE
+nodist_libffi_la_SOURCES += src/moxie/ffi.c src/moxie/eabi.S
+endif
+if MICROBLAZE
+nodist_libffi_la_SOURCES += src/microblaze/ffi.c src/microblaze/sysv.S
+endif
 if POWERPC
 nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S src/powerpc/linux64.S src/powerpc/linux64_closure.S
 endif
@@ -144,6 +167,9 @@ endif
 if POWERPC_FREEBSD
 nodist_libffi_la_SOURCES += src/powerpc/ffi.c src/powerpc/sysv.S src/powerpc/ppc_closure.S
 endif
+if AARCH64
+nodist_libffi_la_SOURCES += src/aarch64/sysv.S src/aarch64/ffi.c
+endif
 if ARM
 nodist_libffi_la_SOURCES += src/arm/sysv.S src/arm/ffi.c
 if FFI_EXEC_TRAMPOLINE_TABLE
@@ -177,23 +203,23 @@ endif
 if PA_HPUX
 nodist_libffi_la_SOURCES += src/pa/hpux32.S src/pa/ffi.c
 endif
+if TILE
+nodist_libffi_la_SOURCES += src/tile/tile.S src/tile/ffi.c
+endif
+if XTENSA
+nodist_libffi_la_SOURCES += src/xtensa/sysv.S src/xtensa/ffi.c
+endif
+if METAG
+nodist_libffi_la_SOURCES += src/metag/sysv.S src/metag/ffi.c
+endif
 
 libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
 nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
 
-AM_CFLAGS = -g
-if FFI_DEBUG
-# Build debug. Define FFI_DEBUG on the commandline so that, when building with
-# MSVC, it can link against the debug CRT.
-AM_CFLAGS += -DFFI_DEBUG
-endif
+LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/libtool-ldflags $(LDFLAGS))
 
-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
+libffi_la_LDFLAGS = -no-undefined -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LTLDFLAGS) $(AM_LTLDFLAGS)
 
 AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
 AM_CCASFLAGS = $(AM_CPPFLAGS)
 
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:

README

@@ -1,7 +1,7 @@
 Status
 ======
 
-libffi-3.0.10 was released on XXXXXXXXXX, 2011. Check the libffi web
+libffi-3.0.13 was released on March 17, 2013.  Check the libffi web
 page for updates: <URL:http://sourceware.org/libffi/>.
 
 
@@ -43,51 +43,70 @@ Libffi has been ported to many different platforms.
 For specific configuration details and testing status, please
 refer to the wiki page here:
 
- http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.10
+ http://www.moxielogic.org/wiki/index.php?title=Libffi_3.0.13
 
 At the time of release, the following basic configurations have been
 tested:
 
-|--------------+------------------|
-| Architecture | Operating System |
-|--------------+------------------|
-| Alpha        | Linux            |
-| Alpha        | Tru64            |
-| ARM          | Linux            |
-| ARM          | iOS              |
-| AVR32        | Linux            |
-| HPPA         | HPUX             |
-| IA-64        | Linux            |
-| M68K         | RTEMS            |
-| MIPS         | IRIX             |
-| MIPS         | Linux            |
-| MIPS         | RTEMS            |
-| MIPS64       | Linux            |
-| PowerPC      | Linux            |
-| PowerPC      | Mac OSX          |
-| PowerPC      | FreeBSD          |
-| PowerPC64    | Linux            |
-| S390         | Linux            |
-| S390X        | Linux            |
-| SPARC        | Linux            |
-| SPARC        | Solaris          |
-| SPARC64      | Linux            |
-| SPARC64      | FreeBSD          |
-| X86          | FreeBSD          |
-| X86          | Interix          |
-| X86          | kFreeBSD         |
-| X86          | Linux            |
-| X86          | Mac OSX          |
-| X86          | OpenBSD          |
-| X86          | OS/2             |
-| X86          | Solaris          |
-| X86          | Windows/Cygwin   |
-| X86          | Windows/MingW    |
-| X86-64       | FreeBSD          |
-| X86-64       | Linux            |
-| X86-64       | OpenBSD          |
-| X86-64       | Windows/MingW    |
-|--------------+------------------|
+|-----------------+------------------+-------------------------|
+| Architecture    | Operating System | Compiler                |
+|-----------------+------------------+-------------------------|
+| AArch64         | Linux            | GCC                     |
+| Alpha           | Linux            | GCC                     |
+| Alpha           | Tru64            | GCC                     |
+| ARM             | Linux            | GCC                     |
+| ARM             | iOS              | GCC                     |
+| AVR32           | Linux            | GCC                     |
+| Blackfin        | uClinux          | GCC                     |
+| HPPA            | HPUX             | GCC                     |
+| IA-64           | Linux            | GCC                     |
+| M68K            | FreeMiNT         | GCC                     |
+| M68K            | Linux	     | GCC                     |
+| M68K            | RTEMS            | GCC                     |
+| Meta            | Linux            | GCC                     |
+| MicroBlaze      | Linux            | GCC                     |
+| MIPS            | IRIX             | GCC                     |
+| MIPS            | Linux            | GCC                     |
+| MIPS            | RTEMS            | GCC                     |
+| MIPS64          | Linux            | GCC                     |
+| Moxie		  | Bare metal	     | GCC
+| PowerPC 32-bit  | AIX              | IBM XL C                |
+| PowerPC 64-bit  | AIX              | IBM XL C                |
+| PowerPC         | AMIGA            | GCC                     |
+| PowerPC         | Linux            | GCC                     |
+| PowerPC         | Mac OSX          | GCC                     |
+| PowerPC         | FreeBSD          | GCC                     |
+| PowerPC 64-bit  | FreeBSD          | GCC                     |
+| PowerPC 64-bit  | Linux            | GCC                     |
+| S390            | Linux            | GCC                     |
+| S390X           | Linux            | GCC                     |
+| SPARC           | Linux            | GCC                     |
+| SPARC           | Solaris          | GCC                     |
+| SPARC           | Solaris          | Oracle Solaris Studio C |
+| SPARC64         | Linux            | GCC                     |
+| SPARC64         | FreeBSD          | GCC                     |
+| SPARC64         | Solaris          | Oracle Solaris Studio C |
+| TILE-Gx/TILEPro | Linux            | GCC                     |
+| X86             | FreeBSD          | GCC                     |
+| X86             | GNU HURD         | GCC                     |
+| X86             | Interix          | GCC                     |
+| X86             | kFreeBSD         | GCC                     |
+| X86             | Linux            | GCC                     |
+| X86             | Mac OSX          | GCC                     |
+| X86             | OpenBSD          | GCC                     |
+| X86             | OS/2             | GCC                     |
+| X86             | Solaris          | GCC                     |
+| X86             | Solaris          | Oracle Solaris Studio C |
+| X86             | Windows/Cygwin   | GCC                     |
+| X86             | Windows/MingW    | GCC                     |
+| X86-64          | FreeBSD          | GCC                     |
+| X86-64          | Linux            | GCC                     |
+| X86-64          | Linux/x32        | GCC                     |
+| X86-64          | OpenBSD          | GCC                     |
+| X86-64          | Solaris          | Oracle Solaris Studio C |
+| X86-64          | Windows/MingW    | GCC                     |
+| Xtensa          | Linux            | GCC                     |
+|-----------------+------------------+-------------------------|
 
 Please send additional platform test results to
 libffi-discuss@sourceware.org and feel free to update the wiki page
@@ -126,12 +145,12 @@ under a MingW environment, you may need to remove the line in configure
 that sets 'fix_srcfile_path' to a 'cygpath' command. ('cygpath' is not
 present in MingW, and is not required when using MingW-style paths.)
 
-For iOS builds, refer to the build-ios.sh script for guidance.
+For iOS builds, the 'libffi.xcodeproj' Xcode project is available.
 
 Configure has many other options. Use "configure --help" to see them all.
 
 Once configure has finished, type "make". Note that you must be using
-GNU make.  You can ftp GNU make from prep.ai.mit.edu:/pub/gnu.
+GNU make.  You can ftp GNU make from ftp.gnu.org:/pub/gnu/make .
 
 To ensure that libffi is working as advertised, type "make check".
 This will require that you have DejaGNU installed.
@@ -144,16 +163,53 @@ History
 
 See the ChangeLog files for details.
 
-3.0.10 ???-??-??
+3.0.13 Mar-17-13
+	Add Meta support.
+	Add missing Moxie bits.
+	Fix stack alignment bug on 32-bit x86.
+	Build fix for m68000 targets.
+	Build fix for soft-float Power targets.
+	Fix the install dir location for some platforms when building
+	  with GCC (OS X, Solaris).
+	Fix Cygwin regression.
+
+3.0.12 Feb-11-13
+        Add Moxie support.
+	Add AArch64 support.
+	Add Blackfin support.
+	Add TILE-Gx/TILEPro support.
+	Add MicroBlaze support.
+	Add Xtensa support.
+	Add support for PaX enabled kernels with MPROTECT.
+	Add support for native vendor compilers on
+	  Solaris and AIX.
+	Work around LLVM/GCC interoperability issue on x86_64.
+
+3.0.11 Apr-11-12
+        Lots of build fixes.
+	Add Amiga newer MacOS support.
+	Add support for variadic functions (ffi_prep_cif_var).
+	Add Linux/x32 support.
+	Add thiscall, fastcall and MSVC cdecl support on Windows.
+	Add Amiga and newer MacOS support.
+	Add m68k FreeMiNT support.
+	Integration with iOS' xcode build tools.
+	Fix Octeon and MC68881 support.
+	Fix code pessimizations.
+
+3.0.10 Aug-23-11
         Add support for Apple's iOS.
 	Add support for ARM VFP ABI.
         Add RTEMS support for MIPS and M68K.
+	Fix instruction cache clearing problems on
+	  ARM and SPARC.
 	Fix the N64 build on mips-sgi-irix6.5.
 	Enable builds with Microsoft's compiler.
 	Enable x86 builds with Oracle's Solaris compiler.
 	Fix support for calling code compiled with Oracle's Sparc
 	  Solaris compiler.
 	Testsuite fixes for Tru64 Unix.
+	Additional platform support.
 
 3.0.9 Dec-31-09
         Add AVR32 and win64 ports.  Add ARM softfp support.
@@ -298,15 +354,19 @@ Thorup.
 Major processor architecture ports were contributed by the following
 developers:
 
+aarch64		Marcus Shawcroft, James Greenhalgh
 alpha		Richard Henderson
 arm		Raffaele Sena
+blackfin        Alexandre Keunecke I. de Mendonca
 cris		Simon Posnjak, Hans-Peter Nilsson
 frv		Anthony Green
 ia64		Hans Boehm
 m32r		Kazuhiro Inaoka
 m68k		Andreas Schwab
+microblaze	Nathan Rossi
 mips		Anthony Green, Casey Marshall
 mips64		David Daney
+moxie		Anthony Green
 pa		Randolph Chung, Dave Anglin, Andreas Tobler
 powerpc		Geoffrey Keating, Andreas Tobler, 
 			 David Edelsohn, John Hornkvist
@@ -315,8 +375,10 @@ s390		Gerhard Tonn, Ulrich Weigand
 sh		Kaz Kojima
 sh64		Kaz Kojima
 sparc		Anthony Green, Gordon Irlam
+tile-gx/tilepro Walter Lee
 x86		Anthony Green, Jon Beniston
 x86-64		Bo Thorsen
+xtensa		Chris Zankel
 
 Jesper Skov and Andrew Haley both did more than their fair share of
 stepping through the code and tracking down bugs.

README.md

@@ -1,73 +0,0 @@
-![Java Native Access - JNA](https://github.com/twall/jna/raw/master/www/images/jnalogo.jpg "Java Native Access - JNA")
-
-Java Native Access (JNA)
-========================
-
-JNA provides Java programs easy access to native shared libraries (DLLs on Windows) without writing anything but Java code—no JNI or native code is required. This functionality is comparable to Windows' Platform/Invoke and Python's ctypes. Access is dynamic at runtime without code generation.
-
-JNA allows you to call directly into native functions using natural Java method invocation. The Java call looks just like it does in native code. Most calls require no special handling or configuration; no boilerplate or generated code is required.
-
-The JNA library uses a small native library stub to dynamically invoke native code. The developer uses a Java interface to describe functions and structures in the target native library. This makes it quite easy to take advantage of native platform features without incurring the high overhead of configuring and building JNI code for multiple platforms.
-
-While some attention is paid to performance, correctness and ease of use take priority.
-
-JNA includes a platform library with many native functions already mapped as well as a set of utility interfaces that simplify native access.
-
-Features
-========
-
-* Automatic mapping from Java to native functions, with simple mappings for all primitive data types
-* Runs on most platforms which support Java
-* Automatic conversion between C and Java strings, with customizable encoding/decoding
-* Structure and Union arguments/return values, by reference and by value
-* Function Pointers, (callbacks from native code to Java) as arguments and/or members of a struct
-* Auto-generated Java proxies for native function pointers
-* By-reference (pointer-to-type) arguments
-* Java array and NIO Buffer arguments (primitive types and pointers) as pointer-to-buffer
-* Nested structures and arrays
-* Wide (wchar_t-based) strings
-* Native long support (32- or 64-bit as appropriate)
-* Demo applications
-* Supported on 1.4 or later JVMs (earlier VMs may work with stubbed NIO support)
-* Customizable marshalling/unmarshalling (argument and return value conversions)
-* Customizable mapping from Java method to native function name, and customizable invocation to simulate C preprocessor function macros
-* Support for automatic Windows ASCII/UNICODE function mappings
-* Varargs support
-* Type-safety for native pointers
-* VM crash protection (optional)
-* Optimized direct mapping for high-performance applications.
-
-Community
-=========
-
-All questions should be posted ot the [jna-users Google group](http://groups.google.com/group/jna-users). Issues can be submitted [here on Github](https://github.com/twall/jna/issues).
-
-Using the Library
-=================
-
-* [Getting Started](jna/tree/master/www/GettingStarted.md)
-* [Mapping between Java and Native](jna/tree/master/www/Mappings.md)
-* [Using Pointers and Arrays](jna/tree/master/www/PointersAndArrays.md)
-* [Using Structures and Unions](jna/tree/master/www/StructuresAndUnions.md)
-* [Using By-Reference Arguments](jna/tree/master/www/ByRefArguments.md)
-* [Customization](jna/tree/master/www/CustomMappings.md)
-* [Callbacks/Closures](jna/tree/master/www/CallbacksAndClosures.md)
-* [Dynamically Typed Languages (JRuby/Jython)](jna/tree/master/www/DynamicallyTypedLanguages.md)
-* [Platform Library](jna/tree/master/www/PlatformLibrary.md)
-* [Direct Method Mapping](jna/tree/master/www/DirectMapping.md)
-* [Frequently Asked Questions (FAQ)](jna/tree/master/www/FrequentlyAskedQuestions.md)
-
-Contributing 
-============
-
-You're encouraged to contribute to JNA. Fork the code from [github.com/twall/jna](https://github.com/twall/jna) and submit pull requests.
-
-If you are interested in paid support, feel free to say so on the [jna-users mailing list](http://groups.google.com/group/jna-users). Most simple questions will be answered on the list, but more complicated work, new features or target platforms can be negotiated with any of the JNA developers (this is how several of JNA's features came into being). You may even encounter other users with the same need and be able to cost share the new development.
-
-License
-=======
-
-This library is provided under the LGPL, version 2.1 or later.
-
-*NOTE: Oracle is not sponsoring this project, even though the package name (com.sun.jna) might imply otherwise.*
-

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.12.2 -*- Autoconf -*-
+
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +13,15 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
 # ltdl.m4 - Configure ltdl for the target system. -*-Autoconf-*-
 #
-#   Copyright (C) 1999-2006, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 1999-2006, 2007, 2008, 2011 Free Software Foundation, Inc.
 #   Written by Thomas Tanner, 1999
 #
 # This file is free software; the Free Software Foundation gives
@@ -574,12 +574,19 @@ AC_CACHE_CHECK([which extension is used for runtime loadable modules],
 [
 module=yes
 eval libltdl_cv_shlibext=$shrext_cmds
+module=no
+eval libltdl_cv_shrext=$shrext_cmds
   ])
 if test -n "$libltdl_cv_shlibext"; then
   m4_pattern_allow([LT_MODULE_EXT])dnl
   AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"],
     [Define to the extension used for runtime loadable modules, say, ".so".])
 fi
+if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then
+  m4_pattern_allow([LT_SHARED_EXT])dnl
+  AC_DEFINE_UNQUOTED([LT_SHARED_EXT], ["$libltdl_cv_shrext"],
+    [Define to the shared library suffix, say, ".dylib".])
+fi
 ])# LT_SYS_MODULE_EXT
 
 # Old name:
@@ -830,22 +837,24 @@ AU_ALIAS([AC_LTDL_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LTDL_DLSYM_USCORE], [])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.12'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.12.2], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -861,14 +870,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.12.2])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # Figure out how to run the assembler.                      -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -890,15 +899,17 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 2
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -917,7 +928,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -943,22 +954,21 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
+# serial 10
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -977,16 +987,15 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 17
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -996,7 +1005,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -1009,12 +1018,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -1022,8 +1032,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -1062,16 +1073,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -1080,16 +1091,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -1137,7 +1148,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -1147,28 +1158,34 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
+# serial 6
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
@@ -1187,7 +1204,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -1199,21 +1216,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
     test -z "am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -1231,7 +1246,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -1241,14 +1256,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
+# serial 19
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -1294,31 +1308,41 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+[$0: two- and three-arguments forms are deprecated.  For more info, see:
+http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -1329,28 +1353,35 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+dnl Support for Objective C++ was only introduced in Autoconf 2.65,
+dnl but we still cater to Autoconf 2.62.
+m4_ifdef([AC_PROG_OBJCXX],
+[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
 ])
 _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
 dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
@@ -1378,12 +1409,14 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 8
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -1397,9 +1430,9 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1423,20 +1456,19 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 7
 
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -1444,13 +1476,14 @@ AC_DEFUN([AM_MAINTAINER_MODE],
        [disable], [m4_define([am_maintainer_other], [enable])],
        [m4_define([am_maintainer_other], [enable])
         m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -1462,13 +1495,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -1487,7 +1520,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -1512,8 +1545,7 @@ AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
 
-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1549,14 +1581,13 @@ m4_define([AC_PROG_CC],
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
+# serial 7
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -1586,45 +1617,19 @@ if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -1632,13 +1637,13 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1651,22 +1656,18 @@ AC_DEFUN([_AM_IF_OPTION],
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# serial 9
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -1677,32 +1678,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
 
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -1712,37 +1721,25 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
 fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -1750,6 +1747,36 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
 # serial 2
 
+# AM_PROG_INSTALL_STRIP
+# ---------------------
+# One issue with vendor 'install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in "make install-strip", and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# Copyright (C) 2006-2012 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 3
+
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1757,24 +1784,24 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004-2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -1785,10 +1812,11 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
@@ -1796,7 +1824,7 @@ AC_MSG_CHECKING([how to create a $1 tar archive])
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
 _am_tools=${am_cv_prog_tar_$1-$_am_tools}
 # Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
+# Solaris sh will not grok spaces in the rhs of '-'.
 for _am_tool in $_am_tools
 do
   case $_am_tool in
@@ -1857,9 +1885,11 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/asmcfi.m4])
+m4_include([m4/ax_append_flag.m4])
 m4_include([m4/ax_cc_maxopt.m4])
 m4_include([m4/ax_cflags_warn_all.m4])
-m4_include([m4/ax_check_compiler_flags.m4])
+m4_include([m4/ax_check_compile_flag.m4])
 m4_include([m4/ax_compiler_vendor.m4])
 m4_include([m4/ax_configure_args.m4])
 m4_include([m4/ax_enable_builddir.m4])

build.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="jna" basedir="." default="default">
-	<target name="recurse">
-		<ant dir="jnalib" target="${ant.target}" />
-	</target>
-	<target name="default">
-		<antcall target="recurse">
-			<param name="ant.target" value="default" />
-		</antcall>
-	</target>
-	<target name="clean">
-		<antcall target="recurse">
-			<param name="ant.target" value="clean" />
-		</antcall>
-	</target>
-	<target name="test">
-		<antcall target="recurse">
-			<param name="ant.target" value="test" />
-		</antcall>
-	</target>
-</project>
-

compile

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2005-05-14.22
+scriptversion=2009-10-06.20; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
+# Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,8 +18,7 @@ scriptversion=2005-05-14.22
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
   if mkdir "$lockdir" >/dev/null 2>&1; then
     break
@@ -124,9 +124,9 @@ trap "rmdir '$lockdir'; exit 1" 1 2 15
 ret=$?
 
 if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
 elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
 rmdir "$lockdir"
@@ -138,5 +138,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

config.guess

@@ -1,14 +1,14 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-12-29'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +17,22 @@ timestamp='2009-11-20'
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner. 
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +52,9 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -144,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -180,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -394,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +484,8 @@ EOF
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +498,7 @@ EOF
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +555,7 @@ EOF
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +598,52 @@ EOF
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
 
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +734,22 @@ EOF
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +773,14 @@ EOF
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,30 +792,35 @@ EOF
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -857,6 +866,13 @@ EOF
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -866,7 +882,7 @@ EOF
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -878,20 +894,29 @@ EOF
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -933,7 +958,7 @@ EOF
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -959,7 +984,7 @@ EOF
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -967,14 +992,17 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1011,11 @@ EOF
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1019,7 +1047,7 @@ EOF
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1047,13 +1075,13 @@ EOF
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1116,8 @@ EOF
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1160,10 @@ EOF
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1189,11 @@ EOF
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1178,6 +1206,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1230,7 +1261,10 @@ EOF
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,13 +1309,13 @@ EOF
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1299,11 +1333,11 @@ EOF
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1321,11 +1355,11 @@ main ()
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 

config.sub

@@ -1,38 +1,33 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012, 2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2012-12-29'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -75,8 +70,9 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
+2012, 2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,13 +119,18 @@ esac
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -152,12 +153,12 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -173,10 +174,10 @@ case $os in
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -221,6 +222,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -245,20 +252,27 @@ case $basic_machine in
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+	| arc \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -281,29 +295,39 @@ case $basic_machine in
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -313,6 +337,21 @@ case $basic_machine in
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -327,25 +366,30 @@ case $basic_machine in
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -367,25 +411,29 @@ case $basic_machine in
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -410,7 +458,7 @@ case $basic_machine in
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -480,11 +528,20 @@ case $basic_machine in
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -516,7 +573,7 @@ case $basic_machine in
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -674,7 +731,6 @@ case $basic_machine in
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -732,9 +788,13 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -771,10 +831,18 @@ case $basic_machine in
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -839,6 +907,12 @@ case $basic_machine in
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -921,9 +995,10 @@ case $basic_machine in
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -948,7 +1023,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1017,6 +1096,9 @@ case $basic_machine in
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1073,20 +1155,8 @@ case $basic_machine in
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1156,6 +1226,9 @@ case $basic_machine in
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1253,11 +1326,11 @@ esac
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1287,14 +1360,15 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1341,7 +1415,7 @@ case $os in
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1390,7 +1464,7 @@ case $os in
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1435,6 +1509,8 @@ case $os in
 	-dicos*)
 		os=-dicos
 		;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1457,10 +1533,10 @@ else
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1472,8 +1548,20 @@ case $basic_machine in
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1493,14 +1581,11 @@ case $basic_machine in
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1527,7 +1612,7 @@ case $basic_machine in
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

configure.ac

@@ -1,8 +1,8 @@
 dnl Process this with autoconf to create configure
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.68)
 
-AC_INIT([libffi], [3.0.10rc8], [http://sourceware.org/libffi.html])
+AC_INIT([libffi], [3.0.13], [http://github.com/atgreen/libffi/issues])
 AC_CONFIG_HEADERS([fficonfig.h])
 
 AC_CANONICAL_SYSTEM
@@ -27,7 +27,7 @@ save_CFLAGS=$CFLAGS
 AC_PROG_CC
 CFLAGS=$save_CFLAGS
 m4_undefine([_AC_ARG_VAR_PRECIOUS])
-m4_rename([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
+m4_rename_force([real_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
 
 AC_SUBST(CFLAGS)
 
@@ -36,10 +36,24 @@ AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AC_CONFIG_MACRO_DIR([m4])
 
+# Test for 64-bit build.
+AC_CHECK_SIZEOF([size_t])
+
+AX_COMPILER_VENDOR
 AX_CC_MAXOPT
-AX_CFLAGS_WARN_ALL
+# The AX_CFLAGS_WARN_ALL macro doesn't currently work for sunpro
+# compiler.
+if test "$ax_cv_c_compiler_vendor" != "sun"; then
+  AX_CFLAGS_WARN_ALL
+fi
+
 if test "x$GCC" = "xyes"; then
   CFLAGS="$CFLAGS -fexceptions"
+  touch local.exp
+else
+  cat > local.exp <<EOF
+set CC_FOR_TARGET "$CC"
+EOF
 fi
 
 AM_MAINTAINER_MODE
@@ -53,6 +67,10 @@ AM_CONDITIONAL(TESTSUBDIR, test -d $srcdir/testsuite)
 
 TARGETDIR="unknown"
 case "$host" in
+  aarch64*-*-*)
+	TARGET=AARCH64; TARGETDIR=aarch64
+	;;
+
   alpha*-*-*)
 	TARGET=ALPHA; TARGETDIR=alpha;
 	# Support 128-bit long double, changeable via command-line switch.
@@ -67,6 +85,10 @@ case "$host" in
 	TARGET=X86_64; TARGETDIR=x86
   	;;
 
+  amd64-*-freebsd*)
+	TARGET=X86_64; TARGETDIR=x86
+  	;;
+
   amd64-*-freebsd*)
 	TARGET=X86_64; TARGETDIR=x86
 	;;
@@ -75,6 +97,10 @@ case "$host" in
 	TARGET=AVR32; TARGETDIR=avr32
 	;;
 
+  bfin*)
+  	TARGET=BFIN; TARGETDIR=bfin
+  	;;
+
   cris-*-*)
 	TARGET=LIBFFI_CRIS; TARGETDIR=cris
 	;;
@@ -83,7 +109,7 @@ case "$host" in
 	TARGET=FRV; TARGETDIR=frv
 	;;
 
-  hppa*-*-linux* | parisc*-*-linux*)
+  hppa*-*-linux* | parisc*-*-linux* | hppa*-*-openbsd*)
 	TARGET=PA_LINUX; TARGETDIR=pa
 	;;
   hppa*64-*-hpux*)
@@ -112,10 +138,45 @@ case "$host" in
 	TARGET=X86_DARWIN; TARGETDIR=x86
 	;;
   i?86-*-solaris2.1[[0-9]]*)
-	TARGET=X86_64; TARGETDIR=x86
+	TARGETDIR=x86
+	if test $ac_cv_sizeof_size_t = 4; then
+	  TARGET=X86; 
+	else
+	  TARGET=X86_64; 
+	fi	  
 	;;
-  i?86-*-*)
-	TARGET=X86; TARGETDIR=x86
+
+  x86_64-*-darwin*)
+	TARGET=X86_DARWIN; TARGETDIR=x86
+	;;
+
+  x86_64-*-cygwin* | x86_64-*-mingw*)
+	TARGET=X86_WIN64; TARGETDIR=x86
+	# All mingw/cygwin/win32 builds require -no-undefined for sharedlib.
+	# We must also check with_cross_host to decide if this is a native
+	# or cross-build and select where to install dlls appropriately.
+	if test -n "$with_cross_host" &&
+	   test x"$with_cross_host" != x"no"; then
+	  AM_LTLDFLAGS='-no-undefined -bindir "$(toolexeclibdir)"';
+	else
+	  AM_LTLDFLAGS='-no-undefined -bindir "$(bindir)"';
+	fi
+	;;
+
+  i?86-*-* | x86_64-*-*)
+	TARGETDIR=x86
+	if test $ac_cv_sizeof_size_t = 4; then
+	  case "$host" in
+	    *-gnux32)
+	      TARGET=X86_64
+	      ;;
+	    *)
+	      TARGET=X86
+	      ;;
+          esac	
+	else
+	  TARGET=X86_64; 
+	fi	  
 	;;
 
   ia64*-*-*)
@@ -130,10 +191,22 @@ case "$host" in
 	TARGET=M68K; TARGETDIR=m68k
 	;;
 
+  microblaze*-*-*)
+	TARGET=MICROBLAZE; TARGETDIR=microblaze
+	;;
+
+  moxie-*-*)
+	TARGET=MOXIE; TARGETDIR=moxie
+	;;
+
+  metag-*-*)
+	TARGET=METAG; TARGETDIR=metag
+	;;
+
   mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*)
 	TARGET=MIPS; TARGETDIR=mips
 	;;
-  mips*-*-linux*)
+  mips*-*-linux* | mips*-*-openbsd*)
 	# Support 128-bit long double for NewABI.
 	HAVE_LONG_DOUBLE='defined(__mips64)'
 	TARGET=MIPS; TARGETDIR=mips
@@ -142,6 +215,9 @@ case "$host" in
   powerpc*-*-linux* | powerpc-*-sysv*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
+  powerpc-*-amigaos*)
+	TARGET=POWERPC; TARGETDIR=powerpc
+	;;
   powerpc-*-beos*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
@@ -151,7 +227,7 @@ case "$host" in
   powerpc-*-aix* | rs6000-*-aix*)
 	TARGET=POWERPC_AIX; TARGETDIR=powerpc
 	;;
-  powerpc-*-freebsd*)
+  powerpc-*-freebsd* | powerpc-*-openbsd*)
 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
 	;;
   powerpc64-*-freebsd*)
@@ -176,17 +252,14 @@ case "$host" in
 	TARGET=SPARC; TARGETDIR=sparc
 	;;
 
-  x86_64-*-darwin*)
-	TARGET=X86_DARWIN; TARGETDIR=x86
+  tile*-*)
+        TARGET=TILE; TARGETDIR=tile
+        ;;
+
+  xtensa*-*)
+	TARGET=XTENSA; TARGETDIR=xtensa
 	;;
 
-  x86_64-*-cygwin* | x86_64-*-mingw*)
-	TARGET=X86_WIN64; TARGETDIR=x86
-	;;
-
-  x86_64-*-*)
-	TARGET=X86_64; TARGETDIR=x86
-	;;
 esac
 
 AC_SUBST(AM_RUNTESTFLAGS)
@@ -197,6 +270,7 @@ if test $TARGETDIR = unknown; then
 fi
 
 AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
+AM_CONDITIONAL(BFIN, test x$TARGET = xBFIN)
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
 AM_CONDITIONAL(X86_FREEBSD, test x$TARGET = xX86_FREEBSD)
@@ -207,11 +281,14 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
 AM_CONDITIONAL(M32R, test x$TARGET = xM32R)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
+AM_CONDITIONAL(MICROBLAZE, test x$TARGET = xMICROBLAZE)
+AM_CONDITIONAL(METAG, test x$TARGET = xMETAG)
 AM_CONDITIONAL(MOXIE, test x$TARGET = xMOXIE)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(POWERPC_AIX, test x$TARGET = xPOWERPC_AIX)
 AM_CONDITIONAL(POWERPC_DARWIN, test x$TARGET = xPOWERPC_DARWIN)
 AM_CONDITIONAL(POWERPC_FREEBSD, test x$TARGET = xPOWERPC_FREEBSD)
+AM_CONDITIONAL(AARCH64, test x$TARGET = xAARCH64)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 AM_CONDITIONAL(AVR32, test x$TARGET = xAVR32)
 AM_CONDITIONAL(LIBFFI_CRIS, test x$TARGET = xLIBFFI_CRIS)
@@ -223,6 +300,8 @@ AM_CONDITIONAL(SH64, test x$TARGET = xSH64)
 AM_CONDITIONAL(PA_LINUX, test x$TARGET = xPA_LINUX)
 AM_CONDITIONAL(PA_HPUX, test x$TARGET = xPA_HPUX)
 AM_CONDITIONAL(PA64_HPUX, test x$TARGET = xPA64_HPUX)
+AM_CONDITIONAL(TILE, test x$TARGET = xTILE)
+AM_CONDITIONAL(XTENSA, test x$TARGET = xXTENSA)
 
 AC_HEADER_STDC
 AC_CHECK_FUNCS(memcpy)
@@ -245,17 +324,7 @@ AC_SUBST(HAVE_LONG_DOUBLE)
 
 AC_C_BIGENDIAN
 
-AC_CACHE_CHECK([assembler .cfi pseudo-op support],
-    libffi_cv_as_cfi_pseudo_op, [
-    libffi_cv_as_cfi_pseudo_op=unknown
-    AC_TRY_COMPILE([asm (".cfi_startproc\n\t.cfi_endproc");],,
-		   [libffi_cv_as_cfi_pseudo_op=yes],
-		   [libffi_cv_as_cfi_pseudo_op=no])
-])
-if test "x$libffi_cv_as_cfi_pseudo_op" = xyes; then
-    AC_DEFINE(HAVE_AS_CFI_PSEUDO_OP, 1,
-	      [Define if your assembler supports .cfi_* directives.])
-fi
+GCC_AS_CFI_PSEUDO_OP
 
 if test x$TARGET = xSPARC; then
     AC_CACHE_CHECK([assembler and linker support unaligned pc related relocs],
@@ -278,7 +347,7 @@ if test x$TARGET = xSPARC; then
        libffi_cv_as_register_pseudo_op, [
        libffi_cv_as_register_pseudo_op=unknown
        # Check if we have .register
-       AC_TRY_COMPILE([asm (".register %g2, #scratch");],,
+       AC_TRY_COMPILE(,[asm (".register %g2, #scratch");],
 		       [libffi_cv_as_register_pseudo_op=yes],
 		       [libffi_cv_as_register_pseudo_op=no])
     ])
@@ -293,8 +362,8 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64
 	libffi_cv_as_x86_pcrel, [
 	libffi_cv_as_x86_pcrel=no
 	echo '.text; foo: nop; .data; .long foo-.; .text' > conftest.s
-	if $CC $CFLAGS -c conftest.s > /dev/null; then
-	   libffi_cv_as_x86_pcrel=yes
+	if $CC $CFLAGS -c conftest.s > /dev/null 2>&1; then
+	    libffi_cv_as_x86_pcrel=yes
 	fi
 	])
     if test "x$libffi_cv_as_x86_pcrel" = xyes; then
@@ -306,7 +375,7 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64
        libffi_cv_as_ascii_pseudo_op, [
        libffi_cv_as_ascii_pseudo_op=unknown
        # Check if we have .ascii
-       AC_TRY_COMPILE([asm (".ascii \\"string\\"");],,
+       AC_TRY_COMPILE(,[asm (".ascii \\"string\\"");],
 		       [libffi_cv_as_ascii_pseudo_op=yes],
 		       [libffi_cv_as_ascii_pseudo_op=no])
     ])
@@ -319,7 +388,7 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64
        libffi_cv_as_string_pseudo_op, [
        libffi_cv_as_string_pseudo_op=unknown
        # Check if we have .string
-       AC_TRY_COMPILE([asm (".string \\"string\\"");],,
+       AC_TRY_COMPILE(,[asm (".string \\"string\\"");],
 		       [libffi_cv_as_string_pseudo_op=yes],
 		       [libffi_cv_as_string_pseudo_op=no])
     ])
@@ -329,6 +398,14 @@ if test x$TARGET = xX86 || test x$TARGET = xX86_WIN32 || test x$TARGET = xX86_64
     fi
 fi
 
+# On PaX enable kernels that have MPROTECT enable we can't use PROT_EXEC.
+AC_ARG_ENABLE(pax_emutramp,
+  [  --enable-pax_emutramp       enable pax emulated trampolines, for we can't use PROT_EXEC],
+  if test "$enable_pax_emutramp" = "yes"; then
+    AC_DEFINE(FFI_MMAP_EXEC_EMUTRAMP_PAX, 1,
+      [Define this if you want to enable pax emulated trampolines])
+  fi)
+
 if test x$TARGET = xX86_WIN64; then
     LT_SYS_SYMBOL_USCORE
     if test "x$sys_symbol_underscore" = xyes; then
@@ -336,7 +413,6 @@ if test x$TARGET = xX86_WIN64; then
     fi
 fi
 
-
 FFI_EXEC_TRAMPOLINE_TABLE=0
 case "$target" in
      *arm*-apple-darwin*)
@@ -345,7 +421,7 @@ case "$target" in
                  [Cannot use PROT_EXEC on this target, so, we revert to
                    alternative means])
      ;;
-     *-apple-darwin10* | *-*-freebsd* | *-*-openbsd* | *-pc-solaris*)
+     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
        AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
                  [Cannot use malloc on this target, so, we revert to
                    alternative means])
@@ -374,11 +450,12 @@ if test "x$GCC" = "xyes"; then
       libffi_cv_ro_eh_frame, [
   	libffi_cv_ro_eh_frame=no
   	echo 'extern void foo (void); void bar (void) { foo (); foo (); }' > conftest.c
-  	if $CC $CFLAGS -S -fpic -fexceptions -o conftest.s conftest.c > /dev/null 2>&1; then
-  	    if grep '.section.*eh_frame.*"a"' conftest.s > /dev/null; then
-  		libffi_cv_ro_eh_frame=yes
-  	    elif grep '.section.*eh_frame.*#alloc' conftest.c \
-  		 | grep -v '#write' > /dev/null; then
+  	if $CC $CFLAGS -c -fpic -fexceptions -o conftest.o conftest.c > /dev/null 2>&1; then
+	    objdump -h conftest.o > conftest.dump 2>&1
+	    libffi_eh_frame_line=`grep -n eh_frame conftest.dump | cut -d: -f 1`
+	    libffi_test_line=`expr $libffi_eh_frame_line + 1`p
+	    sed -n $libffi_test_line conftest.dump > conftest.line
+  	    if grep READONLY conftest.line > /dev/null; then
   		libffi_cv_ro_eh_frame=yes
   	    fi
   	fi
@@ -444,6 +521,7 @@ AC_ARG_ENABLE(structs,
   if test "$enable_structs" = "no"; then
     AC_DEFINE(FFI_NO_STRUCTS, 1, [Define this is you do not want support for aggregate types.])
   fi)
+AM_CONDITIONAL(FFI_DEBUG, test "$enable_debug" = "yes")
 
 AC_ARG_ENABLE(raw-api,
 [  --disable-raw-api       make the raw api unavailable],
@@ -459,7 +537,7 @@ AC_ARG_ENABLE(purify-safety,
 
 # These variables are only ever used when we cross-build to X86_WIN32.
 # And we only support this with GCC, so...
-if test x"$GCC" != x"no"; then
+if test "x$GCC" = "xyes"; then
   if test -n "$with_cross_host" &&
      test x"$with_cross_host" != x"no"; then
     toolexecdir='$(exec_prefix)/$(target_alias)'
@@ -471,17 +549,13 @@ if test x"$GCC" != x"no"; then
   multi_os_directory=`$CC -print-multi-os-directory`
   case $multi_os_directory in
     .) ;; # Avoid trailing /.
-    *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+    ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
   esac
   AC_SUBST(toolexecdir)
-  AC_SUBST(toolexeclibdir)
-fi
-
-if test "${multilib}" = "yes"; then
-  multilib_arg="--enable-multilib"
 else
-  multilib_arg=
+  toolexeclibdir='$(libdir)'
 fi
+AC_SUBST(toolexeclibdir)
 
 AC_CONFIG_COMMANDS(include, [test -d include || mkdir include])
 AC_CONFIG_COMMANDS(src, [

depcomp

@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2006-10-15.18
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@ scriptversion=2006-10-15.18
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -192,14 +199,14 @@ sgi)
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$depfile"
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -215,34 +222,39 @@ aix)
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -323,7 +335,12 @@ hp2)
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
     # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
   else
     echo "#dummy" > "$depfile"
   fi
@@ -399,7 +416,7 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -450,32 +467,39 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -495,7 +519,7 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -533,13 +557,27 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -552,16 +590,23 @@ msvisualcpp)
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -580,5 +625,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

doc/libffi.info

@@ -1,10 +1,10 @@
-This is /home/green/libffi/doc/libffi.info, produced by makeinfo
-version 4.13 from /home/green/libffi/doc/libffi.texi.
+This is ../libffi/doc/libffi.info, produced by makeinfo version 4.13
+from ../libffi/doc/libffi.texi.
 
 This manual is for Libffi, a portable foreign-function interface
 library.
 
-   Copyright (C) 2008, 2010 Red Hat, Inc.
+   Copyright (C) 2008, 2010, 2011 Red Hat, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -27,7 +27,7 @@ libffi
 This manual is for Libffi, a portable foreign-function interface
 library.
 
-   Copyright (C) 2008, 2010 Red Hat, Inc.
+   Copyright (C) 2008, 2010, 2011 Red Hat, Inc.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
@@ -115,8 +115,6 @@ To prepare a call interface object, use the function `ffi_prep_cif'.
      want.  *note Multiple ABIs:: for more information.
 
      NARGS is the number of arguments that this function accepts.
-     `libffi' does not yet handle varargs functions; see *note Missing
-     Features:: for more information.
 
      RTYPE is a pointer to an `ffi_type' structure that describes the
      return type of the function.  *Note Types::.
@@ -129,6 +127,30 @@ To prepare a call interface object, use the function `ffi_prep_cif'.
      properly; `FFI_BAD_TYPEDEF' if one of the `ffi_type' objects is
      incorrect; or `FFI_BAD_ABI' if the ABI parameter is invalid.
 
+   If the function being called is variadic (varargs) then
+`ffi_prep_cif_var' must be used instead of `ffi_prep_cif'.
+
+ -- Function: ffi_status ffi_prep_cif_var (ffi_cif *CIF, ffi_abi
+          varabi, unsigned int NFIXEDARGS, unsigned int varntotalargs,
+          ffi_type *RTYPE, ffi_type **ARGTYPES)
+     This initializes CIF according to the given parameters for a call
+     to a variadic function.  In general it's operation is the same as
+     for `ffi_prep_cif' except that:
+
+     NFIXEDARGS is the number of fixed arguments, prior to any variadic
+     arguments.  It must be greater than zero.
+
+     NTOTALARGS the total number of arguments, including variadic and
+     fixed arguments.
+
+     Note that, different cif's must be prepped for calls to the same
+     function when different numbers of arguments are passed.
+
+     Also note that a call to `ffi_prep_cif_var' with
+     NFIXEDARGS=NOTOTALARGS is NOT equivalent to a call to
+     `ffi_prep_cif'.
+
+
    To call a function using an initialized `ffi_cif', use the
 `ffi_call' function:
 
@@ -296,7 +318,7 @@ is perfectly happy passing structures back and forth.  You must first
 describe the structure to `libffi' by creating a new `ffi_type' object
 for it.
 
- -- ffi_type:
+ -- Data type: ffi_type
      The `ffi_type' has the following members:
     `size_t size'
           This is set by `libffi'; you should initialize it to zero.
@@ -511,9 +533,7 @@ File: libffi.info,  Node: Missing Features,  Next: Index,  Prev: Using libffi,
 `libffi' is missing a few features.  We welcome patches to add support
 for these.
 
-   * There is no support for calling varargs functions.  This may work
-     on some platforms, depending on how the ABI is defined, but it is
-     not reliable.
+   * Variadic closures.
 
    * There is no support for bit fields in structures.
 
@@ -521,6 +541,9 @@ for these.
 
    * The "raw" API is undocumented.
 
+   Note that variadic support is very new and tested on a relatively
+small number of platforms.
+
 
 File: libffi.info,  Node: Index,  Prev: Missing Features,  Up: Top
 
@@ -530,7 +553,6 @@ Index
 [index]
 * Menu:
 
-* :                                      Structures.           (line 12)
 * ABI:                                   Introduction.         (line 13)
 * Application Binary Interface:          Introduction.         (line 13)
 * calling convention:                    Introduction.         (line 13)
@@ -538,11 +560,12 @@ Index
 * closure API:                           The Closure API.      (line 13)
 * closures:                              The Closure API.      (line 13)
 * FFI:                                   Introduction.         (line 31)
-* ffi_call:                              The Basics.           (line 41)
+* ffi_call:                              The Basics.           (line 63)
 * ffi_closure_alloc:                     The Closure API.      (line 19)
 * ffi_closure_free:                      The Closure API.      (line 26)
 * FFI_CLOSURES:                          The Closure API.      (line 13)
 * ffi_prep_cif:                          The Basics.           (line 16)
+* ffi_prep_cif_var:                      The Basics.           (line 39)
 * ffi_prep_closure_loc:                  The Closure API.      (line 34)
 * ffi_status <1>:                        The Closure API.      (line 37)
 * ffi_status:                            The Basics.           (line 18)
@@ -570,24 +593,24 @@ Index
 * ffi_type_void:                         Primitive Types.      (line 10)
 * Foreign Function Interface:            Introduction.         (line 31)
 * void <1>:                              The Closure API.      (line 20)
-* void:                                  The Basics.           (line 43)
+* void:                                  The Basics.           (line 65)
 
 
 
 Tag Table:
-Node: Top724
-Node: Introduction1466
-Node: Using libffi3102
-Node: The Basics3588
-Node: Simple Example6374
-Node: Types7401
-Node: Primitive Types7684
-Node: Structures9504
-Node: Type Example10364
-Node: Multiple ABIs11587
-Node: The Closure API11958
-Node: Closure Example14902
-Node: Missing Features16461
-Node: Index16954
+Node: Top712
+Node: Introduction1460
+Node: Using libffi3096
+Node: The Basics3582
+Node: Simple Example7224
+Node: Types8251
+Node: Primitive Types8534
+Node: Structures10354
+Node: Type Example11224
+Node: Multiple ABIs12447
+Node: The Closure API12818
+Node: Closure Example15762
+Node: Missing Features17321
+Node: Index17774
 
 End Tag Table

doc/libffi.texi

@@ -19,7 +19,7 @@
 This manual is for Libffi, a portable foreign-function interface
 library.
 
-Copyright @copyright{} 2008, 2010 Red Hat, Inc.
+Copyright @copyright{} 2008, 2010, 2011 Red Hat, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -133,8 +133,6 @@ This initializes @var{cif} according to the given parameters.
 you want.  @ref{Multiple ABIs} for more information.
 
 @var{nargs} is the number of arguments that this function accepts.
-@samp{libffi} does not yet handle varargs functions; see @ref{Missing
-Features} for more information.
 
 @var{rtype} is a pointer to an @code{ffi_type} structure that
 describes the return type of the function.  @xref{Types}.
@@ -150,6 +148,30 @@ objects is incorrect; or @code{FFI_BAD_ABI} if the @var{abi} parameter
 is invalid.
 @end defun
 
+If the function being called is variadic (varargs) then
+@code{ffi_prep_cif_var} must be used instead of @code{ffi_prep_cif}.
+
+@findex ffi_prep_cif_var
+@defun ffi_status ffi_prep_cif_var (ffi_cif *@var{cif}, ffi_abi var{abi}, unsigned int @var{nfixedargs}, unsigned int var{ntotalargs}, ffi_type *@var{rtype}, ffi_type **@var{argtypes})
+This initializes @var{cif} according to the given parameters for
+a call to a variadic function.  In general it's operation is the
+same as for @code{ffi_prep_cif} except that:
+
+@var{nfixedargs} is the number of fixed arguments, prior to any
+variadic arguments.  It must be greater than zero.
+
+@var{ntotalargs} the total number of arguments, including variadic
+and fixed arguments.
+
+Note that, different cif's must be prepped for calls to the same
+function when different numbers of arguments are passed.
+
+Also note that a call to @code{ffi_prep_cif_var} with
+@var{nfixedargs}=@var{nototalargs} is NOT equivalent to a call to
+@code{ffi_prep_cif}.
+
+@end defun
+
 
 To call a function using an initialized @code{ffi_cif}, use the
 @code{ffi_call} function:
@@ -338,7 +360,7 @@ You must first describe the structure to @samp{libffi} by creating a
 new @code{ffi_type} object for it.
 
 @tindex ffi_type
-@deftp ffi_type
+@deftp {Data type} ffi_type
 The @code{ffi_type} has the following members:
 @table @code
 @item size_t size
@@ -572,9 +594,7 @@ support for these.
 
 @itemize @bullet
 @item
-There is no support for calling varargs functions.  This may work on
-some platforms, depending on how the ABI is defined, but it is not
-reliable.
+Variadic closures.
 
 @item
 There is no support for bit fields in structures.
@@ -591,6 +611,8 @@ The ``raw'' API is undocumented.
 @c anything else?
 @end itemize
 
+Note that variadic support is very new and tested on a relatively
+small number of platforms.
 
 @node Index
 @unnumbered Index

doc/stamp-vti

@@ -0,0 +1,4 @@
+@set UPDATED 16 March 2013
+@set UPDATED-MONTH March 2013
+@set EDITION 3.0.13
+@set VERSION 3.0.13

doc/version.texi

@@ -0,0 +1,4 @@
+@set UPDATED 16 March 2013
+@set UPDATED-MONTH March 2013
+@set EDITION 3.0.13
+@set VERSION 3.0.13

fficonfig.h.in

@@ -20,6 +20,9 @@
 /* Cannot use PROT_EXEC on this target, so, we revert to alternative means */
 #undef FFI_EXEC_TRAMPOLINE_TABLE
 
+/* Define this if you want to enable pax emulated trampolines */
+#undef FFI_MMAP_EXEC_EMUTRAMP_PAX
+
 /* Cannot use malloc on this target, so, we revert to alternative means */
 #undef FFI_MMAP_EXEC_WRIT
 

generate-ios-source-and-headers.py

@@ -0,0 +1,160 @@
+#!/usr/bin/env python
+
+import subprocess
+import re
+import os
+import errno
+import collections
+import sys
+
+class Platform(object):
+    pass
+
+sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
+
+def sdkinfo(sdkname):
+    ret = {}
+    for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
+        kv = line.strip().split(': ', 1)
+        if len(kv) == 2:
+            k,v = kv
+            ret[k] = v
+    return ret
+
+sim_sdk_info = sdkinfo('iphonesimulator')
+device_sdk_info = sdkinfo('iphoneos')
+
+def latest_sdks():
+    latest_sim = None
+    latest_device = None
+    for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout:
+        match = sdk_re.match(line)
+        if match:
+            if 'Simulator' in line:
+                latest_sim = match.group(1)
+            elif 'iOS' in line:
+                latest_device = match.group(1)
+
+    return latest_sim, latest_device
+
+sim_sdk, device_sdk = latest_sdks()
+
+class simulator_platform(Platform):
+    sdk='iphonesimulator'
+    arch = 'i386'
+    name = 'simulator'
+    triple = 'i386-apple-darwin10'
+    sdkroot = sim_sdk_info['Path']
+
+    prefix = "#if !defined(__arm__) && defined(__i386__)\n\n"
+    suffix = "\n\n#endif"
+
+class device_platform(Platform):
+    sdk='iphoneos'
+    name = 'ios'
+    arch = 'armv7'
+    triple = 'arm-apple-darwin10'
+    sdkroot = device_sdk_info['Path']
+
+    prefix = "#ifdef __arm__\n\n"
+    suffix = "\n\n#endif"
+
+
+def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
+    if not os.path.exists(dst_dir):
+        os.makedirs(dst_dir)
+
+    out_filename = filename
+
+    if file_suffix:
+        split_name = os.path.splitext(filename)
+        out_filename =  "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
+
+    with open(os.path.join(src_dir, filename)) as in_file:
+        with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
+            if prefix:
+                out_file.write(prefix)
+
+            out_file.write(in_file.read())
+
+            if suffix:
+                out_file.write(suffix)
+
+headers_seen = collections.defaultdict(set)
+
+def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
+    for root, dirs, files in os.walk(src_dir, followlinks=True):
+        relroot = os.path.relpath(root,src_dir)
+
+        def move_dir(arch, prefix='', suffix='', files=[]):
+            for file in files:
+                file_suffix = None
+                if file.endswith('.h'):
+                    if dest_include_dir:
+                        file_suffix = arch
+                        if arch:
+                            headers_seen[file].add(arch)
+                        move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
+
+                elif dest_dir:
+                    outroot = os.path.join(dest_dir, relroot)
+                    move_file(root, outroot, file, prefix=prefix, suffix=suffix)
+
+        if relroot == '.':
+            move_dir(arch=arch,
+                     files=files,
+                     prefix=prefix,
+                     suffix=suffix)
+        elif relroot == 'arm':
+            move_dir(arch='arm',
+                     prefix="#ifdef __arm__\n\n",
+                     suffix="\n\n#endif",
+                     files=files)
+        elif relroot == 'x86':
+            move_dir(arch='i386',
+                     prefix="#if !defined(__arm__) && defined(__i386__)\n\n",
+                     suffix="\n\n#endif",
+                     files=files)
+
+def build_target(platform):
+    def xcrun_cmd(cmd):
+        return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip()
+
+    build_dir = 'build_' + platform.name
+    if not os.path.exists(build_dir):
+        os.makedirs(build_dir)
+        env = dict(CC=xcrun_cmd('clang'),
+                   LD=xcrun_cmd('ld'),
+                   CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.0' % (platform.arch, platform.sdkroot))
+        working_dir=os.getcwd()
+        try:
+            os.chdir(build_dir)
+            subprocess.check_call(['../configure', '-host', platform.triple], env=env)
+            move_source_tree('.', None, '../ios/include',
+                             arch=platform.arch,
+                             prefix=platform.prefix,
+                             suffix=platform.suffix)
+            move_source_tree('./include', None, '../ios/include',
+                            arch=platform.arch,
+                            prefix=platform.prefix,
+                            suffix=platform.suffix)
+        finally:
+            os.chdir(working_dir)
+
+        for header_name, archs in headers_seen.iteritems():
+            basename, suffix = os.path.splitext(header_name)
+
+def main():
+    move_source_tree('src', 'ios/src', 'ios/include')
+    move_source_tree('include', None, 'ios/include')
+    build_target(simulator_platform)
+    build_target(device_platform)
+
+    for header_name, archs in headers_seen.iteritems():
+        basename, suffix = os.path.splitext(header_name)
+        with open(os.path.join('ios/include', header_name), 'w') as header:
+            for arch in archs:
+                header.write('#include <%s_%s%s>\n' % (basename, arch, suffix))
+
+if __name__ == '__main__':
+    main()

generate-osx-source-and-headers.py

@@ -0,0 +1,153 @@
+#!/usr/bin/env python
+import subprocess
+import re
+import os
+import errno
+import collections
+import sys
+
+class Platform(object):
+    pass
+
+sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
+
+def sdkinfo(sdkname):
+    ret = {}
+    for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
+        kv = line.strip().split(': ', 1)
+        if len(kv) == 2:
+            k,v = kv
+            ret[k] = v
+    return ret
+
+desktop_sdk_info = sdkinfo('macosx')
+
+def latest_sdks():
+    latest_desktop = None
+    for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout:
+        match = sdk_re.match(line)
+        if match:
+            if 'OS X' in line:
+                latest_desktop = match.group(1)
+
+    return latest_desktop
+
+desktop_sdk = latest_sdks()
+
+class desktop_platform_32(Platform):
+    sdk='macosx'
+    arch = 'i386'
+    name = 'mac32'
+    triple = 'i386-apple-darwin10'
+    sdkroot = desktop_sdk_info['Path']
+
+    prefix = "#if defined(__i386__) && !defined(__x86_64__)\n\n"
+    suffix = "\n\n#endif"
+
+class desktop_platform_64(Platform):
+    sdk='macosx'
+    arch = 'x86_64'
+    name = 'mac'
+    triple = 'x86_64-apple-darwin10'
+    sdkroot = desktop_sdk_info['Path']
+
+    prefix = "#if !defined(__i386__) && defined(__x86_64__)\n\n"
+    suffix = "\n\n#endif"
+
+def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
+    if not os.path.exists(dst_dir):
+        os.makedirs(dst_dir)
+
+    out_filename = filename
+
+    if file_suffix:
+        split_name = os.path.splitext(filename)
+        out_filename =  "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
+
+    with open(os.path.join(src_dir, filename)) as in_file:
+        with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
+            if prefix:
+                out_file.write(prefix)
+
+            out_file.write(in_file.read())
+
+            if suffix:
+                out_file.write(suffix)
+
+headers_seen = collections.defaultdict(set)
+
+def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
+    for root, dirs, files in os.walk(src_dir, followlinks=True):
+        relroot = os.path.relpath(root,src_dir)
+
+        def move_dir(arch, prefix='', suffix='', files=[]):
+            for file in files:
+                file_suffix = None
+                if file.endswith('.h'):
+                    if dest_include_dir:
+                        file_suffix = arch
+                        if arch:
+                            headers_seen[file].add(arch)
+                        move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
+
+                elif dest_dir:
+                    outroot = os.path.join(dest_dir, relroot)
+                    move_file(root, outroot, file, prefix=prefix, suffix=suffix)
+
+        if relroot == '.':
+            move_dir(arch=arch,
+                     files=files,
+                     prefix=prefix,
+                     suffix=suffix)
+        elif relroot == 'x86':
+            move_dir(arch='i386',
+                     prefix="#if defined(__i386__) && !defined(__x86_64__)\n\n",
+                     suffix="\n\n#endif",
+                     files=files)
+            move_dir(arch='x86_64',
+                     prefix="#if !defined(__i386__) && defined(__x86_64__)\n\n",
+                     suffix="\n\n#endif",
+                     files=files)
+
+def build_target(platform):
+    def xcrun_cmd(cmd):
+        return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip()
+
+    build_dir = 'build_' + platform.name
+    if not os.path.exists(build_dir):
+        os.makedirs(build_dir)
+        env = dict(CC=xcrun_cmd('clang'),
+                   LD=xcrun_cmd('ld'),
+                   CFLAGS='-arch %s -isysroot %s -mmacosx-version-min=10.6' % (platform.arch, platform.sdkroot))
+        working_dir=os.getcwd()
+        try:
+            os.chdir(build_dir)
+            subprocess.check_call(['../configure', '-host', platform.triple], env=env)
+            move_source_tree('.', None, '../osx/include',
+                             arch=platform.arch,
+                             prefix=platform.prefix,
+                             suffix=platform.suffix)
+            move_source_tree('./include', None, '../osx/include',
+                             arch=platform.arch,
+                             prefix=platform.prefix,
+                             suffix=platform.suffix)
+        finally:
+            os.chdir(working_dir)
+
+        for header_name, archs in headers_seen.iteritems():
+            basename, suffix = os.path.splitext(header_name)
+
+def main():
+    move_source_tree('src', 'osx/src', 'osx/include')
+    move_source_tree('include', None, 'osx/include')
+    build_target(desktop_platform_32)
+    build_target(desktop_platform_64)
+
+    for header_name, archs in headers_seen.iteritems():
+        basename, suffix = os.path.splitext(header_name)
+        with open(os.path.join('osx/include', header_name), 'w') as header:
+            for arch in archs:
+                header.write('#include <%s_%s%s>\n' % (basename, arch, suffix))
+
+if __name__ == '__main__':
+    main()

include/Makefile.in

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.12.2 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -39,9 +55,11 @@ subdir = include
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/ffi.h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cc_maxopt.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4/asmcfi.m4 \
+	$(top_srcdir)/m4/ax_append_flag.m4 \
+	$(top_srcdir)/m4/ax_cc_maxopt.m4 \
 	$(top_srcdir)/m4/ax_cflags_warn_all.m4 \
-	$(top_srcdir)/m4/ax_check_compiler_flags.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_compiler_vendor.m4 \
 	$(top_srcdir)/m4/ax_configure_args.m4 \
 	$(top_srcdir)/m4/ax_enable_builddir.m4 \
@@ -59,6 +77,11 @@ CONFIG_CLEAN_FILES = ffi.h ffitarget.h
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -80,6 +103,12 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(includesdir)"
 HEADERS = $(nodist_includes_HEADERS)
 ETAGS = etags
@@ -266,8 +295,11 @@ clean-libtool:
 	-rm -rf .libs _libs
 install-nodist_includesHEADERS: $(nodist_includes_HEADERS)
 	@$(NORMAL_INSTALL)
-	test -z "$(includesdir)" || $(MKDIR_P) "$(DESTDIR)$(includesdir)"
 	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(includesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(includesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -281,9 +313,7 @@ uninstall-nodist_includesHEADERS:
 	@$(NORMAL_UNINSTALL)
 	@list='$(nodist_includes_HEADERS)'; test -n "$(includesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(includesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(includesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(includesdir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -334,6 +364,20 @@ GTAGS:
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
 
+cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
+	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
@@ -384,10 +428,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -469,7 +518,7 @@ uninstall-am: uninstall-nodist_includesHEADERS
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool ctags distclean distclean-generic \
+	clean-libtool cscopelist ctags distclean distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \

include/ffi.h.in

@@ -86,11 +86,15 @@ extern "C" {
 #else
 # ifdef LLONG_MAX
 #  define FFI_LONG_LONG_MAX LLONG_MAX
+#  ifdef _AIX52 /* or newer has C99 LLONG_MAX */
+#   undef FFI_64_BIT_MAX
+#   define FFI_64_BIT_MAX 9223372036854775807LL
+#  endif /* _AIX52 or newer */
 # else
 #  ifdef __GNUC__
 #   define FFI_LONG_LONG_MAX __LONG_LONG_MAX__
 #  endif
-#  ifdef _AIX
+#  ifdef _AIX /* AIX 5.1 and earlier have LONGLONG_MAX */
 #   ifndef __PPC64__
 #    if defined (__IBMC__) || defined (__IBMCPP__)
 #     define FFI_LONG_LONG_MAX LONGLONG_MAX
@@ -162,22 +166,36 @@ typedef struct _ffi_type
  #error "long size not supported"
 #endif
 
+/* Need minimal decorations for DLLs to works on Windows. */
+/* GCC has autoimport and autoexport.  Rely on Libtool to */
+/* help MSVC export from a DLL, but always declare data   */
+/* to be imported for MSVC clients.  This costs an extra  */
+/* indirection for MSVC clients using the static version  */
+/* of the library, but don't worry about that.  Besides,  */
+/* as a workaround, they can define FFI_BUILDING if they  */
+/* *know* they are going to link with the static library. */
+#if defined _MSC_VER && !defined FFI_BUILDING
+#define FFI_EXTERN extern __declspec(dllimport)
+#else
+#define FFI_EXTERN extern
+#endif
+
 /* These are defined in types.c */
-extern ffi_type ffi_type_void;
-extern ffi_type ffi_type_uint8;
-extern ffi_type ffi_type_sint8;
-extern ffi_type ffi_type_uint16;
-extern ffi_type ffi_type_sint16;
-extern ffi_type ffi_type_uint32;
-extern ffi_type ffi_type_sint32;
-extern ffi_type ffi_type_uint64;
-extern ffi_type ffi_type_sint64;
-extern ffi_type ffi_type_float;
-extern ffi_type ffi_type_double;
-extern ffi_type ffi_type_pointer;
+FFI_EXTERN ffi_type ffi_type_void;
+FFI_EXTERN ffi_type ffi_type_uint8;
+FFI_EXTERN ffi_type ffi_type_sint8;
+FFI_EXTERN ffi_type ffi_type_uint16;
+FFI_EXTERN ffi_type ffi_type_sint16;
+FFI_EXTERN ffi_type ffi_type_uint32;
+FFI_EXTERN ffi_type ffi_type_sint32;
+FFI_EXTERN ffi_type ffi_type_uint64;
+FFI_EXTERN ffi_type ffi_type_sint64;
+FFI_EXTERN ffi_type ffi_type_float;
+FFI_EXTERN ffi_type ffi_type_double;
+FFI_EXTERN ffi_type ffi_type_pointer;
 
 #if @HAVE_LONG_DOUBLE@
-extern ffi_type ffi_type_longdouble;
+FFI_EXTERN ffi_type ffi_type_longdouble;
 #else
 #define ffi_type_longdouble ffi_type_double
 #endif
@@ -203,6 +221,15 @@ typedef struct {
 #endif
 } ffi_cif;
 
+/* Used internally, but overridden by some architectures */
+ffi_status ffi_prep_cif_core(ffi_cif *cif,
+			     ffi_abi abi,
+			     unsigned int isvariadic,
+			     unsigned int nfixedargs,
+			     unsigned int ntotalargs,
+			     ffi_type *rtype,
+			     ffi_type **atypes);
+
 /* ---- Definitions for the raw API -------------------------------------- */
 
 #ifndef FFI_SIZEOF_ARG
@@ -270,7 +297,12 @@ size_t ffi_java_raw_size (ffi_cif *cif);
 __declspec(align(8))
 #endif
 typedef struct {
+#if @FFI_EXEC_TRAMPOLINE_TABLE@
+  void *trampoline_table;
+  void *trampoline_table_entry;
+#else
   char tramp[FFI_TRAMPOLINE_SIZE];
+#endif
   ffi_cif   *cif;
   void     (*fun)(ffi_cif*,void*,void**,void*);
   void      *user_data;
@@ -303,8 +335,12 @@ ffi_prep_closure_loc (ffi_closure*,
 # pragma pack 8
 #endif
 typedef struct {
+#if @FFI_EXEC_TRAMPOLINE_TABLE@
+  void *trampoline_table;
+  void *trampoline_table_entry;
+#else
   char tramp[FFI_TRAMPOLINE_SIZE];
-
+#endif
   ffi_cif   *cif;
 
 #if !FFI_NATIVE_RAW_API
@@ -324,7 +360,12 @@ typedef struct {
 } ffi_raw_closure;
 
 typedef struct {
+#if @FFI_EXEC_TRAMPOLINE_TABLE@
+  void *trampoline_table;
+  void *trampoline_table_entry;
+#else
   char tramp[FFI_TRAMPOLINE_SIZE];
+#endif
 
   ffi_cif   *cif;
 
@@ -380,6 +421,13 @@ ffi_status ffi_prep_cif(ffi_cif *cif,
 			ffi_type *rtype,
 			ffi_type **atypes);
 
+ffi_status ffi_prep_cif_var(ffi_cif *cif,
+			    ffi_abi abi,
+			    unsigned int nfixedargs,
+			    unsigned int ntotalargs,
+			    ffi_type *rtype,
+			    ffi_type **atypes);
+
 void ffi_call(ffi_cif *cif,
 	      void (*fn)(void),
 	      void *rvalue,

include/ffi_common.h

@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------
-   ffi_common.h - Copyright (C) 2011  Anthony Green
+   ffi_common.h - Copyright (C) 2011, 2012  Anthony Green
                   Copyright (C) 2007  Free Software Foundation, Inc
                   Copyright (c) 1996  Red Hat, Inc.
                   
@@ -75,6 +75,8 @@ void ffi_type_test(ffi_type *a, char *file, int line);
 
 /* Perform machine dependent cif processing */
 ffi_status ffi_prep_cif_machdep(ffi_cif *cif);
+ffi_status ffi_prep_cif_machdep_var(ffi_cif *cif,
+	 unsigned int nfixedargs, unsigned int ntotalargs);
 
 /* Extended cif, used in callback from assembly routine */
 typedef struct
@@ -85,7 +87,7 @@ typedef struct
 } extended_cif;
 
 /* Terse sized type definitions.  */
-#if defined(_MSC_VER) || defined(__sgi)
+#if defined(_MSC_VER) || defined(__sgi) || defined(__SUNPRO_C)
 typedef unsigned char UINT8;
 typedef signed char   SINT8;
 typedef unsigned short UINT16;
@@ -116,8 +118,8 @@ typedef float FLOAT32;
 #ifndef __GNUC__
 #define __builtin_expect(x, expected_value) (x)
 #endif
-#define LIKELY(x)    __builtin_expect((x),1)
-#define UNLIKELY(x)  __builtin_expect((x),1)
+#define LIKELY(x)    __builtin_expect(!!(x),1)
+#define UNLIKELY(x)  __builtin_expect((x)!=0,0)
 
 #ifdef __cplusplus
 }

jnalib/.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" output="build.eclipse/test-classes" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="build.eclipse/classes"/>
-</classpath>

jnalib/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>jnalib</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/.settings/org.eclipse.jdt.core.prefs

@@ -1,62 +0,0 @@
-#Wed Aug 29 20:43:29 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5

jnalib/.settings/org.eclipse.ltk.core.refactoring.prefs

@@ -1,3 +0,0 @@
-#Tue Mar 27 21:18:08 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false

jnalib/OTHERS

@@ -1,33 +0,0 @@
-* RELATED and/or SIMILAR PROJECTS: 
-* Feel free to add notes and/or descriptions here (this should probably go
-* on a wiki somewhere).
-----
-* nlink.dev.java.net: 
-   pros: simple definitions (same as jna)
-   cons: w32 only
-* sf.net/projects/jnative: 
-   cons: boilerplate, manual code generation by calling setup methods
-   pros: callbacks, byref args?
-* JNIWrapper: kinda like jnative (commercial), includes platform "packs"
-* coroutine for Java, like jnative (commercial)
-* jnieasy: c++ mappings (http://www.innowhere.com:8080/webapp/jsp/products/jnieasy/index.jsp?_page=products.jnieasy)
-* j2native (www.smardec.com)
-* j-interop.sf.net
-* jawinproject.sf.net (COM DLL access)
-* jacob-project.sf.net (COM DLL access)
-* nativecall.sf.net (minimal)
-* cxxwrap.sf.net
-* J/Direct (defunct)
-* NoodleGlue
-* SWIG
-* ctypes4j.sf.net
-* ctypes-java (out of date)
-* jnbridge
-* xFunction (http://excelsior-usa.com/xfunction.html, commercial, osx)
-* JACE c++ mappings
-* JAW Java API wrapper http://www.aplu.ch/home/apluhome.jsp?site=5
-
-# OTHER REFERENCES
-# JNI options: http://staff.develop.com/halloway/JavaWin32.html
-# List of JNI alternatives: http://weblog.janek.org/Archive/2005/07/28/AlternativestoJavaNativeI.html
-

jnalib/TODO

@@ -1,277 +0,0 @@
-# DESIGN GOALS/REQUIREMENTS
-  o no permanent references to java objects in native code (hard to get rid of)
-    this means no java object arguments to callbacks; use some sort of integer
-    key instead (hashcode?) callbacks can hold local data anyway...
-  o make simplest Java usage map to most common C usage
-    - additional constructs provided for less-common cases
-      (WString,Structure.ByValue/ByReference)
-  o structure is treated as a pointer, except within a struct
-  o primitive types are passed directly
-  o arrays are treated as pointers, except within a struct
-    - in structure (inline; otherwise pointer-to-X should be used)
-    - as function argument (auto-convert to pointer via Memory)
-  o pointer to type in struct should use Pointer or ByReference
-  o "free" should be invisible wherever possible
-
-# FUTURE DEMOS:
-* test keyboard keys' state (needs OSX)
-* get system process information, basic process control
-* additional file utilities (meta info, free space, etc)
-* enforce window minimum/maximum size (workaround java bug)
-
-# TODO
-
-* fix setFieldOrder to *always* apply if used
-* cache structure information
-
-* make direct calls call back *once* to Java where conversion is required,
-  and process all arguments from there (instead of potentially swapping back
-  and forth multipel times).  This also makes it easer to perform conversions
-  (no native changes required).  
-
-* direct/raw non-primitive array arguments (String[], Pointer[], NativeMapped[])
-
-* ppc64 direct/raw failures (multiple)
-
-* direct calls on ppc to varargs (callbacks) with FP args fail; avoid them for
-  now 
-
-* combine direct and interface mapping calling code where possible
-
-* make native dll extraction from jar public, to use with user dlls packaged
-  in a jar
-
-* Callback.PostCallWrite.write() cf PostCallRead
-
-* GetPrimitiveArrayCritical: use this if flagged (by annotation? method name?)
-
-* MethodArgument/ReturnMapper: per method mapping of arguments/return type.
-  Can use annotations as shorthand to initialize a map, but basically set up a
-  per-NativeLibrary (or per-Function?) map of methods to mappers.
-
-  Requires separate compilation of annotation handling.
-
-* ditch type conversion context (?)  
-
-* packaging: 'types', 'convert/marshal' subpackages?
-  note: marshal/unmarshal vs to/fromnative: to/fromnative is more
-  explicit, since marshal/unmarshal doesn't indicate src/dst.
-  o moving conversion contexts to subpackage cleans up top level
-  substantially, but we probably don't want to move things like Structure and
-  Pointer into a types subpackage (which would leave just a few top-level
-  classes).  Javadoc is cluttered by example classes anyway.
-
-* support annotations of parameters and return values w/o breaking
-  1.4 compatibility (retroweaver?), e.g.
-  -- retroweaver (requires retroweaver runtime classes to provide annotation
-  features) not yet worth doing
-
-  void my_function(@MarshalAs(off_t)long arg);
-
-  trading off cruft in the interface def to avoid cruft in the usage:
-
-  my_function(0) versus my_function(new off_t(0))
-  
-  this only really applies to NativeLong/IntegerType types that want to use a
-  primitive value instead of creating an object instance.
-
-* flag string(/wstring)-returning methods which need to free their result
-   to avoid leaking memory whan auto-creating strings from the result
-   (since normally we don't take explicit ownership of any returned pointers)
-   this is a special case for returned strings only, since other returned
-   pointers are available to the user for later "freeing"
-   Use a map on library creation, an iface for the library, or annotation
-   NOTE: how many methods actually do this? strdup...
-   Maybe make function return "Memory", which can then be converted to a
-   Structure or some other type.  Then memory will free itself when no longer
-   referenced. 
-* make Pointer free-able (system allocates memory, client frees it); actually,
-  this should probably be automatic so the user doesn't have to think about it.
-  Maybe a custom type representing "function-allocated-pointer" or
-  "pointer-requiring-free" (which is just Memory).  For now, leave it up to
-  the user to manage the pointer, since they have to define the free method
-  anyway.  use could always put a finalizer on a PointerType-derived type.
-* universal GCC build w/cross-compile (needs cross compilers...)
-* return Pointer.SIZE/LONG_SIZE/WCHAR_SIZE in bits (for consistency with 1.5)
-  Long.SIZE, Integer.SIZE, et al.
-* interface "lvalue", which can provide a pointer to itself (reference() or
-  addressOf())?
-* bitfields for structs (how?)
-
-
-# DONE
-* Make a separate jar file for all OS-specific headers
-  Maybe make interfaces per-header file (winbase, winnt, stdlib, etc),
-  aggregated per-library (interface CLibrary extends stdlib, stdio, etc)
-  (how useful would it really be, or is this just sorting legos?)
-  o same for windowutils, fileutils, etc. (not useful)
-* check Structure "final" fields; should never write back to native memory
-* OSX ObjC access (see rococoa)
-* do Structure.write for any callback args
-* pointer.setValue(), to handle NativeMapped types and move read/writeValue
-  methods out of Structure, to be used by Function w/NativeMapped[] parameter
-
-* if method has "GetLastErrorException/ErrnoException" in its signature, use
-  result codes + GetLastError/errno/errstr to auto-generate 
-  runtime exceptions? (cf P/Invoke; also useful for X11 return types)
-  provide annotation/custom invocation handler/hook to examine return value and
-  throw an exception if the return value indicates an error
-
-  o are error return values consistent (if so, a single handler works)?
-    if null -> call GetLastError
-    if nonzero ?
-  o otherwise, need an ExceptionOnZero, ExceptionOnNonZero runtime, from which
-  derive GetLastError/ErrnoExceptionOnZero/NZ
-* verify get/set methods vs read/write for performance (Pointer)?
-  (see RawTest for performance comparisons)
-* Allow Buffer in Structures (and callbacks) (auto-wrap in direct byte buffer)?
-  o this gets tricky when reading structs from native memory; we don't know if
-  the value is already mapped to a buffer (cf CallbackReference)
-* standard types for various platforms: posix/types.h, w32 (DWORD, HANDLE)
-
-* embed version in DLL ('depends'-done)/so (symlink?)
-* use libffi closure allocation/deallocation
-
-* ensure Library options are passed to NativeFunctionHandler
-  (needs getLibraryOptions(Class cls))
-
-* handle array of Structure.ByReference as parameter/return value (cf Pointer[])
-* test performance of setByte/getByte and pass pointer field directly if it
-  makes sense to do so (done, halves access time to use pointer field directly,
-  slight variations on 1.4/1.5/1.6).
-* test callback arg/return value for callback type 
-* structure by value in callback
-
-* call native to fix up FFIType on creation (avoid multithreading problems)
-  properly handle union by value (or punt; must pass union field instead)
-
-* hash javah-generated headers; when changed, invalidate platform-specific
-
-* add main class which spits out version information
-  
-* docs: split pages: FAQ
-  FAQ: J2ME, new platform builds, stdcall
-
-* struct by reference within structure
-* struct by value
-  (how to do struct value return (vs struct pointer) (uncommon)?)
-  (how to do struct value argument (vs struct pointer) (uncommon)?) 
-* use appropriate size_t and off_t sizes (use long offsets everywhere in
-  Pointer) 
-* Callback/function pointer as return value (e.g. signal())
-* type safety between returned and passed in pointers (w32 API); advantage of
-  deriving from Pointer is that type mapping can be made automatic, without an
-  explicit type mapping defined.
-* catch native crash/exception/faults and re-throw as java exception
-  this is mostly for debugging a new mapping to avoid crashing the VM
-  could do setjmp/longjmp on *nix and catch C++ exception on w32
-* NativeMapped: provide interface to automatically convert custom Java
-  type to/from native types. 
-* update X11 libs for 64-bit
-* use libffi from gcc to handle calls and callbacks?
-  or move callback asm templates into dispatch_<arch>.c
-* more tests for argument types (2 args, all permutations of basic data types)
-   ensures native stack handling is done properly (handled by libffi)
-* universal OSX build w/cross-compile (hard to do with libffi)
-* use jna.encoding property to affect string encoding instead of just using
-  the system default encoding.
-* change/augment getWindowHandle0 to provide any heavyweight component window
-* unions (copy-on-call is problematic: which member is active?) must require
-  explicit write, either per member or whole object before export
-* rename Argument/Result Converter to be fromNative/toNative
-* split unit tests
-* auto-convert struct pointers in callback args to Java Structure
-  (may need a proxy wrapper around callback to avoid excessive JNI)
-  use proxy for callbacks to enable auto-conversion of arguments and/or return
-  value (in java-land instead of C-land). 
-* review/use refactor nativelibrary/function
-* auto-generate stdcall decorated symbols (try if undecorated lookup fails)
-* per-library jna.library.path: many libraries have a "standard" location (or
-  several); let the library author indicate what these are (X11, for example)
-* return array of struct (annotation to indicate which argument has the
-  length of the returned value might be nice) (this can now be done with a
-  type mapper)
-* callbacks need a dispose if they are to live beyond the lifetime of the
-function to which they are passed; maybe a simpler callback interface for
-transient callbacks, and require callback+dispose for most callbacks?
-  TransientCallback: callback
-  NonTransientCallback: callback+dispose
-  (callback is disposed when no longer referenced; user must ensure callback
-  is not GC'd until it is removed as a native callback)
-* auto-convert strings in w32 functions ending in 'W'?  would this introduce
-  any ambiguity?
-* Dispose/unload library on GC (use ref queue)
-* fix dnd on linux (no hole?) (mostly fixed, still some artifacts)
-* transparent/shaped drag image
-* windows handles need to be Pointer (void*), not 'int'
-* other demos: move to trash, file change notification
-* tests for other primitive array types
-* build test dll/dispatch lib w/cygwin/gcc instead of msvc (?) under w32
-* nested struct alignment (4/8 byte?  depends on first element?)
-* nested structs in structs: easier to define using struct; use pointer
-   if you need a pointer
-   struct auto-converts to pointer as argument, should be inline in struct
-   (struct should require explicit pointer, argument should require explicit
-   non-pointer) (maybe use object version of basic type as "pointer" version)
-* provide JNA-only search path for libraries
-* callbacks
-* move javah-generated files to own space
-* darwin/PPC asm layer
-* enable w32 build with either GCC or MSVC (GCC-built dll doesn't work yet)
-* support pointer to basic type argument (int *) w/type safety - what's the
-   best API from a user perspective? new Pointer(int)? new Pointer<int>?
-   Base class "pointer to" gets converted to Pointer in invocation handler;
-   provide a getValue() to retrieve the result; otherwise the memory is opaque
-
-  o IntPtr, WCharPtr, CharPtr, ShortPtr, LongPtr, DoublePtr, FloatPtr, 
-    Handle (PtrPtr), getValue(), getPointer()
-  o add getCharArray() et al. to Pointer?
-
-* inline arrays of primitive types
-* remove debug flags (they're not useful)
-* Use WString to identify return type and arg
-* use interface to identify native, instead of annotation
-* isolate stdcall to w32 (should be private to platform)
-* generic gcc build/osx(ppc/x86)/linux
-* remove generics/enable build under 1.4
-* tests for structs
-* test float/double
-* offset placeholders for structs (explicit alignment)
-* vanilla ant build file
-* build native stuff from build.xml
-* implement basic junit tests
-* auto-align struct fields
-* handle long/byte/short
-* make annotations for native method names optional
-// hard clip for now, alpha transparency later
-// also allow ImageIcon to be used as clip (getImage())
-void setWindowMask(Window w, Shape clip);
-// needs:
-int findNativeWindow(Window w);
-
-#MAYBE NOT
-* should structure offsets be 64-bit? technically yes, but in practice I don't
-  think a structure that big actually works.
-* (maybe) move all native functions into Native (limit header files, easier
-  management) 
-* Does it make sense to define Int16/UInt16, Int32/UInt32, etc?  Probably not
-  the signed versions, but maybe the unsigned ones, to facilitate generating
-  unsigned values (maybe just provide utilities to pack an unsigned int into a
-  signed int).  What about size_t, off_t, et al.?  Would either need a
-  bunch of native lookup functions (more accurate) or java-side conditionals
-  (less robust but easier to change).
-  o bounds checking is handled by IntegerType (pass in a long, get an
-    exception if the value is out of bounds).
-  o when used as struct fields, could allow detection of field order by order
-    of initialization (requires all-or-nothing usage, though)
-* StringBuffer/StringBuilder as mutable char*/wchar_t* argument
-  NOTE: byte[]/char[] is probably better; it's trivial to convert to String
-  and native code can't change the size anyway
-* provide library load/unload hooks (Runnables in options?). Examples:
-  o GetLastError (no longer needed)
-  o WSAInit?
-* determine X11 display name from current java program (if any); null is ok
-  since it uses getenv(DISPLAY), which is what java would do
-  note: DISPLAY may be available in GraphicsDevice->getIDstring
-
-

jnalib/build.xml

@@ -1,692 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="JNA" default="default" basedir=".">
-  <description>Builds and tests JNA</description>
-
-  <!--  
-  Conventions (since ant can't easily specify arbitrary file dependencies):
-  The uptodate property for a given target TARGET is "-TARGET"; the actual
-  target to generate the uptodate property is named ":TARGET".
-
-  Properties (except for uptodate properties) separate words by dots, targets
-  by dashes. 
-  -->
-
-  <!-- global properties -->
-  <!-- (all build-related props should go in -dynamic-properties) -->
-  <property name="name" value="jna"/>
-  <property name="jar" value="${name}.jar"/>
-  <property name="testjar" value="${name}-test.jar"/>
-  <property name="debug" value="true"/>
-  <property name="debug.native" value="false"/>
-  <property name="cflags_extra.native" value=""/>
-  <property name="dynlink.native" value="false"/>
-  <property name="native" location="native"/>
-  <property name="src" location="src"/>
-  <property name="platform.src" location="contrib/platform/src"/>
-  <property name="contrib" location="contrib"/>
-  <property name="dist" location="dist"/>
-  <property name="test.src" location="test"/>
-  <property name="doc" location="doc"/>
-  <property name="javadoc" location="${doc}/javadoc"/>
-  <property name="stylesheet" location="${javadoc}/doc/css/javadoc.css"/>
-  <property name="vendor" value="JNA Development Team"/>
-  <property name="copyright"
-            value="Copyright &amp;copy; 2007-2010 Timothy Wall. All Rights Reserved."/>
-  <buildnumber/>
-  <!-- JNA library release version -->            
-  <property name="jna.major" value="3"/>
-  <property name="jna.minor" value="3"/>
-  <property name="jna.revision" value="0"/>
-  <property name="jna.build" value="${build.number}"/>
-  <property name="jna.version" value="${jna.major}.${jna.minor}.${jna.revision}"/>
-  <!-- jnidispatch library release version -->
-  <property name="jni.major" value="3"/>
-  <property name="jni.minor" value="3"/>
-  <property name="jni.revision" value="0"/>
-  <property name="jni.build" value="${build.number}"/>
-  <property name="jni.version" value="${jni.major}.${jni.minor}.${jni.revision}"/>
-  <property name="jni.md5" value="4c69bcf40b30785215211b5a5dad211e"/>
-  <property name="spec.title" value="Java Native Access (JNA)"/>
-  <property name="spec.vendor" value="${vendor}"/>
-  <property name="spec.version" value="${jna.major}"/>
-  <property name="impl.title" value="com.sun.jna"/>
-  <property name="impl.vendor" value="${spec.vendor}"/>
-  <property name="impl.version" value="${jna.version} (b${jna.build})"/>
-
-  <property name="compatibility" value="1.4"/>
-  <property name="test.compatibility" value="1.5"/>
-
-  <!-- Miscellaneous -->
-  <property name="build.compiler.emacs" value="true"/>
-
-  <target name="default" depends="test" description="Build and Test."/>
-
-  <!-- uncomment for netbeans profiling -->
-  <!--<import file="nbproject/profiler-build-impl.xml"/>-->
-  <target name="init" depends="-setup"/>
-  <target name="compile-test-single" depends="compile-tests"/>
-  <target name="compile-single" depends="compile"/>
-
-  <target name="-dynamic-properties">
-    <echo>Java version ${java.version}, compatibility: ${compatibility}</echo>
-    <echo>JNA version ${jna.version}, native ${jni.version}</echo>
-    <echo>${java.vm.name} (${java.vm.vendor}, ${java.vm.version})</echo>
-    <echo>java.home=${java.home}</echo>
-    <echo>java.library.path=${java.library.path}</echo>
-
-    <replaceregexp match="(&lt;version&gt;).*(&lt;/version&gt;)"
-                   replace="\1${jna.version}\2" 
-                   file="pom.xml"/>
-    <replaceregexp match='VERSION = ".*";'
-                   replace='VERSION = "${jna.version}";'
-                   file="src/com/sun/jna/Native.java"/>
-
-    <condition property="jar.omitted" value="**/*jnidispatch*" else="jnilib-included">
-      <isset property="omit-jnilib"/>
-    </condition>
-    <condition property="vm.arch" value="-d64" else="">
-      <or>
-        <equals arg1="${sun.arch.data.model}" arg2="64" trim="true"/>
-        <equals arg1="${com.ibm.vm.bitmode}" arg2="64" trim="true"/>
-        <os arch="x86_64"/>
-        <os arch="ppc64"/>
-        <os arch="sparcv9"/>
-        <os arch="amd64"/>
-      </or>
-    </condition>
-    <condition property="ld.preload" value="LD_PRELOAD_64" else="LD_PRELOAD">
-      <and>
-        <os name="SunOS"/>
-        <equals arg1="${vm.arch}" arg2="-d64"/>
-      </and>
-    </condition>
-    <property name="build" value="build${vm.arch}"/>
-    <property name="classes" location="${build}/classes"/>
-    <property name="eclipse.classes" location="build.eclipse/classes"/>
-    <property name="test.classes" location="${build}/test-classes"/>
-    <property name="reports" value="${build}/reports"/>
-
-    <!-- Add other supported platforms here -->
-    <condition property="jre.arch" value="i386">
-      <equals arg1="x86" arg2="${os.arch}"/>
-    </condition>
-    <condition property="jre.arch" value="amd64">
-      <equals arg1="x86_64" arg2="${os.arch}"/>
-    </condition>
-    <property name="jre.arch" value="${os.arch}"/>
-    <condition property="os.prefix" value="linux-${jre.arch}">
-      <os name="Linux"/>
-    </condition>
-    <condition property="os.prefix" value="win32-${os.arch}">
-      <os family="windows"/>
-    </condition>
-    <!-- Darwin builds are universal, no arch required -->
-    <condition property="os.prefix" value="darwin">
-      <os family="mac"/>
-    </condition>
-    <condition property="os.prefix" value="sunos-${os.arch}">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="os.prefix" value="freebsd-${os.arch}">
-      <os name="FreeBSD"/>
-    </condition>
-    <condition property="os.prefix" value="openbsd-${os.arch}">
-      <os name="OpenBSD"/>
-    </condition>
-    <fail unless="os.prefix" message="OS/arch not supported (${os.name}/${os.arch}), edit build.xml and native/Makefile to add it."/>
-    <condition property="jdk.home" value="${java.home}">
-      <available file="${java.home}/include"/>
-    </condition>
-    <condition property="jdk.home" value="${java.home}/..">
-      <available file="${java.home}/../include"/>
-    </condition>
-    <condition property="jdk.home" value="/System/Library/Frameworks/JavaVM.framework/Home">
-      <available file="/System/Library/Frameworks/JavaVM.framework/Headers"/>
-    </condition>
-    <fail unless="jdk.home" message="Can't find JNI headers (java.home=${java.home})"/>
-    <condition property="libjsig"
-               value="${java.home}/lib/${jre.arch}/libjsig.so" else="">
-      <available file="${java.home}/lib/${jre.arch}/libjsig.so"/>
-    </condition>
-    <property name="native.jar" value="${os.prefix}.jar"/>
-    <property name="build.native" location="${build}/native"/>
-    <property name="md5.file" location="${build.native}/sig"/>
-
-    <mkdir dir="${build}"/>
-    <mkdir dir="${build.native}"/>
-    <mkdir dir="${classes}"/>
-    <mkdir dir="${test.classes}"/>
-    <mkdir dir="${reports}"/>
-    <mkdir dir="${doc}"/>
-
-  </target>
-
-  <target name="-setup" depends="-dynamic-properties">
-  	<path id="compile-test.path">
-      <pathelement path="${test.src}"/>
-      <path id="test.libs">
-        <fileset dir="lib">
-          <include name="junit.jar"/>   
-        </fileset>
-        <pathelement path="${classes}"/>
-      </path>
-      <path id="compile.path">
-        <path id="src.path">
-          <pathelement location="${src}"/>
-        </path>
-      </path>
-    </path>                           
-
-    <path id="test.runpath">
-      <pathelement path="${build}/${jar}"/>
-      <pathelement path="${test.classes}"/>
-      <pathelement path="lib/clover.jar"/>
-      <path refid="test.libs"/>
-    </path>
-  </target>
-
-  <target name="compile" depends="-setup"
-          description="Compile all Java source">
-    <javac classpathref="compile.path"
-           source="${compatibility}"
-           target="${compatibility}"
-           destdir="${classes}" 
-           includeantruntime="false"
-           deprecation="on" debug="${debug}">
-      <src path="${src}"/>
-    </javac>
-  </target>
-
-  <target name=":jar">
-    <uptodate property="-jar" targetfile="${build}/${jar}">
-      <srcfiles dir="${classes}">
-        <patternset id="jar-compiled">
-          <include name="com/sun/jna/*"/>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </srcfiles>
-    </uptodate>
-  </target>
-  <target name="jar" depends="-setup,native,:jar" unless="-jar"
-          description="Build primary jar">
-    <jar jarfile="${build}/${jar}">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Manifest-Version" value="1.0"/>
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-          <!-- OSGi Bundle attributes -->
-          <attribute name="Bundle-ManifestVersion" value="2"/>
-          <attribute name="Bundle-Name" value="jna"/>
-          <attribute name="Bundle-Description" value="JNA Library"/>
-          <attribute name="Bundle-SymbolicName" value="com.sun.jna"/>
-          <attribute name="Bundle-Version" value="${spec.version}"/>
-          <attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.4"/>
-          <attribute name="Bundle-Vendor" value="${vendor}"/>
-          <attribute name="Bundle-ActivationPolicy" value="lazy"/>
-          <attribute name="Export-Package" value="com.sun.jna*"/>
-        </section>
-      </manifest>
-      <fileset dir="${classes}" excludes="${jar.omitted}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="contrib-jars" depends="jar" description="Build contrib jars">
-    <subant target="jar">
-      <property name="file.reference.jna.build" location="${build}"/>
-      <property name="file.reference.jna.jar" location="${build}/${jar}"/>
-      <property name="libs.junit.classpath" location="lib/junit.jar"/>
-      <!-- platform.jar needs to be built first -->
-      <fileset dir="${contrib}" includes="platform/build.xml" />
-      <fileset dir="${contrib}" includes="*/build.xml" excludes="platform/build.xml"/>
-    </subant>
-  </target>
-
-  <target name="javah" depends="compile">
-    <javah classpath="${classes}" destdir="${build.native}" force="yes">
-      <class name="com.sun.jna.Function"/>
-      <class name="com.sun.jna.Pointer"/>
-      <class name="com.sun.jna.Memory"/>
-      <class name="com.sun.jna.Native"/>
-      <class name="com.sun.jna.NativeLibrary"/>
-      <class name="com.sun.jna.CallbackReference"/>
-    </javah>
-    <condition property="grep" value="/usr/sfw/bin/ggrep">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="grep" value="ggrep">
-      <os name="OpenBSD"/>
-    </condition>
-    <property name="grep" value="grep"/>
-    <apply dir="${build.native}" executable="${grep}" parallel="true"
-           failonerror="true" relative="true" output="${md5.file}">
-      <arg value="-A"/>
-      <arg value="1"/>
-      <arg value="JNIEXPORT"/>
-      <fileset dir="${build.native}" includes="*.h"/>
-    </apply>
-    <fixcrlf srcdir="${build.native}" includes="sig" eol="unix"/>
-    <checksum property="md5" file="${md5.file}" />
-    <condition property="jni.valid" value="true">
-      <or>
-        <equals arg1="${jni.md5}" arg2="${md5}" trim="true"/>
-        <equals arg1="${jni.md5}" arg2=""/>
-      </or>
-    </condition>
-  </target>
-
-  <!-- Invalidate native libraries when native API changes -->
-  <target name="-native-api-check" depends="javah" unless="jni.valid">
-    <echo>Invalidating native code, new checksum is ${md5}</echo>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/darwin.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/win32-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/linux-ia64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/freebsd-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/openbsd-i386.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-x86.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-amd64.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparc.jar" overwrite="true"/>
-    <copy file="${dist}/out-of-date.jar" tofile="${dist}/sunos-sparcv9.jar" overwrite="true"/>
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build.native}" includes="*.o,*jnidispatch*"/>
-    </delete>
-    <fail>API for native code has changed.  Re-run this build after updating jni.version and jni.md5 in build.xml</fail>
-  </target>
-
-  <target name=":rsrc">
-    <condition property="-rsrc">
-      <not><os family="windows"/></not>
-    </condition>
-  </target>
-  <target name="rsrc" depends="-setup,:rsrc" unless="-rsrc"
-          description="Generate w32 DLL version resource information">
-    <property name="rsrc" location="${build.native}/jnidispatch.rc"/>
-    <copy todir="${build.native}" file="${native}/jnidispatch.rc"/>
-    <replaceregexp match="FILEVERSION.*"
-                   replace="FILEVERSION ${jni.major},${jni.minor},${jni.revision},${jni.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="PRODUCTVERSION.*"
-                   replace="PRODUCTVERSION ${jna.major},${jna.minor},${jna.revision},${jna.build}"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="FileVersion.*"
-                   replace="FileVersion&quot;,&quot;${jni.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="Full Version.*"
-                   replace="Full Version&quot;,&quot;${jni.version} b${jni.build}&quot;"
-                   file="${rsrc}" byline="true"/>
-    <replaceregexp match="ProductVersion.*"
-                   replace="ProductVersion&quot;,&quot;${spec.version}&quot;"
-                   file="${rsrc}" byline="true"/>
-  </target>
-
-  <target name="native" depends="-setup,javah,-native-api-check,rsrc"
-          description="Build native libraries.  Use 'ant -DCC=xxx' to build using a compiler other than gcc">
-    <property name="comment" value="# auto-generated by ant"/>
-    <replaceregexp match="^JNA_JNI_VERSION=.*"
-                   replace="JNA_JNI_VERSION=${jni.version} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <replaceregexp match="^CHECKSUM=.*"
-                   replace="CHECKSUM=${jni.md5} ${comment}"
-                   file="native/Makefile" byline="true"/>
-    <!-- ensure ARCH is set properly for 64-bit capable platforms -->
-    <!-- use ANT_OPTS=-d64 to build 64-bit if not the platform default -->
-    <property name="ARCH" value="${os.arch}"/>
-    <condition property="make.CC" value="CC=${CC}" else="IGNORE=">
-      <isset property="CC"/>
-    </condition>
-    <condition property="make.ARCH" value="ARCH=${ARCH}" else="IGNORE=">
-      <isset property="ARCH"/>
-    </condition>
-    <condition property="make.SDKROOT" value="SDKROOT=${SDKROOT}">
-      <isset property="SDKROOT"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.6.sdk">
-      <available file="/Developer/SDKs/MacOSX10.6.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.5.sdk">
-      <available file="/Developer/SDKs/MacOSX10.5.sdk"/>
-    </condition>
-    <condition property="make.SDKROOT"
-	       value="SDKROOT=/Developer/SDKs/MacOSX10.4u.sdk" else="IGNORE=">
-      <available file="/Developer/SDKs/MacOSX10.4u.sdk"/>
-    </condition>
-    <!-- Windows' drive letters and spaces in absolute paths wreak havoc on 
-         make --> 
-    <condition property="make.BUILD" value="BUILD=../${build}/native" else="BUILD=${build.native}">
-      <os family="windows"/>
-    </condition>
-    <condition property="make.PATH" value="PATH=/usr/sfw/bin:/usr/bin:/usr/ccs/bin" else="IGNORE=">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="/usr/sfw/bin/gmake">
-      <os name="SunOS"/>
-    </condition>
-    <condition property="make" value="gmake">
-      <or>
-        <os name="FreeBSD"/>
-        <os name="OpenBSD"/>
-      </or>
-    </condition>
-
-    <!-- Default make program -->
-    <property name="make" value="make"/>
-
-    <exec executable="${make}" dir="${native}" failonerror="true">
-      <arg value="JAVA_HOME=${jdk.home}"/>
-      <arg value="JAVAH=${build.native}"/>
-      <arg value="DEBUG=${debug.native}"/>
-      <arg value="CFLAGS_EXTRA=${cflags_extra.native}"/>
-      <arg value="DYNAMIC_LIBFFI=${dynlink.native}"/>
-      <arg value="${make.CC}"/>
-      <arg value="${make.BUILD}"/>
-      <arg value="${make.SDKROOT}"/>
-      <arg value="${make.ARCH}"/>
-      <arg value="${make.PATH}"/>
-      <arg value="JNA_JNI_VERSION=${jni.version}"/>
-      <arg value="CHECKSUM=${jni.md5}"/>
-    </exec>
-    <mkdir dir="${classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${classes}/com/sun/jna/${os.prefix}">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <mkdir dir="${eclipse.classes}/com/sun/jna/${os.prefix}"/>
-    <copy todir="${eclipse.classes}/com/sun/jna/${os.prefix}"
-          failonerror="false">
-      <fileset dir="${build.native}"
-               includes="jnidispatch.dll,libjnidispatch.*"/>
-    </copy>
-    <!-- For web start, native libraries may be provided in the root of -->
-    <!-- an included jar file -->
-    <jar jarfile="${build}/${native.jar}">
-      <fileset dir="${build.native}" includes="jnidispatch.dll,libjnidispatch.*"/>
-      <manifest>
-        <attribute name="Implementation-Version" value="${jni.version} b${jni.build}"/>
-        <attribute name="Specification-Version" value="${jni.version}"/>
-      </manifest>
-    </jar>
-  </target>
-
-  <target name="compile-tests" depends="compile,native,jar" 
-  	description="Compile all test code">
-    <javac classpathref="compile-test.path"
-           source="${test.compatibility}"
-           target="${test.compatibility}"
-           destdir="${test.classes}" 
-           includeantruntime="false"
-           deprecation="on" debug="${debug}">
-      <src path="${test.src}"/>
-    </javac>
-    <jar jarfile="${build}/${testjar}">
-      <fileset dir="${test.classes}">
-        <patternset refid="jar-compiled"/>
-      </fileset>
-    </jar>
-    <mkdir dir="${build}/jws"/>
-    <copy todir="${build}/jws" file="${build}/${jar}"/>
-    <copy todir="${build}/jws" file="${build}/${testjar}"/>
-    <copy todir="${build}/jws" file="lib/junit.jar"/>
-    <copy todir="${build}/jws" file="lib/clover.jar"/>
-    <jar jarfile="${build}/jws/jnidispatch.jar">
-      <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-    </jar>
-    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true"> 
-      <fileset dir="${build}/jws" includes="jna.jar,jna-test.jar,junit.jar,jnidispatch.jar,clover.jar"/>
-    </signjar>
-  </target>
-	
-  <!-- When running tests from an IDE, be sure to set jna.library.path -->
-  <!-- to where the test library (testlib) is found.                   -->
-  <target name="test" depends="jar,contrib-jars,compile-tests"
-          description="Run all unit tests">
-    <property name="test.fork" value="yes"/>
-    <property name="reports.junit" location="${reports}/junit"/>
-    <property name="results.junit" location="${build}/junit-results"/>
-    <mkdir dir="${results.junit}"/>
-    <echo>Saving test results in ${results.junit}</echo>
-    <property name="tests.stdcall" value="**/win32/*StdCallTest.java"/>
-    <condition property="tests.platform" value="**/win32/**/*Test.java">
-      <os family="windows"/>
-    </condition>
-    <condition property="tests.exclude" value="**/win32/*StdCallTest.java">
-      <and><os family="windows"/><not><os arch="x86"/></not></and>
-    </condition>
-    <condition property="tests.platform" value="**/unix/*Test.java">
-      <and>
-        <os family="unix"/>
-        <not><os family="mac"/></not>
-      </and>
-    </condition>
-    <condition property="vmopt.arch" value="-d64" else="-Dignore">
-      <and>
-        <!-- Sun 64-bit VM for windows doesn't support the -d64 switch -->
-        <not><os family="windows"/></not>
-        <equals arg1="${vm.arch}" arg2="-d64" trim="true"/>
-      </and>
-    </condition>
-    <property name="tests.platform" value=""/>
-    <property name="tests.exclude" value=""/>
-    <junit printsummary="yes" fork="${test.fork}" failureproperty="testfailure">
-      <!-- avoid VM conflicts with JNA protected mode -->
-      <env key="${ld.preload}" file="${libjsig}"/>
-      <jvmarg value="-Djna.library.path=${build.native}"/>
-      <!-- Avoid VM crashes, if possible -->
-      <jvmarg value="-Djna.protected=true"/>
-      <jvmarg value="-Djna.builddir=${build}"/>
-      <jvmarg value="${vmopt.arch}"/>
-      <classpath><path refid="test.runpath"/></classpath>
-      <formatter type="xml"/>
-      <batchtest todir="${results.junit}">
-        <fileset dir="${test.src}">
-          <include name="com/sun/jna/*Test.java"/>
-          <include name="${tests.platform}"/>
-          <exclude name="${tests.exclude}"/>
-        </fileset>
-      </batchtest>
-    </junit>
-    <junitreport todir="${results.junit}">
-      <fileset dir="${results.junit}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report todir="${reports.junit}"/>
-    </junitreport>
-    <echo>View test report in file://${reports.junit}/index.html</echo>
-    <subant target="test">
-      <fileset dir="${contrib}" includes="platform/build.xml"/>
-    </subant>
-    <fail if="testfailure" unless="clover">One or more tests failed</fail>
-  </target>
-
-  <target name="with.clover" description="Enable code coverage for tests">
-    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
-    <property name="clover" value="true"/>
-    <property name="build" value="build.clover"/>
-    <clover-setup/>
-  </target>
-
-  <target name="clover" depends="with.clover,test"
-          description="Generate test code coverage reports">
-    <property name="reports.clover" value="${reports}/clover"/>
-    <mkdir dir="${reports.clover}"/>
-    <clover-report>
-      <current outfile="${reports.clover}" title="clover">
-        <fileset dir="." includes="**/*.java" />
-        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
-        <format type="html"/>
-      </current>
-    </clover-report>
-    <echo>Reports generated in ${reports.clover}</echo>
-  </target>
-
-  <target name="javadoc" depends="-setup">
-    <path id="javadoc.src.path">
-      <path refid="src.path"/>
-      <pathelement location="${platform.src}"/>
-    </path>
-    <path id="javadoc.compile.path">
-      <path refid="compile.path"/>
-      <pathelement location="${classes}"/>
-    </path>
-    <property name="header"
-              value="&lt;b&gt;JNA API&lt;/&gt;&lt;font size=&quot;-1&quot;&gt; ${jna.version}&lt;/font&gt;"/>
-    <property name="footer"
-              value="&lt;center&gt;&lt;i&gt;${copyright}&lt;/i&gt;&lt;/center&gt;"/>
-
-    <mkdir dir="${javadoc}"/>
-    <javadoc package="true"
-             windowtitle="JNA API"
-             sourcepathref="javadoc.src.path"
-             classpathref="javadoc.compile.path"
-             maxmemory="256m"
-             packagenames="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.platform,com.sun.jna.platform.win32"
-             overview="${src}/com/sun/jna/overview.html"
-             destdir="${javadoc}">
-      <!-- stylesheetfile="${stylesheet}" -->
-      <doctitle>JNA API Documentation</doctitle>
-      <header>${header}</header>
-      <bottom>${footer}</bottom>
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
-      <packageset dir="${src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/**/*"/>
-        </patternset>
-      </packageset>
-      <packageset dir="${platform.src}" defaultexcludes="yes">
-        <patternset>
-          <include name="com/sun/jna/platform/**/*"/>
-        </patternset>
-      </packageset>
-
-      <group title="Java Native Access" packages="com.sun.jna,com.sun.jna.ptr,com.sun.jna.types,com.sun.jna.win32"/>
-      <group title="Platform Utilities" packages="com.sun.jna.platform,com.sun.jna.platform.dnd"/>
-      <group title="Platform Specific" packages="com.sun.jna.platform.*"/>
-    	
-      <arg value="-notimestamp"/>
-    </javadoc>
-  </target>
-
-  <target name="dist" depends="jar,contrib-jars,compile-tests,native,javadoc"
-          description="Build distribution files">
-    <jar jarfile="${dist}/jna.jar" duplicate="preserve">
-      <manifest>
-        <attribute name="Main-Class" value="com.sun.jna.Native"/>
-        <section name="com/sun/jna/">
-          <attribute name="Implementation-Title" value="${impl.title}"/>
-          <attribute name="Implementation-Vendor" value="${vendor}"/>
-          <attribute name="Implementation-Version" value="${impl.version}"/>
-          <attribute name="Specification-Title" value="${spec.title}"/>
-          <attribute name="Specification-Vendor" value="${spec.vendor}"/>
-          <attribute name="Specification-Version" value="${spec.version}"/>
-        </section>
-      </manifest>
-      <zipfileset src="${build}/${jar}"/>
-      <zipfileset src="${dist}/win32-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-x86"/>
-      <zipfileset src="${dist}/darwin.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/darwin"/>
-      <zipfileset src="${dist}/linux-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-i386"/>
-      <zipfileset src="${dist}/linux-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-amd64"/>
-      <zipfileset src="${dist}/linux-ia64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/linux-ia64"/>
-      <zipfileset src="${dist}/sunos-x86.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-x86"/>
-      <zipfileset src="${dist}/sunos-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-amd64"/>
-      <zipfileset src="${dist}/sunos-sparc.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparc"/>
-      <zipfileset src="${dist}/sunos-sparcv9.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/sunos-sparcv9"/>
-      <zipfileset src="${dist}/freebsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-i386"/>
-      <zipfileset src="${dist}/freebsd-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/freebsd-amd64"/>
-      <zipfileset src="${dist}/openbsd-i386.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/openbsd-i386"/>
-      <zipfileset src="${dist}/win32-amd64.jar" 
-                  includes="*jnidispatch*"
-                  prefix="com/sun/jna/win32-amd64"/>
-    </jar>
-    <copy todir="${dist}">
-      <fileset dir="${build}">
-        <include name="${native.jar}"/>
-      </fileset>
-  	  <fileset dir="${contrib}/platform/dist">
-  		<include name="platform.jar" />
-  	  </fileset>
-    </copy>
-    <copy todir="${dist}/jnacontrib" flatten="true">
-	  <fileset dir="${contrib}">
-		<include name="**/build/demo-*.jar" />
-	  </fileset>
-    </copy>
-    <zip zipfile="${dist}/doc.zip">
-      <zipfileset dir="${javadoc}" prefix="javadoc"/>
-    </zip>
-    <!-- JNA sources only, for use in Linux build from source/shared libffi -->
-    <zip zipfile="${dist}/src.zip">
-      <zipfileset dir="." includes="build.xml,pom.xml,LICENSE.txt"/>
-      <zipfileset dir="${src}" includes="**/*.java" prefix="src"/>
-      <zipfileset dir="${test.src}" includes="**/*.java" prefix="test"/>
-      <zipfileset dir="${native}" excludes="libffi,libffi/**/*,build,build/**/*" prefix="native"/>
-      <zipfileset dir="${contrib}/platform" includes="**/*.java" prefix="contrib/platform"/>
-    </zip>
-    <!-- Full sources required to build and test everything -->
-    <zip zipfile="${dist}/src-full.zip">
-      <zipfileset src="${dist}/src.zip"/>
-      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
-      <zipfileset dir="." includes=".classpath,.project"/>
-      <zipfileset dir="nbproject" includes="**/*" prefix="nbproject"/>
-      <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
-    </zip>
-    <!-- Sources package as required by maven -->
-    <zip zipfile="${dist}/src-mvn.zip">
-      <zipfileset dir="${src}" includes="**/*.java,**/*.html,**/*.png"/>
-      <zipfileset dir="${contrib}/platform" includes="**/*.java"/>
-    </zip>
-  </target>
-
-  <target name="clean" depends="-dynamic-properties">
-    <delete failOnError="false" includeEmptyDirs="true">
-      <fileset dir="${build}"/>
-    </delete>
-    <delete quiet="true" includeEmptyDirs="true">
-      <fileset dir=".clover"/>
-      <fileset dir="${javadoc}"/>
-      <fileset dir="." includes="*~,**/*~"/>
-    </delete>
-    <subant target="clean">
-      <fileset dir="${contrib}" includes="*/build.xml"/>
-    </subant>
-  </target>
-
-</project>
-
-

jnalib/contrib/README

@@ -1,4 +0,0 @@
-This directory contains code which has been contributed by JNA users.  If no
-tests are included, you should assume the code has only been checked for
-compile-time errors :)
-

jnalib/contrib/alphamaskdemo/.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
-	<classpathentry kind="src" path="/platform"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/alphamaskdemo/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>alphamaskdemo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/alphamaskdemo/build.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jnacontrib.alphamaskdemo" default="jar" basedir=".">
-    <description>Builds, tests, and runs the project jnacontrib.alphamaskdemo.</description>
-    <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-alphamask.jar"/>
-    <property name="file.reference.jna.build" location="../../build"/>
-    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.AlphaMaskDemo" />
-
-    <path id="classpath">
-        <fileset file="${file.reference.jna.jar}"/>
-        <fileset dir="../platform/dist" includes="platform.jar"/>
-    </path>
-
-    <!-- Run Demo. -->
-    <target name="run" depends="compile">
-        <java classname="${main-class}" fork="true">
-            <classpath>
-                <pathelement location="${classes}" />
-                <path refid="classpath"/>
-            </classpath>
-        </java>
-    </target>
-
-    <!-- Delete class and jar files. -->
-    <target name="clean">
-        <delete dir="${classes}"/>
-        <delete file="${jar}"/>
-        <delete dir="${build}"/>
-    </target>
-
-    <!-- Compile all classes. -->
-    <target name="compile">
-        <mkdir dir="${classes}"/>
-
-        <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
-               encoding="UTF-8" debug="on" includeantruntime="false">
-            <classpath>
-                <path refid="classpath"/>
-            </classpath>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
-        </javac>
-
-        <!-- Copy all non-java files to classes. -->
-        <copy todir="${classes}/com">
-            <fileset dir="${src}/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- platform -->
-            <fileset dir="../platform/build/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- jna -->
-            <fileset dir="${file.reference.jna.build}/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Create jar-file. -->
-    <target name="jar" depends="compile">
-        <jar jarfile="${jar}" basedir="${classes}">
-            <manifest>
-                <attribute name="Main-Class" value="${main-class}"/>
-            </manifest>
-        </jar>
-    </target>
-</project>

jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.java

@@ -1,530 +0,0 @@
-/* Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-
-package com.sun.jna.contrib.demo;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.image.BufferedImage;
-import java.awt.image.ImageObserver;
-import java.awt.image.Raster;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.ImageIcon;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.JWindow;
-import javax.swing.SwingUtilities;
-import javax.swing.TransferHandler;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.MouseInputAdapter;
-
-import com.sun.jna.Native;
-import com.sun.jna.NativeLong;
-import com.sun.jna.Pointer;
-import com.sun.jna.platform.WindowUtils;
-import com.sun.jna.platform.unix.X11;
-import com.sun.jna.platform.unix.X11.Display;
-import com.sun.jna.platform.unix.X11.GC;
-import com.sun.jna.platform.win32.GDI32;
-import com.sun.jna.platform.win32.User32;
-import com.sun.jna.platform.win32.WinGDI;
-import com.sun.jna.platform.win32.WinUser;
-import com.sun.jna.platform.win32.WinDef.HBITMAP;
-import com.sun.jna.platform.win32.WinDef.HDC;
-import com.sun.jna.platform.win32.WinDef.HWND;
-import com.sun.jna.platform.win32.WinGDI.BITMAPINFO;
-import com.sun.jna.platform.win32.WinNT.HANDLE;
-import com.sun.jna.platform.win32.WinUser.BLENDFUNCTION;
-import com.sun.jna.platform.win32.WinUser.POINT;
-import com.sun.jna.platform.win32.WinUser.SIZE;
-import com.sun.jna.ptr.PointerByReference;
-
-// TODO: put this into a reasonable API; right now this is pretty much
-// just hard-coded blitting of an image into a window
-// Thanks to Rui Lopes for the C# example on which this is based: 
-// rui@ruilopes.com 
-// http://www.codeproject.com/cs/media/perpxalpha_sharp.asp?df=100&forumid=3270&exp=0&select=773155
-public class AlphaMaskDemo implements Runnable {
-    
-    private static final DataFlavor URL_FLAVOR = 
-        new DataFlavor("application/x-java-url; class=java.net.URL", "URL");
-    private static final DataFlavor URI_LIST_FLAVOR = 
-        new DataFlavor("text/uri-list; class=java.lang.String", "URI list");
-    
-    private JFrame frame;
-    private JWindow alphaWindow;
-    private float alpha = 1f;
-    private Image image;
-    
-    private void update() {
-        update(false, true);
-    }
-
-    private void update(boolean a, boolean i) {
-        String os = System.getProperty("os.name");
-        if (os.startsWith("Windows"))
-            updateW32(a, i);
-        else if (os.startsWith("Linux")) 
-            updateX11(a, i);
-        else if (os.startsWith("Mac"))
-            updateMac(a, i);
-    }
-
-    private void updateMac(boolean a, boolean i) {
-        if (!alphaWindow.isDisplayable()) {
-            alphaWindow.pack();
-        }
-        if (a)
-            WindowUtils.setWindowAlpha(alphaWindow, alpha);
-        if (i) {
-            alphaWindow.setBackground(new Color(0,0,0,0));
-            alphaWindow.setContentPane(new JLabel(new ImageIcon(image)));
-            alphaWindow.setSize(alphaWindow.getPreferredSize());
-        }
-        if (!alphaWindow.isVisible()) {
-            Window parent = alphaWindow.getOwner();
-            Point where = parent.getLocationOnScreen();
-            where.translate(parent.getWidth(), 0);
-            alphaWindow.setLocation(where);
-            alphaWindow.setVisible(true);
-        }
-    }
-
-    private com.sun.jna.Memory buffer;
-    private int[] pixels;
-	private void updateX11(boolean a, boolean i) {
-        X11 x11 = X11.INSTANCE;
-        X11.Window win = X11.Window.None;
-        Display dpy = x11.XOpenDisplay(null);
-        try {
-            if (!alphaWindow.isDisplayable()) {
-                alphaWindow.pack();
-                if (System.getProperty("java.version").matches("^1\\.4\\..*"))
-                    alphaWindow.setVisible(true);
-                win = new X11.Window((int)Native.getWindowID(alphaWindow));
-                Window parent = alphaWindow.getOwner();
-                Point where = parent.getLocationOnScreen();
-                where.translate(parent.getWidth(), 0);
-                alphaWindow.removeAll();
-                alphaWindow.setLocation(where);
-                alphaWindow.setBackground(new Color(0,0,0,0));
-            }
-            else {
-                win = new X11.Window((int)Native.getWindowID(alphaWindow));
-            }
-            
-            if (i) {
-                int w = image.getWidth(null);
-                int h = image.getHeight(null);
-                alphaWindow.setSize(w, h);
-                if (buffer == null || buffer.getSize() != w*h*4) {
-                    buffer = new com.sun.jna.Memory(w*h*4);
-                    pixels = new int[w*h];
-                }
-
-                BufferedImage buf = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB_PRE);
-                Graphics g = buf.getGraphics();
-                g.drawImage(image, 0, 0, w, h, null);
-                
-                long start = System.currentTimeMillis();
-                long blitTime, putImageTime, write;
-                GC gc = x11.XCreateGC(dpy, win, new NativeLong(0), null);
-                long gcTime = System.currentTimeMillis();
-                try {
-                    Raster raster = buf.getData();
-                    int[] pixel = new int[4];
-                    for (int y=0;y < h;y++) {
-                        for (int x=0;x < w;x++) {
-                            raster.getPixel(x, y, pixel);
-                            int alpha = (pixel[3]&0xFF)<<24;
-                            int red = (pixel[2]&0xFF);
-                            int green = (pixel[1]&0xFF)<<8;
-                            int blue = (pixel[0]&0xFF)<<16;
-                            pixels[y*w+x] = alpha|red|green|blue;
-                        }
-                    }
-                    blitTime = System.currentTimeMillis();
-                    X11.XWindowAttributes xwa = new X11.XWindowAttributes();
-                    x11.XGetWindowAttributes(dpy, win, xwa);
-                    X11.XImage image = x11.XCreateImage(dpy, xwa.visual,
-                                                        32, X11.ZPixmap,
-                                                        0, buffer, w, h, 32, w*4);
-                    buffer.write(0, pixels, 0, pixels.length);
-                    write = System.currentTimeMillis();
-                    x11.XPutImage(dpy, win, gc, image, 0,0,0,0,w,h);
-                    x11.XFree(image.getPointer());
-                    putImageTime = System.currentTimeMillis();
-                }
-                finally {
-                    if (gc != null)
-                        x11.XFreeGC(dpy, gc);
-                }
-                long end = System.currentTimeMillis();
-                //System.out.println("gc: " + (gcTime-start) + "ms");
-                //System.out.println("blit: " + (blitTime-gcTime) + "ms");
-                //System.out.println("write: " + (write-blitTime) + "ms");
-                //System.out.println("put image: " + (putImageTime-write) + "ms");
-                //System.out.println("total: " + (end-start) + "ms");
-            }
-        }
-        finally {
-            if (dpy != null)
-                x11.XCloseDisplay(dpy);
-        }
-        if (a)
-            WindowUtils.setWindowAlpha(alphaWindow, alpha);
-        
-        if (!alphaWindow.isVisible()) {
-            alphaWindow.setVisible(true);
-            // hack for initial refresh (X11)
-            update(true, true);
-        }
-    }
-
-    private HWND getHwnd(Window w) {
-        HWND hwnd = new HWND();
-        hwnd.setPointer(Native.getWindowPointer(w));
-        return hwnd;
-    }
-    
-    private void updateW32(boolean a, boolean i) {
-        User32 user = User32.INSTANCE;
-        GDI32 gdi = GDI32.INSTANCE;
-        HWND hWnd = null;
-
-        if (!alphaWindow.isDisplayable()) {
-            alphaWindow.pack();
-            hWnd = getHwnd(alphaWindow);
-            int flags = user.GetWindowLong(hWnd, WinUser.GWL_EXSTYLE);
-            flags |= WinUser.WS_EX_LAYERED;
-            user.SetWindowLong(hWnd, WinUser.GWL_EXSTYLE, flags);
-            Window parent = alphaWindow.getOwner();
-            Point where = parent.getLocationOnScreen();
-            where.translate(parent.getWidth(), 0);
-            alphaWindow.setLocation(where);
-        }
-        else {
-            hWnd = getHwnd(alphaWindow);
-        }
-    
-        if (i) {
-            int w = image.getWidth(null);
-            int h = image.getHeight(null);
-            HDC screenDC = user.GetDC(null);
-            HDC memDC = gdi.CreateCompatibleDC(screenDC);
-            HBITMAP hBitmap = null;
-            HANDLE oldBitmap = null;
-            
-            try {
-                BufferedImage buf = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB_PRE);
-                Graphics g = buf.getGraphics();
-                g.drawImage(image, 0, 0, w, h, null);
-                
-                BITMAPINFO bmi = new BITMAPINFO();
-                bmi.bmiHeader.biWidth = w;
-                bmi.bmiHeader.biHeight = h;
-                bmi.bmiHeader.biPlanes = 1;
-                bmi.bmiHeader.biBitCount = 32;
-                bmi.bmiHeader.biCompression = WinGDI.BI_RGB;
-                bmi.bmiHeader.biSizeImage = w * h * 4;
-                
-                PointerByReference ppbits = new PointerByReference();
-                hBitmap = gdi.CreateDIBSection(memDC, bmi, WinGDI.DIB_RGB_COLORS,
-                                               ppbits, null, 0);
-                oldBitmap = gdi.SelectObject(memDC, hBitmap);
-                Pointer pbits = ppbits.getValue();
-                
-                Raster raster = buf.getData();
-                int[] pixel = new int[4];
-                int[] bits = new int[w*h];
-                for (int y=0;y < h;y++) {
-                    for (int x=0;x < w;x++) {
-                        raster.getPixel(x, h-y-1, pixel);
-                        int alpha = (pixel[3]&0xFF)<<24;
-                        int red = (pixel[2]&0xFF);
-                        int green = (pixel[1]&0xFF)<<8;
-                        int blue = (pixel[0]&0xFF)<<16; 
-                        bits[x + y * w] = alpha|red|green|blue;
-                    }
-                }
-                pbits.write(0, bits, 0, bits.length);
-                
-                SIZE size = new SIZE();
-                size.cx = w;
-                size.cy = h;
-                POINT loc = new POINT();
-                loc.x = alphaWindow.getX();
-                loc.y = alphaWindow.getY();
-                POINT srcLoc = new POINT();
-                BLENDFUNCTION blend = new BLENDFUNCTION();
-                blend.SourceConstantAlpha = (byte)(alpha * 255);
-                blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
-                user.UpdateLayeredWindow(hWnd, screenDC, loc, size, memDC, srcLoc, 
-                                         0, blend, WinUser.ULW_ALPHA);
-            }
-            finally {
-                user.ReleaseDC(null, screenDC);
-                if (hBitmap != null) {
-                    gdi.SelectObject(memDC, oldBitmap);
-                    gdi.DeleteObject(hBitmap);
-                }
-                gdi.DeleteDC(memDC);
-            }
-        }
-        else if (a) {
-            BLENDFUNCTION blend = new BLENDFUNCTION();
-            blend.SourceConstantAlpha = (byte)(alpha * 255);
-            blend.AlphaFormat = WinUser.AC_SRC_ALPHA;
-            user.UpdateLayeredWindow(hWnd, null, null, null, null, null, 
-                                     0, blend, WinUser.ULW_ALPHA);
-        }
-        
-        if (!alphaWindow.isVisible()) {
-            alphaWindow.setVisible(true);
-        }
-    }
-    
-    private ImageObserver observer = new ImageObserver() {
-        public boolean imageUpdate(final Image img, int infoflags, int x, int y, int width, int height) {
-            if ((infoflags & (ImageObserver.ALLBITS|ImageObserver.FRAMEBITS)) != 0) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        setImage(img);
-                    }
-                });
-                return false;
-            }
-            else if ((infoflags & (ImageObserver.ERROR|ImageObserver.ABORT)) != 0) {
-                System.out.println("Image load error: " + img);
-                return false;
-            }
-            return true;
-        }
-        
-    };
-    private void setImage(final Image image) {
-        int w = image.getWidth(observer);
-        int h = image.getHeight(observer);
-        if (w > 0 && h > 0) {
-            this.image = image;
-            frame.setIconImage(image);
-            update(false, true);
-        }
-    }
-    
-    private void setAlpha(float alpha) {
-        this.alpha = alpha = Math.min(1f, Math.max(0f, alpha));
-        update(true, false);
-    }
-    
-    public void run() {
-        // Must find a graphics configuration with a depth of 32 bits
-        GraphicsConfiguration gconfig = WindowUtils.getAlphaCompatibleGraphicsConfiguration();
-        frame = new JFrame("Alpha Mask Demo");
-        alphaWindow = new JWindow(frame, gconfig);
-        MouseInputAdapter handler = new MouseInputAdapter() {
-            private Point offset;
-            public void mousePressed(MouseEvent e) {
-                if (SwingUtilities.isLeftMouseButton(e))
-                    offset = e.getPoint();
-            }
-            public void mouseReleased(MouseEvent e) {
-                offset = null;
-                // hack (w32) calling this has the side effect of re-enabling
-                // hit testing; not sure why it gets disabled
-                if (System.getProperty("os.name").startsWith("Windows"))
-                    update(true, true);
-            }
-            public void mouseDragged(MouseEvent e) {
-                if (offset != null) {
-                    Window w = (Window)e.getSource();
-                    Point where = e.getPoint();
-                    where.translate(-offset.x, -offset.y);
-                    Point loc = w.getLocationOnScreen();
-                    loc.translate(where.x, where.y);
-                    w.setLocation(loc.x, loc.y);
-                }
-            }
-        };
-        alphaWindow.addMouseListener(handler);
-        alphaWindow.addMouseMotionListener(handler);
-        JPanel p = new JPanel(new BorderLayout(8, 8));
-        p.setBorder(new EmptyBorder(8, 8, 8, 8));
-        p.setTransferHandler(new TransferHandler() {
-    		private static final long serialVersionUID = 1L;
-            public boolean canImport(JComponent comp, DataFlavor[] transferFlavors) {
-                List<DataFlavor> list = Arrays.asList(transferFlavors);
-                if (list.contains(URL_FLAVOR)
-                    || list.contains(URI_LIST_FLAVOR)
-                    || list.contains(DataFlavor.imageFlavor)
-                    || list.contains(DataFlavor.javaFileListFlavor)) {
-                    return true;
-                }
-                if (DataFlavor.selectBestTextFlavor(transferFlavors) != null) {
-                    return true;
-                }
-                System.out.println("No acceptable flavor found in "
-                                   + Arrays.asList(transferFlavors));
-                return false;
-            }
-            public boolean importData(JComponent comp, Transferable t) {
-                try {
-                    if (t.isDataFlavorSupported(URL_FLAVOR)) {
-                        URL url = (URL)t.getTransferData(URL_FLAVOR);
-                        setImage(Toolkit.getDefaultToolkit().getImage(url));
-                        return true;
-                    }
-                    if (t.isDataFlavorSupported(URI_LIST_FLAVOR)) {
-                        String s = (String)t.getTransferData(URI_LIST_FLAVOR);
-                        String[] uris = s.split("[\r\n]");
-                        if (uris.length > 0) {
-                            URL url = new URL(uris[0]);
-                            setImage(Toolkit.getDefaultToolkit().getImage(url));
-                            return true;
-                        }
-                        return false;
-                    }
-                    if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) {
-                        Image image = (Image)t.getTransferData(DataFlavor.imageFlavor);
-                        setImage(image);
-                        return true;
-                    }
-                    if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)){
-                        List<File> files = (List<File>) t.getTransferData(DataFlavor.javaFileListFlavor);
-                        File f = files.get(0);
-                        URL url = new URL("file://" + f.toURI().toURL().getPath());
-                        Image image = Toolkit.getDefaultToolkit().getImage(url);
-                        setImage(image);
-                        return true;
-                    }
-                    DataFlavor flavor = DataFlavor.selectBestTextFlavor(t.getTransferDataFlavors());
-                    if (flavor != null) {
-                        Reader reader = flavor.getReaderForText(t);
-                        char[] buf = new char[512];
-                        StringBuffer b = new StringBuffer();
-                        int count;
-                        // excise excess NUL characters (bug in firefox, java
-                        // or my code, not sure which).  someone got the 
-                        // encoding wrong
-                        while ((count = reader.read(buf)) > 0) {
-                            for (int i=0;i < count;i++) {
-                                if (buf[i] != 0)
-                                    b.append(buf, i, 1);
-                            }
-                        }
-                        String html = b.toString();
-                        Pattern p = Pattern.compile("<img.*src=\"([^\\\"\">]+)\"",
-                                                    Pattern.CANON_EQ|Pattern.UNICODE_CASE);
-                        Matcher m = p.matcher(html);
-                        if (m.find()) {
-                            URL url = new URL(m.group(1));
-                            System.out.println("Load image from " + url);
-                            Image image = Toolkit.getDefaultToolkit().getImage(url);
-                            setImage(image);
-                            return true;
-                        }
-                        System.out.println("Can't parse text: " + html);
-                        return false;
-                    }
-                    System.out.println("No flavor available: " 
-                                       + Arrays.asList(t.getTransferDataFlavors()));
-                }
-                catch (UnsupportedFlavorException e) {
-                    e.printStackTrace();
-                }
-                catch (IOException e) {
-                    e.printStackTrace();
-                }
-                catch(Throwable e) {
-                    e.printStackTrace();
-                }
-                return false;
-            }
-        });
-        p.add(new JLabel("<html><center>Drop an image with an alpha channel onto this window<br>" 
-                         + "You may also adjust the overall transparency with the slider</center></html>"),
-                         BorderLayout.NORTH);
-        final JSlider slider = new JSlider(0, 255, 255);
-        slider.addChangeListener(new ChangeListener() {
-            public void stateChanged(ChangeEvent e) {
-                int value = slider.getValue();
-                setAlpha(value / 255f);
-            }
-        });
-        p.add(slider, BorderLayout.SOUTH);
-        
-        frame.getContentPane().add(p);
-        frame.pack();
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        centerOnScreen(frame);
-        frame.setVisible(true);
-        p.addMouseListener(new MouseAdapter() {
-                public void mousePressed(MouseEvent e) {
-                    update();
-                }
-            });
-
-        try {
-            URL url = getClass().getResource("tardis.png");
-            if (url != null) {
-                setImage(Toolkit.getDefaultToolkit().getImage(url));
-            }
-        }
-        catch(Exception e) { }
-    }
-    
-    /** Center the given {@link Window} on the default screen. */
-    private static void centerOnScreen(Window window) {
-        Point center = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint();
-        Rectangle max = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
-        int x = Math.max(center.x - Math.round(window.getWidth()/2f), max.x);
-        int y = Math.max(center.y - Math.round(window.getHeight()/2f), max.y);
-        window.setLocation(new Point(x, y));
-    }
-
-    public static void main(String[] args) {
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        }
-        catch (Exception e) {
-        }
-        SwingUtilities.invokeLater(new AlphaMaskDemo());
-    }
-}

jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo.jnlp

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generic JNLP/Web Start Configuration -->
-<jnlp spec="1.0" codebase="http://abbot.sf.net/demo" href="AlphaMaskDemo.jnlp">
-  <information>
-    <title>Alpha Mask Demo</title>
-    <vendor>Technomage</vendor>
-    <homepage href="http://rabbit-hole.blogspot.com"/>
-    <description>Demo of a per-pixel alpha masked window.</description>
-    <description kind="short">Alpha Mask</description>
-  </information>
-  <resources>
-    <j2se version="1.3+" href="http://java.sun.com/products/autodl/j2se"/>
-    <!-- Required for window transparency -->
-    <property name="sun.java2d.noddraw" value="true"/>
-    <jar href="examples.jar" main="true"/>
-    <jar href="jna.jar"/>
-  </resources>
-  <resources os="Windows" arch="x86">
-    <nativelib href="win32-x86.jar"/>
-  </resources>
-  <resources os="Linux" arch="i386">
-    <!-- Use 32-bit X11 libs on 64-bit systems (Ubuntu) -->
-    <property name="jna.library.path" value="/usr/X11R6/lib:/usr/lib32:/usr/lib"/>
-    <nativelib href="linux-i386.jar"/>
-  </resources>
-  <resources os="Mac">
-    <nativelib href="darwin.jar"/>
-  </resources>
-  <application-desc main-class="com.sun.jna.examples.AlphaMaskDemo"/>
-  <security>
-    <all-permissions/>
-  </security>
-</jnlp>

jnalib/contrib/alphamaskdemo/com/sun/jna/contrib/demo/AlphaMaskDemo2.java

@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 2007-2008 Timothy Wall, All Rights Reserved This library is
- * free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version. This library is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- * PURPOSE. See the GNU Lesser General Public License for more details.
- */
-package com.sun.jna.contrib.demo;
-
-import java.awt.BorderLayout;
-import java.awt.Cursor;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsEnvironment;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.image.ImageObserver;
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSlider;
-import javax.swing.JWindow;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.TransferHandler;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.MouseInputAdapter;
-
-import com.sun.jna.platform.WindowUtils;
-
-public class AlphaMaskDemo2 implements Runnable {
-    private static final DataFlavor URL_FLAVOR =
-        new DataFlavor("application/x-java-url; class=java.net.URL", "URL");
-    private static final DataFlavor URI_LIST_FLAVOR =
-        new DataFlavor("text/uri-list; class=java.lang.String", "URI list");
-    private JFrame frame;
-    private JWindow alphaWindow;
-    private JLabel icon;
-    private ImageObserver observer = new ImageObserver() {
-        public boolean imageUpdate(final Image img, int infoflags, int x,
-                                   int y, int width, int height) {
-            if ((infoflags & (ImageObserver.ALLBITS | ImageObserver.FRAMEBITS)) != 0) {
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        setImage(img);
-                    }
-                });
-                return false;
-            }
-            else if ((infoflags & (ImageObserver.ERROR | ImageObserver.ABORT)) != 0) {
-                System.err.println("Image load error: " + img);
-                return false;
-            }
-            return true;
-        }
-    };
-
-    private void setImage(final Image image) {
-        final int w = image.getWidth(observer);
-        final int h = image.getHeight(observer);
-        if (w > 0 && h > 0) {
-            frame.setIconImage(image);
-            icon.setIcon(new ImageIcon(image));
-            if (!alphaWindow.isVisible()) {
-                alphaWindow.pack();
-                alphaWindow.setVisible(true);
-            }
-            else {
-                alphaWindow.setSize(alphaWindow.getPreferredSize());
-            }
-            icon.getParent().invalidate();
-            icon.getParent().repaint();
-        }
-    }
-
-    public void run() {
-        // Must find a graphics configuration with a depth of 32 bits
-        GraphicsConfiguration gconfig = WindowUtils.getAlphaCompatibleGraphicsConfiguration();
-        frame = new JFrame("Alpha Mask Demo");
-        alphaWindow = new JWindow(frame, gconfig);
-        icon = new JLabel();
-        icon.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        alphaWindow.getContentPane().add(icon);
-        JButton quit = new JButton("Quit");
-        JLabel label = new JLabel("Drag this window by its image");
-        label.setHorizontalAlignment(SwingConstants.CENTER);
-        alphaWindow.getContentPane().add(label, BorderLayout.NORTH);
-        alphaWindow.getContentPane().add(quit, BorderLayout.SOUTH);
-        quit.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                System.exit(0);
-            }
-        });
-        MouseInputAdapter handler = new MouseInputAdapter() {
-            private Point offset;
-
-            public void mousePressed(MouseEvent e) {
-                if (SwingUtilities.isLeftMouseButton(e))
-                    offset = e.getPoint();
-            }
-
-            public void mouseReleased(MouseEvent e) {
-                offset = null;
-            }
-
-            public void mouseDragged(MouseEvent e) {
-                if (offset != null) {
-                    Window w = (Window)e.getSource();
-                    Point where = e.getPoint();
-                    where.translate(-offset.x, -offset.y);
-                    Point loc = w.getLocationOnScreen();
-                    loc.translate(where.x, where.y);
-                    w.setLocation(loc.x, loc.y);
-                }
-            }
-        };
-        alphaWindow.addMouseListener(handler);
-        alphaWindow.addMouseMotionListener(handler);
-        JPanel p = new JPanel(new BorderLayout(8, 8));
-        p.setBorder(new EmptyBorder(8, 8, 8, 8));
-        p.setTransferHandler(new TransferHandler() {
-			private static final long serialVersionUID = 1L;
-			public boolean canImport(JComponent comp,
-                                     DataFlavor[] transferFlavors) {
-                List<DataFlavor> list = Arrays.asList(transferFlavors);
-                if (list.contains(URL_FLAVOR) || list.contains(URI_LIST_FLAVOR)
-                    || list.contains(DataFlavor.imageFlavor)
-                    || list.contains(DataFlavor.javaFileListFlavor)) {
-                    return true;
-                }
-                if (DataFlavor.selectBestTextFlavor(transferFlavors) != null) {
-                    return true;
-                }
-                System.err.println("No acceptable flavor found in "
-                    + Arrays.asList(transferFlavors));
-                return false;
-            }
-
-            public boolean importData(JComponent comp, Transferable t) {
-                try {
-                    if (t.isDataFlavorSupported(URL_FLAVOR)) {
-                        URL url = (URL)t.getTransferData(URL_FLAVOR);
-                        setImage(Toolkit.getDefaultToolkit().getImage(url));
-                        return true;
-                    }
-                    if (t.isDataFlavorSupported(URI_LIST_FLAVOR)) {
-                        String s = (String)t.getTransferData(URI_LIST_FLAVOR);
-                        String[] uris = s.split("[\r\n]");
-                        if (uris.length > 0) {
-                            URL url = new URL(uris[0]);
-                            setImage(Toolkit.getDefaultToolkit().getImage(url));
-                            return true;
-                        }
-                        return false;
-                    }
-                    if (t.isDataFlavorSupported(DataFlavor.imageFlavor)) {
-                        Image image = (Image)t
-                                              .getTransferData(DataFlavor.imageFlavor);
-                        setImage(image);
-                        return true;
-                    }
-                    if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                        List<File> files = (List<File>) t.getTransferData(DataFlavor.javaFileListFlavor);
-                        File f = files.get(0);
-                        URL url = new URL("file://"
-                            + f.toURI().toURL().getPath());
-                        Image image = Toolkit.getDefaultToolkit().getImage(url);
-                        setImage(image);
-                        return true;
-                    }
-                    DataFlavor flavor = DataFlavor
-                                                  .selectBestTextFlavor(t
-                                                                         .getTransferDataFlavors());
-                    if (flavor != null) {
-                        Reader reader = flavor.getReaderForText(t);
-                        char[] buf = new char[512];
-                        StringBuffer b = new StringBuffer();
-                        int count;
-                        // excise excess NUL characters (bug in firefox,
-                        // java
-                        // or my code, not sure which). someone got the
-                        // encoding wrong
-                        while ((count = reader.read(buf)) > 0) {
-                            for (int i = 0; i < count; i++) {
-                                if (buf[i] != 0)
-                                    b.append(buf, i, 1);
-                            }
-                        }
-                        String html = b.toString();
-                        Pattern p = Pattern
-                                           .compile(
-                                                    "<img.*src=\"([^\\\"\">]+)\"",
-                                                    Pattern.CANON_EQ
-                                                        | Pattern.UNICODE_CASE);
-                        Matcher m = p.matcher(html);
-                        if (m.find()) {
-                            URL url = new URL(m.group(1));
-                            System.out.println("Load image from " + url);
-                            Image image = Toolkit.getDefaultToolkit()
-                                                 .getImage(url);
-                            setImage(image);
-                            return true;
-                        }
-                        System.err.println("Can't parse text: " + html);
-                        return false;
-                    }
-                    System.err.println("No flavor available: "
-                        + Arrays.asList(t.getTransferDataFlavors()));
-                }
-                catch (UnsupportedFlavorException e) {
-                    e.printStackTrace();
-                }
-                catch (IOException e) {
-                    e.printStackTrace();
-                }
-                catch (Throwable e) {
-                    e.printStackTrace();
-                }
-                return false;
-            }
-        });
-        p
-         .add(
-              new JLabel(
-                         "<html><center>Drop an image with an alpha channel onto this window<br>"
-                             + "You may also adjust the overall transparency with the slider</center></html>"),
-              BorderLayout.NORTH);
-        p.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-        final JSlider slider = new JSlider(0, 255, 255);
-        slider.addChangeListener(new ChangeListener() {
-            public void stateChanged(ChangeEvent e) {
-                int value = slider.getValue();
-                WindowUtils.setWindowAlpha(alphaWindow, value / 255f);
-            }
-        });
-        p.add(slider, BorderLayout.SOUTH);
-        frame.getContentPane().add(p);
-        frame.pack();
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        centerOnScreen(frame);
-        frame.setVisible(true);
-        WindowUtils.setWindowTransparent(alphaWindow, true);
-        alphaWindow.setLocation(frame.getX() + frame.getWidth() + 4,
-                                frame.getY());
-        try {
-            URL url = getClass().getResource("tardis.png");
-            if (url != null) {
-                setImage(Toolkit.getDefaultToolkit().getImage(url));
-            }
-        }
-        catch (Exception e) {
-        }
-    }
-
-    /** Center the given {@link Window} on the default screen. */
-    private static void centerOnScreen(Window window) {
-        Point center = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                                          .getCenterPoint();
-        Rectangle max = GraphicsEnvironment.getLocalGraphicsEnvironment()
-                                           .getMaximumWindowBounds();
-        int x = Math.max(center.x - Math.round(window.getWidth() / 2f), max.x);
-        int y = Math.max(center.y - Math.round(window.getHeight() / 2f), max.y);
-        window.setLocation(new Point(x, y));
-    }
-
-    public static void main(String[] args) {
-        try {
-            System.setProperty("sun.java2d.noddraw", "true");
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        }
-        catch (Exception e) {
-        }
-        SwingUtilities.invokeLater(new AlphaMaskDemo2());
-    }
-}

jnalib/contrib/balloonmanagerdemo/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/platform"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/balloonmanagerdemo/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>balloonmanagerdemo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/balloonmanagerdemo/build.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jnacontrib.balloonmanagerdemo" default="jar" basedir=".">
-    <description>Builds, tests, and runs the project jnacontrib.balloonmanagerdemo.</description>
-    <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-balloonmanager.jar"/>
-    <property name="file.reference.jna.build" location="../../build"/>
-    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.BalloonManagerDemo" />
-
-    <path id="classpath">
-        <fileset file="${file.reference.jna.jar}"/>
-        <fileset dir="../platform/dist" includes="platform.jar"/>
-    </path>
-
-    <!-- Run Demo. -->
-    <target name="run" depends="compile">
-        <java classname="${main-class}" fork="true">
-            <classpath>
-                <pathelement location="${classes}" />
-                <path refid="classpath"/>
-            </classpath>
-        </java>
-    </target>
-
-    <!-- Delete class and jar files. -->
-    <target name="clean">
-        <delete dir="${classes}"/>
-        <delete file="${jar}"/>
-        <delete dir="${build}"/>
-    </target>
-
-    <!-- Compile all classes. -->
-    <target name="compile">
-        <mkdir dir="${classes}"/>
-
-        <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
-               encoding="UTF-8" debug="on" includeantruntime="false">
-            <classpath>
-                <path refid="classpath"/>
-            </classpath>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
-        </javac>
-
-        <!-- Copy all non-java files to classes. -->
-        <copy todir="${classes}/com">
-            <fileset dir="${src}/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- platform -->
-            <fileset dir="../platform/build/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- jna -->
-            <fileset dir="${file.reference.jna.build}/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Create jar-file. -->
-    <target name="jar" depends="compile">
-        <jar jarfile="${jar}" basedir="${classes}">
-            <manifest>
-                <attribute name="Main-Class" value="${main-class}"/>
-            </manifest>
-        </jar>
-    </target>
-</project>

jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManager.java

@@ -1,263 +0,0 @@
-/*
- * Copyright (c) 2007 Timothy Wall, All Rights Reserved 
- * 
- * This library is free software; you can redistribute it and/or modify it 
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; either version 2.1 of the License, or (at
- * your option) any later version. <p/> This library is distributed in
- * the hope that it will be useful, but WITHOUT ANY WARRANTY; without
- * even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for
- * more details.
- */
-package com.sun.jna.contrib.demo;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Point;
-import java.awt.Shape;
-import java.awt.Window;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.ComponentListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Area;
-import java.awt.geom.GeneralPath;
-import java.awt.geom.RoundRectangle2D;
-
-import javax.swing.Box;
-import javax.swing.JWindow;
-import javax.swing.Popup;
-import javax.swing.SwingUtilities;
-
-import com.sun.jna.platform.WindowUtils;
-
-/**
- * Provides a popup balloon containing an arbitrary component.  This provides
- * a form of content-specific decoration less transient than a tooltip, and less
- * heavyweight and more adaptable to changing content than a dedicated window. 
- * Clients are responsible for invoking show and hide on the provided popup.
- */ 
-// TODO: anchor balloon point
-// TODO: connect drop shadow and parent masks
-// TODO: proper preferred size for html
-// TODO: lightweight popups
-public class BalloonManager {
-
-    // Avoid using drop shadow in some instances
-    private static boolean useDropShadow() {
-        return WindowUtils.isWindowAlphaSupported();
-    }
-    
-    private static class DropShadow extends JWindow {
-		private static final long serialVersionUID = 1L;
-        private static final float SHADOW_ALPHA = .25f;
-        private static final float YSCALE = .80f;
-        private static final double ANGLE = 2*Math.PI/24;
-        private static final Point OFFSET = new Point(8, 8);
-        private static final Color COLOR = new Color(0, 0, 0, 50);
-
-        private Shape parentMask;
-        private ComponentListener listener;
-        public DropShadow(final Window parent, Shape mask) {
-            super(parent);
-            setFocusableWindowState(false);
-            setName("###overrideRedirect###");
-
-            Point where = parent.isShowing()
-                ? parent.getLocationOnScreen() : parent.getLocation();
-            setLocation(where.x + OFFSET.x, where.y + OFFSET.y);
-            setBackground(COLOR);
-            getContentPane().setBackground(COLOR);
-
-            parentMask = mask;
-            parent.addComponentListener(listener = new ComponentAdapter() {
-                public void componentMoved(ComponentEvent e) {
-                    Point where = getOwner().isShowing()
-                        ? getOwner().getLocationOnScreen()
-                        : getOwner().getLocation();
-                    setLocation(where.x + OFFSET.x, where.y + OFFSET.y);
-                }
-                public void componentResized(ComponentEvent e) {
-                    Component c = e.getComponent();
-                    int extra = c.getWidth() + (int)Math.sin(ANGLE)*c.getHeight();
-                    setSize(c.getWidth() + extra, c.getHeight());
-                    WindowUtils.setWindowMask(DropShadow.this, getMask());
-                }
-                public void componentShown(ComponentEvent e) {
-                    if (!isVisible()) {
-                        pack();
-                        setVisible(true);
-                    }
-                }
-            });
-            addWindowListener(new WindowAdapter() {
-                public void windowClosed(WindowEvent e) {
-                    if (listener != null) {
-                        parent.removeComponentListener(listener);
-                        listener = null;
-                    }
-                }
-            });
-            WindowUtils.setWindowMask(DropShadow.this, getMask());
-            WindowUtils.setWindowAlpha(DropShadow.this, SHADOW_ALPHA);
-            if (parent.isVisible()) {
-                pack();
-                setVisible(true);
-            }
-        }
-        
-        public void paint(Graphics graphics) {
-            Graphics2D g = (Graphics2D)graphics.create();
-            // Workaround for OSX since we only get automatic clipping
-            // on the content pane and below
-            g.setClip(getMask());
-            g.setPaint(new GradientPaint(0, getHeight()/2, new Color(0,0,0,0), getWidth(), getHeight()/2, new Color(0,0,0,255)));
-            g.fillRect(0, 0, getWidth(), getHeight());
-            g.dispose();
-        }
-
-        public Dimension getPreferredSize() {
-            Dimension size = getOwner().getPreferredSize();
-            size.width += 100;
-            size.height += 100;
-            return size;
-        }
-        
-        private Shape getMask() {
-            Area area = new Area(parentMask);
-            Area clip = new Area(parentMask);
-
-            AffineTransform tx = new AffineTransform();
-            tx.translate(Math.sin(ANGLE)*getOwner().getHeight(), 0);
-            tx.shear(-Math.tan(ANGLE), 0);
-            tx.scale(1, YSCALE);
-            tx.translate(0, (1-YSCALE)*getOwner().getHeight());
-            area.transform(tx);
-            tx = new AffineTransform();
-            tx.translate(-OFFSET.x, -OFFSET.y);
-            clip.transform(tx);
-            area.subtract(clip);
-            return area;
-        }
-    }
-    
-    private static final class BubbleWindow extends JWindow {
-		private static final long serialVersionUID = 1L;
-        private static final int Y_OFFSET = 50;
-        private static final int ARC = 25;
-
-        private Point offset;
-        private Area mask;
-        private Dimension maskSize;
-        private ComponentListener moveTracker = new ComponentAdapter() {
-            public void componentMoved(ComponentEvent e) {
-                Point where = 
-                    e.getComponent().isShowing() 
-                    ? e.getComponent().getLocationOnScreen()
-                    : e.getComponent().getLocation();
-                setLocation(where.x - offset.x, where.y - offset.y);
-                // TODO preserve stacking order (linux)
-            }
-        };
-        
-        public BubbleWindow(Window owner, Component content) {
-            super(owner);
-            setFocusableWindowState(false);
-            setName("###overrideRedirect###");
-            getContentPane().setBackground(Color.white);
-            getContentPane().add(content, BorderLayout.CENTER);
-            getContentPane().add(Box.createVerticalStrut(Y_OFFSET), BorderLayout.SOUTH);
-            owner.addComponentListener(moveTracker);
-            setSize(getPreferredSize());
-            mask = new Area(getMask(getWidth(), getHeight()));
-            maskSize = getSize();
-            WindowUtils.setWindowMask(BubbleWindow.this, mask);
-            if (useDropShadow()) {
-                new DropShadow(this, mask);
-            }
-        }
-        
-        public void setBounds(int x, int y, int w, int h) {
-            super.setBounds(x, y, w, h);
-            Dimension size = new Dimension(w, h);
-            if (mask != null && !size.equals(maskSize)) {
-                mask.subtract(mask);
-                mask.add(new Area(getMask(w, h)));
-                maskSize = size;
-            }
-        }
-        
-        public void setAnchorLocation(int x, int y) {
-            super.setLocation(x, y);
-            Window owner = getOwner();
-            if (owner != null) {
-                Point ref = owner.isShowing()
-                    ? owner.getLocationOnScreen() : owner.getLocation();
-                offset = new Point(ref.x - x, ref.y - y);
-            }
-        }
-        
-        public void dispose() {
-            super.dispose();
-            getOwner().removeComponentListener(moveTracker);
-        }
-
-        private Shape getMask(int w, int h) {
-            Shape shape = new RoundRectangle2D.Float(0, 0, w, h-Y_OFFSET, 
-                                                     ARC, ARC);
-            Area area = new Area(shape);
-            GeneralPath path = new GeneralPath();
-            path.moveTo(w/3, h-1);
-            path.lineTo(w/2, h-1-Y_OFFSET);
-            path.lineTo(w*2/3, h-1-Y_OFFSET);
-            path.closePath();
-            area.add(new Area(path));
-            return area;
-        }
-        
-        public Dimension getPreferredSize() {
-            Dimension size = super.getPreferredSize();
-            size.height += Y_OFFSET;
-            return size;
-        }
-    }
-
-    /** Get a balloon pointing to the given location.  The coordinates are 
-     * relative to <code>owner</code>, which if null, indicates the coordinates
-     * are absolute.
-     */
-    public static Popup getBalloon(final Component owner, final Component content, int x, int y) {
-
-        // Simulate PopupFactory, ensuring we get a heavyweight "popup"
-        final Point origin = 
-            owner == null ? new Point(0, 0)
-                : (owner.isShowing()
-                   ? owner.getLocationOnScreen() : owner.getLocation());
-        final Window parent = owner != null 
-            ? SwingUtilities.getWindowAncestor(owner) : null;
-        origin.translate(x, y);
-        return new Popup() {
-            private BubbleWindow w;
-            public void show() {
-                w = new BubbleWindow(parent, content);
-                w.pack();
-                Point where = new Point(origin);
-                where.translate(-w.getWidth()/3, -w.getHeight());
-                w.setAnchorLocation(where.x, where.y);
-                w.setVisible(true);
-            }
-            public void hide() {
-                w.setVisible(false);
-                w.dispose();
-            }
-        };
-    }  
-}

jnalib/contrib/balloonmanagerdemo/com/sun/jna/contrib/demo/BalloonManagerDemo.java

@@ -1,136 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.contrib.demo;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.awt.geom.Rectangle2D;
-
-import javax.swing.Icon;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.Popup;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-
-import com.sun.jna.platform.WindowUtils;
-
-/** Demonstration of BalloonManager. */
-public class BalloonManagerDemo {
-    private static final int ICON_SIZE = 48;
-    private static class InfoIcon implements Icon {
-        public int getIconHeight() {
-            return ICON_SIZE;
-        }
-        public int getIconWidth() {
-            return ICON_SIZE;
-        }
-        public void paintIcon(Component c, Graphics graphics, int x, int y) {
-            Font font = UIManager.getFont("TextField.font");
-            Graphics2D g = (Graphics2D)graphics.create(x, y, getIconWidth(), getIconHeight());
-            g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
-            g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-            g.setFont(font.deriveFont(Font.BOLD, getIconWidth()*3/4));
-            g.setColor(Color.green.darker());
-            final int SW = Math.max(getIconWidth()/10, 4);
-            g.setStroke(new BasicStroke(SW));
-            g.drawArc(SW/2, SW/2, getIconWidth()-SW-1, getIconHeight()-SW-1, 0, 360);
-            Rectangle2D bounds = 
-                font.getStringBounds("i", g.getFontRenderContext());
-            g.drawString("i", Math.round((getIconWidth() - bounds.getWidth())/2 - getIconWidth()/12), 
-                         SW/2 + Math.round((getIconHeight()-bounds.getHeight())/2 - bounds.getY() + getIconHeight()/8));
-            g.dispose();
-        }
-    }
-    public static void main(String[] args) {
-        try {
-            System.setProperty("sun.java2d.noddraw", "true");
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        }
-        catch(Exception e) {
-        }
-        JFrame f = new JFrame("Balloon Test");
-        final String BALLOON_TEXT = "<html><center>"
-            + "This is some sample balloon text<br>"
-            + "which has been formatted with html.<br>"
-            + "Click to dismiss.</center></html>";
-        final JLabel content = new JLabel(BALLOON_TEXT);
-        content.setIconTextGap(10);
-        content.setBorder(new EmptyBorder(0, 8, 0, 8));
-        content.setSize(content.getPreferredSize());
-        content.setIcon(new InfoIcon());
-        JLabel label = new JLabel("Click anywhere for more information");
-        label.setHorizontalAlignment(SwingConstants.CENTER);
-        label.addMouseListener(new MouseAdapter() {
-            private MouseListener listener = new MouseAdapter() {
-                public void mousePressed(MouseEvent e) {
-                    hidePopup(e);
-                }
-            }; 
-            private Popup popup;
-            private void hidePopup(MouseEvent e) {
-                e.getComponent().removeMouseListener(listener);
-                if (popup != null)
-                    popup.hide();
-            }
-            public void mousePressed(MouseEvent e) {
-                hidePopup(e);
-                popup = BalloonManager.getBalloon(e.getComponent(), content, e.getX(), e.getY());
-                popup.show();
-                content.getParent().addMouseListener(listener);
-            }
-        });
-        f.getContentPane().add(label);
-        f.pack();
-        f.setSize(new Dimension(300, 300));
-        f.setLocation(100, 100);
-        try {
-            // Force a load of JNA
-            WindowUtils.setWindowMask(f, WindowUtils.MASK_NONE);
-            f.setVisible(true);
-            f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-        }
-        catch(UnsatisfiedLinkError e) {
-            e.printStackTrace();
-            String msg = e.getMessage() 
-                + "\nError loading the JNA library";
-            JTextArea area = new JTextArea(msg);
-            area.setOpaque(false);
-            area.setFont(UIManager.getFont("Label.font"));
-            area.setEditable(false);
-            area.setColumns(80);
-            area.setRows(8);
-            area.setWrapStyleWord(true);
-            area.setLineWrap(true);
-            JOptionPane.showMessageDialog(null, new JScrollPane(area), 
-                                          "Library Load Error: "
-                                          + System.getProperty("os.name")
-                                          + "/" + System.getProperty("os.arch"),
-                                          JOptionPane.ERROR_MESSAGE);
-            System.exit(1);
-        }
-    }    
-}

jnalib/contrib/balloontips/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/platform"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/balloontips/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>balloontips</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/balloontips/README

@@ -1,5 +0,0 @@
-Compile the two classes in this directory.  Requires Java 1.5+.
-
-javac -cp examples.jar *.java
-java -cp .:examples.jar FilteredTextField
-

jnalib/contrib/balloontips/build.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jnacontrib.balloontipsdemo" default="jar" basedir=".">
-    <description>Builds, tests, and runs the project jnacontrib.balloontipsdemo.</description>
-    <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-balloontips.jar"/>
-    <property name="file.reference.jna.build" location="../../build"/>
-    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"		value="com.sun.jna.contrib.demo.FilteredTextField" />
-
-    <path id="classpath">
-        <fileset file="${file.reference.jna.jar}"/>
-        <fileset dir="../platform/dist" includes="platform.jar"/>
-    </path>
-
-    <!-- Run Demo. -->
-    <target name="run" depends="compile">
-        <java classname="${main-class}" fork="true">
-            <classpath>
-                <pathelement location="${classes}" />
-                <path refid="classpath"/>
-            </classpath>
-        </java>
-    </target>
-
-    <!-- Delete class and jar files. -->
-    <target name="clean">
-        <delete dir="${classes}"/>
-        <delete file="${jar}"/>
-        <delete dir="${build}"/>
-    </target>
-
-    <!-- Compile all classes. -->
-    <target name="compile">
-        <mkdir dir="${classes}"/>
-
-        <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
-               encoding="UTF-8" debug="on" includeantruntime="false"> 
-            <classpath>
-                <path refid="classpath"/>
-            </classpath>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
-        </javac>
-
-        <!-- Copy all non-java files to classes. -->
-        <copy todir="${classes}/com">
-            <fileset dir="${src}/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- platform -->
-            <fileset dir="../platform/build/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- jna -->
-            <fileset dir="${file.reference.jna.build}/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Create jar-file. -->
-    <target name="jar" depends="compile">
-        <jar jarfile="${jar}" basedir="${classes}">
-            <manifest>
-                <attribute name="Main-Class" value="${main-class}"/>
-            </manifest>
-        </jar>
-    </target>
-</project>

jnalib/contrib/balloontips/com/sun/jna/contrib/demo/BalloonTipManager.java

@@ -1,519 +0,0 @@
-package com.sun.jna.contrib.demo;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Polygon;
-import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.Toolkit;
-import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.geom.Area;
-import java.awt.geom.RoundRectangle2D;
-
-import javax.swing.AbstractAction;
-import javax.swing.JLabel;
-import javax.swing.JWindow;
-import javax.swing.Popup;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-import com.sun.jna.platform.WindowUtils;
-
-/**
- * The BalloonTipManager class handles creation and disposal of balloon style 
- * tips that are typically used to display warning/error information based on
- * results from input validation.  The balloon tip location and direction are
- * computed based on the owner component location on the screen.  The balloon
- * tip is only displayed for a limited amount of time that is configurable.  
- * The balloon tip is also disposed when the owner component loses focus or the
- * mouse is pressed.
- */
-public class BalloonTipManager {
-  public static final Color DEFAULT_BORDER_COLOR = Color.BLACK;
-  public static final Color DEFAULT_BACKGROUND_COLOR = new Color(255, 255, 225);
-  public static final Color DEFAULT_TEXT_COLOR = Color.BLACK;
-  
-  private static final Integer VPOS_ABOVE = 0; // Positioned above component.
-  private static final Integer VPOS_BELOW = 1; // Positioned below component.
-  private static final Integer HPOS_LEFT = 0; // Arrow is on the left side.
-  private static final Integer HPOS_RIGHT = 1; // Arros is on the right side.
-
-  private static Integer vpos = null;
-  private static Integer hpos = null;
-  
-  private static Timer hidePopupTimer = null;
-  private static boolean isShowing = false;
-  
-  
-  /*
-   * The BalloonTip class defines the look of the BalloonTip object.
-   */
-  private static final class BalloonTip extends JWindow {
-		private static final long serialVersionUID = 1L;
-    private static final Integer HMARGIN = 10;
-    private static final Integer VMARGIN = 6;
-    private static final Integer VSPACER = 4;
-    private static final int ARC_D = 16;
-    
-    private Area mask = null;
-    private Dimension maskSize = null;
-    private String[] textList = null;
-    
-    private Color backgroundColor = null;
-    private Color borderColor = null;
-    private Color textColor = null;
-    
-    /**
-     * Create a BalloonTip object.
-     * @param owner the parent window for the components
-     * @param content the string for the balloon tip
-     * @param position the position for the balloon; either above or below the
-     * owner component
-     * @param origin the origin point for the balloon tip
-     * @param bordercolor the background color for the balloon tip
-     * @param backgroundcolor the border color for the balloon tip
-     * @param textcolor the text color for the balloon tip
-     */
-    public BalloonTip (
-        Window owner, String content, Point origin, Color bordercolor,
-        Color backgroundcolor, Color textcolor)
-    {
-      super(owner);
-      textList = content.split("\n");
-      borderColor = bordercolor;
-      backgroundColor = backgroundcolor;
-      textColor = textcolor;
-      setFocusableWindowState(false);
-      setName("###overrideRedirect###");
-      setSize(getPreferredSize());
-    }
-    
-    /*
-     * Sets the mask for the Balloon Tip.
-     */
-    private void setWindowMask () {
-      mask = new Area(getMask());
-      maskSize = getSize();
-      WindowUtils.setWindowMask(BalloonTip.this, mask);
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see java.awt.Container#paint(java.awt.Graphics)
-     */
-    public void paint (Graphics g) {
-      super.paint(g);
-      Dimension d = getMinimumWindowSize();
-      int width = d.width + 2 * HMARGIN;
-      int height = d.height + 2 * VMARGIN;
-      int x = 0;
-      int y = 0;
-      if (vpos == VPOS_BELOW) {
-        y += 15;
-      }
-      // Draw the filled rounded rectangle and clean up the missed pixels.
-      g.setColor(backgroundColor);
-      g.fillRoundRect(x, y, width, height, ARC_D, ARC_D);
-      g.drawLine(x + 6, y + height - 1, x + 6, y + height - 1);
-      g.drawLine(x + width - 1, y + 6, x + width - 1, y + 6);
-      g.drawLine(x + width - 1, y + height - 6, x + width - 1, y + height - 7);
-      g.drawLine(x + width - 2, y + height - 4, x + width - 4, y + height - 2);
-      g.drawLine(x + width - 6, y + height - 1, x + width - 7, y + height - 1);
-      g.clearRect(x + 2, y + 2, 1, 1);
-      // Draw the border of the rounded rectangle.
-      g.setColor(borderColor);
-      g.drawRoundRect(x, y, width, height, ARC_D, ARC_D);
-      // Draw the external triangle for the balloon.
-      if (vpos == VPOS_BELOW) {
-        if (hpos == HPOS_LEFT) {
-          g.setColor(backgroundColor);
-          int[] xPts = {16, 16, 31};
-          int[] yPts = {0, 16, 16};
-          g.fillPolygon(xPts, yPts, 3);
-          g.setColor(borderColor);
-          g.drawLine(16, 0, 16, 15);
-          g.drawLine(16, 0, 31, 15);
-          g.drawLine(16, 1, 30, 15);
-        }
-        else {
-          g.setColor(backgroundColor);
-          int[] xPts = {width - 16, width - 16, width - 31};
-          int[] yPts = {0, 16, 16};
-          g.fillPolygon(xPts, yPts, 3);
-          g.setColor(borderColor);
-          g.drawLine(width - 16, 0, width - 16, 15);
-          g.drawLine(width - 16, 0, width - 31, 15);
-          g.drawLine(width - 16, 1, width - 30, 15);
-        }
-      }
-      else {
-        if (hpos == HPOS_LEFT) {
-          g.setColor(backgroundColor);
-          int[] xPts = {16, 16, 31};
-          int[] yPts = {height, height + 16, height};
-          g.fillPolygon(xPts, yPts, 3);
-          g.setColor(borderColor);
-          g.drawLine(16, height, 16, height + 15);
-          g.drawLine(16, height + 15, 31, height);
-          g.drawLine(16, height + 14, 30, height);
-        }
-        else {
-          g.setColor(backgroundColor);
-          int[] xPts = {width - 16, width - 16, width - 31};
-          int[] yPts = {height, height + 16, height};
-          g.fillPolygon(xPts, yPts, 3);
-          g.setColor(borderColor);
-          g.drawLine(width - 16, height, width - 16, height + 15);
-          g.drawLine(width - 16, height + 15, width - 31, height);
-          g.drawLine(width - 16, height + 14, width - 30, height);
-        }
-      }
-      // Draw the inner component for the balloon.
-      g.setColor(textColor);
-      g.setFont(new Font("Tahoma", Font.PLAIN, 11));
-      int stringY = y + VMARGIN / 2;
-      for (int i = 0; i < textList.length; i++) {
-        stringY += new JLabel(textList[i]).getPreferredSize().height;
-        if (i > 0) {
-          stringY += VSPACER;
-        }
-        g.drawString(textList[i], HMARGIN, stringY);
-      }
-    }
-    
-    /*
-     * Returns the mask for the balloon tip window.
-     */
-    private Shape getMask () {
-      Dimension d = getMinimumWindowSize();
-      int width = d.width + 2 * HMARGIN;
-      int height = d.height + 2 * VMARGIN;
-      int x = 0;
-      int y = 0;
-      if (vpos == VPOS_BELOW) {
-        y += 15;
-      }
-      // Start by creating the area of the main rounded rectangle.
-      Area area = new Area(
-        new RoundRectangle2D.Float(x, y, width + 1, height + 1, ARC_D, ARC_D));
-      // Add in the remaining pixels that are not included by default due to
-      // the differences between Graphics drawing and Shape creation.
-      area.add(new Area(new Rectangle(0, y + 6, 1, 2)));
-      area.add(new Area(new Rectangle(0, y + height - 7, 1, 2)));
-      area.add(new Area(new Rectangle(1, y + 4, 1, 1)));
-      area.add(new Area(new Rectangle(1, y + height - 5, 1, 2)));
-      area.add(new Area(new Rectangle(4, y + 1, 1, 1)));
-      area.add(new Area(new Rectangle(6, y, 2, 1)));
-      area.add(new Area(new Rectangle(width - 7, y, 2, 1)));
-      // Subtract the extra pixels that are not included by default due to the
-      // differences between Graphics drawing and Shape creation.
-      area.subtract(new Area(new Rectangle(2, y + height - 2, 1, 1)));
-      area.subtract(new Area(new Rectangle(3, y + height - 1, 1, 1)));
-      area.subtract(new Area(new Rectangle(5, y + height, 1, 1)));
-      area.subtract(new Area(new Rectangle(width - 5, y + height, 2, 1)));
-      area.subtract(new Area(new Rectangle(width - 3, y + height - 1, 2, 1)));
-      area.subtract(new Area(new Rectangle(width - 2, y + 2, 1, 1)));
-      area.subtract(new Area(new Rectangle(width - 2, y + height - 2, 2, 1)));
-      area.subtract(new Area(new Rectangle(width - 1, y + 3, 1, 1)));
-      area.subtract(new Area(new Rectangle(width - 1, y + height - 3, 1, 1)));
-      area.subtract(new Area(new Rectangle(width, y + 5, 1, 1)));
-      area.subtract(new Area(new Rectangle(width, y + height - 5, 1, 2)));
-      // Add in the triangle piece for the balloon.
-      if (vpos == VPOS_BELOW) {
-        if (hpos == HPOS_LEFT) {
-          int[] xPts = {16, 16, 32};
-          int[] yPts = {-1, 16, 16};
-          area.add(new Area(new Polygon(xPts, yPts, 3)));
-        }
-        else {
-          int[] xPts = {width - 15, width - 15, width - 32};
-          int[] yPts = {-1, 16, 16};
-          area.add(new Area(new Polygon(xPts, yPts, 3)));
-        }
-      }
-      else {
-        if (hpos == HPOS_LEFT) {
-          int[] xPts = {16, 16, 31};
-          int[] yPts = {height, height + 16, height};
-          area.add(new Area(new Polygon(xPts, yPts, 3)));
-        }
-        else {
-          int[] xPts = {width - 15, width - 15, width - 32};
-          int[] yPts = {height, height + 16, height};
-          area.add(new Area(new Polygon(xPts, yPts, 3)));
-        }
-      }
-      return area;
-    }
-    
-    /*
-     * Returns the dimension of the window based on the preferred component
-     * sizes.
-     */
-    private Dimension getMinimumWindowSize () {
-      int maxWidth = 0;
-      int textHeight = 0;
-      JLabel tempLabel = null;
-      for (int i = 0; i < textList.length; i++) {
-        tempLabel = new JLabel(textList[i]);
-        maxWidth = Math.max(maxWidth, tempLabel.getPreferredSize().width);
-        textHeight += tempLabel.getPreferredSize().height;
-      }
-      int w = Math.max(maxWidth, 32);
-      int h = Math.max(textHeight + (textList.length - 1) * VSPACER, 8);
-      return new Dimension(w, h);
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see java.awt.Window#setBounds(int, int, int, int)
-     */
-    public void setBounds (int x, int y, int w, int h) {
-      super.setBounds(x, y, w, h);
-      Dimension size = new Dimension(w, h);
-      if (mask != null && !size.equals(maskSize)) {
-        mask.subtract(mask);
-        mask.add(new Area(getMask()));
-        maskSize = size;
-      }
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see java.awt.Container#getPreferredSize()
-     */
-    public Dimension getPreferredSize () {
-      Dimension d = getMinimumWindowSize();
-      int w = d.width + 2 * HMARGIN + 1;
-      int h = d.height + 2 * VMARGIN + 16;
-      return new Dimension(w, h);
-    }
-  }
-  
-
-  /**
-   * Returns the popup window of the balloon tip.
-   * @param owner the owner component for the balloon tip
-   * @param content the text string to display in the balloon tip
-   * @param x the x coordinate for the origin for the balloon tip in relation
-   * to the owner component
-   * @param y the y coordinate for the origin for the balloon tip in relation
-   * to the owner component
-   * @param position the position for the balloon; either above or below the
-     * owner component
-   * @param duration the duration in milliseconds to display balloon tip
-   * @return the popup window of the balloon tip
-   */
-  public static Popup getBalloonTip (final Component owner,
-      final String content, int x, int y, final int duration)
-  {
-    return getBalloonTip(owner, content, x, y, duration, DEFAULT_BORDER_COLOR,
-      DEFAULT_BACKGROUND_COLOR, DEFAULT_TEXT_COLOR);
-  }
-  
-  /**
-   * Returns whether the popup is showing or not.
-   * @return true if the popup is showing, else false
-   */
-  public static boolean isShowing () {
-    return isShowing;
-  }
-  
-  /**
-   * Restarts the popup timer.
-   */
-  public static void restartTimer () {
-    hidePopupTimer.restart();
-  }
-  
-  /**
-   * Returns the popup window of the balloon tip.
-   * @param owner the owner component for the balloon tip
-   * @param content the text string to display in the balloon tip
-   * @param x the x coordinate for the origin for the balloon tip in relation
-   * to the owner component
-   * @param y the y coordinate for the origin for the balloon tip in relation
-   * to the owner component
-   * @param position the position for the balloon; either above or below the
-     * owner component
-   * @param duration the duration in milliseconds to display balloon tip
-   * @param bordercolor the background color for the balloon tip
-   * @param backgroundcolor the border color for the balloon tip
-   * @param textcolor the text color for the balloon tip
-   * @return the popup window of the balloon tip
-   */
-  public static Popup getBalloonTip (final Component owner,
-      final String content, int x, int y, final Integer duration,
-      final Color bordercolor, final Color backgroundcolor,
-      final Color textcolor)
-  {
-    final Point origin =
-      owner == null ? new Point(0, 0) : owner.getLocationOnScreen();
-    final Window parent =
-      owner != null ? SwingUtilities.getWindowAncestor(owner) : null;
-    final String text =
-      content != null ? content : "";
-    final Integer timerDuration =
-      duration != null ? duration : 10000;
-    origin.translate(x, y);
-    vpos = VPOS_BELOW;
-    hpos = HPOS_LEFT;
-    return new Popup () {
-      private BalloonTip bt = null;
-      final ComponentEar componentEar = new ComponentEar();
-      final MouseEar mouseEar = new MouseEar();
-      final FocusEar focusEar = new FocusEar();
-      
-      /*
-       * (non-Javadoc)
-       * @see javax.swing.Popup#show()
-       */
-      public void show () {
-        hidePopupTimer = new Timer(timerDuration, new TimerAction());
-        bt = new BalloonTip(parent, text, origin, bordercolor,
-          backgroundcolor, textcolor);
-        bt.pack();
-        Point pt = new Point(origin);
-        pt.translate(10, owner.getHeight());
-        bt.setLocation(getAdjustedOrigin(pt));
-        bt.setWindowMask();
-        bt.setVisible(true);
-        owner.addFocusListener(focusEar);
-        owner.addMouseListener(mouseEar);
-        parent.addMouseListener(mouseEar);
-        parent.addComponentListener(componentEar);
-        hidePopupTimer.start();
-        isShowing = true;
-      }
-      
-      /*
-       * (non-Javadoc)
-       * @see javax.swing.Popup#hide()
-       */
-      public void hide () {
-        if (bt != null) {
-          isShowing = false;
-          hidePopupTimer.stop();
-          parent.removeComponentListener(componentEar);
-          parent.removeMouseListener(mouseEar);
-          owner.removeMouseListener(mouseEar);
-          owner.removeFocusListener(focusEar);
-          bt.setVisible(false);
-          bt.dispose();
-        }
-      }
-      
-      /*
-       * Adjust the location of the balloon popup so that is drawn completely
-       * on the screen and specify the orientation.
-       */
-      private Point getAdjustedOrigin (Point pt) {
-        Point ret = new Point(pt.x, pt.y);
-        GraphicsConfiguration gc = owner.getGraphicsConfiguration();
-        Rectangle sBounds = gc.getBounds();
-        Insets sInsets = Toolkit.getDefaultToolkit().getScreenInsets(gc);
-        sBounds.x += sInsets.left;
-        sBounds.y += sInsets.top;
-        sBounds.width -= (sInsets.left + sInsets.right);
-        sBounds.height -= (sInsets.top + sInsets.bottom);
-        
-        if (ret.x < sBounds.x) {
-          ret.x = sBounds.x;
-        }
-        else if (ret.x - sBounds.x + bt.getWidth() > sBounds.width) {
-          ret.x = owner.getLocationOnScreen().x - bt.getWidth() + 43;
-        }
-        if (ret.x >= pt.x) {
-          hpos = HPOS_LEFT;
-        }
-        else {
-          hpos = HPOS_RIGHT;
-        }
-
-        if (ret.y < sBounds.y) {
-          ret.y = sBounds.y;
-        }
-        else if (ret.y - sBounds.y + bt.getHeight() > sBounds.height) {
-          ret.y = owner.getLocationOnScreen().y - bt.getHeight();
-        }
-        if (ret.y >= pt.y) {
-          vpos = VPOS_BELOW;
-        }
-        else {
-          vpos = VPOS_ABOVE;
-        }
-        return ret;
-      }
-      
-      /*
-       * This class handles actions from the balloon tip timer.
-       */
-      @SuppressWarnings("serial")
-      final class TimerAction extends AbstractAction {
-        /*
-         * (non-Javadoc)
-         * @see java.awt.event.ActionListener#actionPerformed(
-         * java.awt.event.ActionEvent)
-         */
-        public void actionPerformed (ActionEvent e) {
-          hide();
-        }
-      }
-      
-      /*
-       * This class handles events spawned from moving the component.
-       */
-      final class ComponentEar extends ComponentAdapter {
-        /*
-         * (non-Javadoc)
-         * @see java.awt.event.ComponentAdapter#componentMoved(
-         * java.awt.event.ComponentEvent)
-         */
-        public void componentMoved (ComponentEvent e) {
-          hide();
-        }
-      }
-      
-      /*
-       * This class handles events spawned when a mouse button is pressed.
-       */
-      final class MouseEar extends MouseAdapter {
-        /*
-         * (non-Javadoc)
-         * @see java.awt.event.MouseAdapter#mousePressed(
-         * java.awt.event.MouseEvent)
-         */
-        public void mousePressed (MouseEvent e) {
-          hide();
-        }
-      }
-
-      /*
-       * This class handles events spawned when the component loses focus.
-       */
-      final class FocusEar extends FocusAdapter {
-        /*
-         * (non-Javadoc)
-         * @see java.awt.event.FocusAdapter#focusLost(
-         * java.awt.event.FocusEvent)
-         */
-        public void focusLost (FocusEvent e) {
-          hide();
-        }
-      }
-    };
-  }
-}

jnalib/contrib/balloontips/com/sun/jna/contrib/demo/FilteredTextField.java

@@ -1,422 +0,0 @@
-package com.sun.jna.contrib.demo;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.util.ArrayList;
-
-import javax.swing.BorderFactory;
-import javax.swing.JFrame;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.Popup;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.text.AttributeSet;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.Document;
-import javax.swing.text.PlainDocument;
-//TODO: FilteredTextField - Comment this class.
-/**
- * The FilteredTextField class is a JTextField that only allows specified
- * characters to be entered into it.  The allowed characters can be added to
- * the text field, and entry validation is performed as each character is
- * typed.  In addition, complete string validation is tested against a
- * configurable regular expression when leaving the field.  If the string is
- * invalid the text field is bordered with a red line, and the user is notified
- * of the error upon returning to the text field.  The text field can also be
- * configured to accept a limited number of characters.
- */
-@SuppressWarnings("serial")
-public class FilteredTextField extends JTextField {
-  public static final Character[] UPPERCASE_CHARS = {'A', 'B', 'C', 'D', 'E',
-    'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-    'U', 'V', 'W', 'X', 'Y', 'Z'};
-  public static final Character[] LOWERCASE_CHARS = {'a', 'b', 'c', 'd', 'e',
-    'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
-    'u', 'v', 'w', 'x', 'y', 'z'};
-  public static final Character[] NUMERIC_CHARS = {'1', '2', '3', '4', '5',
-    '6', '7', '8', '9', '0'};
-  
-  private static final Integer ENTRY_BALLOON = 0;
-  private static final Integer VALID_BALLOON = 1;
-  private static final Integer LENGTH_BALLOON = 2;
-  private static final Border RED_BORDER =
-    BorderFactory.createLineBorder(Color.RED, 2);
-  
-  private ArrayList<Character> allowable = new ArrayList<Character>();
-  private int maximumLength = String.valueOf(Long.MAX_VALUE).length();
-  
-  private Border defaultBorder = null;
-  private boolean isValid = true;
-  
-  private Popup balloon = null;
-  private String entryError = null;
-  private String validRegex = null;
-  private String validError = null;
-  private Color balloonBorderColor = null;
-  private Color balloonBackgroundColor = null;
-  private Color balloonTextColor = null;
-  private Integer balloonDuration = null;
-  
-  private Integer balloonType = null;
-  
-  /**
-   * Create a FilteredTextField.
-   */
-  public FilteredTextField () {
-    super();
-    init();
-  }
-  
-  /**
-   * Create a FilteredTextField.
-   * @param columns the number of columns to use to calculate the preferred
-   * width
-   */
-  public FilteredTextField (int columns) {
-    super(columns);
-    init();
-  }
-  
-  /*
-   * Initialize the FilteredTextField.
-   */
-  private void init () {
-    defaultBorder = getBorder();
-    entryError = "";
-    validRegex = "";
-    validError = "";
-    balloonBorderColor = BalloonTipManager.DEFAULT_BORDER_COLOR;
-    balloonBackgroundColor = BalloonTipManager.DEFAULT_BACKGROUND_COLOR;
-    balloonTextColor = BalloonTipManager.DEFAULT_TEXT_COLOR;
-    balloonDuration = 10000;
-    balloonType = ENTRY_BALLOON;
-    addFocusListener(new ValidationEar());
-  }
-  
-  /**
-   * Sets the allowable character used for entry validation.
-   * @param characters the allowable characters
-   */
-  public void setCharacters (Character[] characters) {
-    clearCharacters();
-    for (int i = 0; i < characters.length; i++) {
-      addCharacter(characters[i]);
-    }
-  }
-  
-  /**
-   * Adds the character array to the list used for entry validation.
-   * @param characters the character array
-   */
-  public void addCharacters (Character[] characters) {
-    for (int i = 0; i < characters.length; i++) {
-      addCharacter(characters[i]);
-    }
-  }
-  
-  /**
-   * Adds the character to the list used for entry validation.
-   * @param characters the character
-   */
-  public void addCharacter (Character character) {
-    if (!allowable.contains(character)) {
-      allowable.add(character);
-    }
-  }
-  
-  /**
-   * Clears the list of allowable characters for entry validation.
-   */
-  public void clearCharacters () {
-    allowable.clear();
-  }
-  
-  /**
-   * Removes the character array from the list used for entry validation.
-   * @param characters the character array
-   */
-  public void removeCharacters (Character[] characters) {
-    for (int i = 0; i < characters.length; i++) {
-      removeCharacter(characters[i]);
-    }
-  }
-  
-  /**
-   * Removes the character from the list used for entry validation.
-   * @param character the character
-   */
-  public void removeCharacter (Character character) {
-    if (allowable.contains(character)) {
-      allowable.remove(character);
-    }
-  }
-  
-  /**
-   * Sets the maximum number of characters for the length of the entry string.
-   * @param maximumLength the number of characters
-   */
-  public void setMaximumLength (int maximumLength) {
-    this.maximumLength = maximumLength;
-  }
-  
-  /**
-   * Sets the message that is displayed when there is an entry error.
-   * @param entryError the entry error message
-   */
-  public void setEntryError (String entryError) {
-    this.entryError = entryError;
-  }
-  
-  /**
-   * Sets the regular expression that is used for string validation.  String
-   * validation is checked when exiting the text field.
-   * @param validRegex the validation regular expression
-   */
-  public void setValidRegex (String validRegex) {
-    this.validRegex = validRegex;
-  }
-  
-  /**
-   * Sets the message that is displayed when there is a validation error.
-   * @param validError the validation error message
-   */
-  public void setValidError (String validError) {
-    this.validError = validError;
-  }
-  
-  /**
-   * Sets the color to use for the balloon border.
-   * @param borderColor the balloon border color
-   */
-  public void setBalloonBorderColor (Color borderColor) {
-    balloonBorderColor = borderColor;
-  }
-  
-  /**
-   * Sets the color to use for the balloon background.
-   * @param backgroundColor the balloon background color
-   */
-  public void setBalloonBackgroundColor (Color backgroundColor) {
-    balloonBackgroundColor = backgroundColor;
-  }
-  
-  /**
-   * Sets the color to use for the balloon text.
-   * @param textColor the balloon text color
-   */
-  public void setBalloonTextColor (Color textColor) {
-    balloonTextColor = textColor;
-  }
-  
-  /**
-   * Sets the time in milliseconds that the balloon is visible before
-   * disappearing.  This is the maximum time that the balloon will be visible,
-   * as other events can also make the balloon disappear.
-   * @param duration the time in milliseconds
-   */
-  public void setBalloonDuration (Integer duration) {
-    balloonDuration = duration;
-  }
-  
-  /*
-   * (non-Javadoc)
-   * @see javax.swing.JTextField#createDefaultModel()
-   */
-  protected Document createDefaultModel () {
-    return new FilteredTextFieldDocument();
-  }
-  
-  /*
-   * This class defines the document used for the FilteredTextField.
-   */
-  private class FilteredTextFieldDocument extends PlainDocument {
-    /*
-     * Create a FilteredTextFieldDocument.
-     */
-    public FilteredTextFieldDocument () {
-      addDocumentListener(new FilteredTextFieldEar());
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see javax.swing.text.PlainDocument#insertString(
-     * int, java.lang.String, javax.swing.text.AttributeSet)
-     */
-    public void insertString (int offset, String str, AttributeSet a)
-        throws BadLocationException
-    {
-      if (balloon != null && BalloonTipManager.isShowing()) {
-        if (balloonType == VALID_BALLOON) {
-          balloon.hide();
-        }
-      }
-      StringBuffer buffer =
-        new StringBuffer(FilteredTextField.this.getText());
-      if (offset >= 0 && offset <= buffer.length()) {
-        buffer.insert(offset, str);
-        String strBuf = buffer.toString();
-        
-        if (buffer.length() > maximumLength) {
-          if (balloon != null && BalloonTipManager.isShowing()) {
-            if (balloonType == LENGTH_BALLOON) {
-              BalloonTipManager.restartTimer();
-              return;
-            }
-            else {
-              balloon.hide();
-            }
-          }
-          balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
-            "The number of characters must be less than or equal to " +
-              maximumLength, 0, 0, balloonDuration, balloonBorderColor,
-              balloonBackgroundColor, balloonTextColor);
-          balloon.show();
-          balloonType = LENGTH_BALLOON;
-          return;
-        }
-        
-        if (strBuf == null || strBuf.equals("")) {
-          remove(0, getLength());
-          super.insertString(0, "", null);
-          if (balloon != null && BalloonTipManager.isShowing()) {
-            balloon.hide();
-          }
-          return;
-        }
-
-        if (allowable.contains(str.charAt(0))) {
-          super.insertString(offset, str, a);
-          if (balloon != null && BalloonTipManager.isShowing()) {
-            balloon.hide();
-          }
-        }
-        else {
-          if (balloon != null && BalloonTipManager.isShowing()) {
-            if (balloonType == ENTRY_BALLOON) {
-              BalloonTipManager.restartTimer();
-              return;
-            }
-            else {
-              balloon.hide();
-            }
-          }
-          balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
-            entryError, 0, 0, balloonDuration, balloonBorderColor,
-            balloonBackgroundColor, balloonTextColor);
-          balloon.show();
-          balloonType = ENTRY_BALLOON;
-        }
-      }
-    }
-    
-    /*
-     * This listener class is needed to catch character removal events.
-     */
-    private class FilteredTextFieldEar implements DocumentListener {
-      /*
-       * (non-Javadoc)
-       * @see javax.swing.event.DocumentListener#insertUpdate(
-       * javax.swing.event.DocumentEvent)
-       */
-      public void insertUpdate (DocumentEvent e) {/* N/A */}
-      
-      /*
-       * (non-Javadoc)
-       * @see javax.swing.event.DocumentListener#removeUpdate(
-       * javax.swing.event.DocumentEvent)
-       */
-      public void removeUpdate (DocumentEvent e) {
-        if (balloon != null && BalloonTipManager.isShowing())
-        {
-          balloon.hide();
-        }
-      }
-      
-      /*
-       * (non-Javadoc)
-       * @see javax.swing.event.DocumentListener#changedUpdate(
-       * javax.swing.event.DocumentEvent)
-       */
-      public void changedUpdate (DocumentEvent e) {/* N/A */}
-    }
-  }
-
-  /*
-   * This listener class is used to determine whether the string is valid based
-   * on a regular expression.  The validation is tested when leaving the text
-   * field, and notification is performed when returning to the text field.
-   */
-  private class ValidationEar extends FocusAdapter {
-    /*
-     * (non-Javadoc)
-     * @see java.awt.event.FocusAdapter#focusLost(java.awt.event.FocusEvent)
-     */
-    public void focusLost (FocusEvent e) {
-      String entered = getText().trim();
-      if (!entered.matches(validRegex)) {
-        if (balloon != null) {
-          balloon.hide();
-        }
-        setBorder(
-          BorderFactory.createCompoundBorder(RED_BORDER, defaultBorder));
-        isValid = false;
-      }
-      else {
-        setBorder(defaultBorder);
-        isValid = true;
-      }
-    }
-    
-    /*
-     * (non-Javadoc)
-     * @see java.awt.event.FocusAdapter#focusGained(java.awt.event.FocusEvent)
-     */
-    public void focusGained (FocusEvent e) {
-      if (!isValid) {
-        balloon = BalloonTipManager.getBalloonTip(FilteredTextField.this,
-          validError, 0, 0, balloonDuration, balloonBorderColor,
-          balloonBackgroundColor, balloonTextColor);
-        balloon.show();
-        balloonType = VALID_BALLOON;
-      }
-    }
-  }
-
-  /*
-   * A main entry point to test the FilteredTextField.
-   * @param args application arguments
-   */
-  public static void main (String[] args) {
-    try {
-      UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-    }
-    catch (Exception e) {
-      e.printStackTrace();
-    }
-    JFrame jframe = new JFrame("FilteredTextField Test");
-    jframe.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-    jframe.setSize(400, 75);
-    jframe.setLocation(400, 400);
-    JPanel jpanel = new JPanel();
-    jpanel.setLayout(new BorderLayout());
-    FilteredTextField ftfield = new FilteredTextField(10);
-    ftfield.setCharacters(LOWERCASE_CHARS);
-    ftfield.addCharacter('-');
-    ftfield.addCharacter('_');
-    ftfield.addCharacter(' ');
-    ftfield.setMaximumLength(10);
-    ftfield.setEntryError(
-      "Only lower case letters, hyphens, underscores, and spaces allowed.");
-    ftfield.setValidRegex("^a+[a-z-_ ]*");
-    ftfield.setValidError("The string must begin with the letter 'a'.");
-    jpanel.add(ftfield, BorderLayout.CENTER);
-    jpanel.add(new FilteredTextField(10), BorderLayout.SOUTH);
-    jframe.getContentPane().add(jpanel);
-    jframe.setVisible(true);
-  }
-}

jnalib/contrib/dnddemo/.classpath

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path=""/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
-	<classpathentry kind="src" path="/platform"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/dnddemo/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>dnddemo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/dnddemo/build.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="jnacontrib.dnddemo" default="jar" basedir=".">
-    <description>Builds, tests, and runs the project jnacontrib.dnddemo.</description>
-    <!-- Locations -->
-    <property name="src"                location="."/>
-    <property name="build"              location="build"/>
-    <property name="jna-dist"           location="../../dist"/>
-
-    <property name="classes"       location="${build}/classes"/>
-    <property name="jar"           location="${build}/demo-dnd.jar"/>
-    <property name="file.reference.jna.build" location="../../build"/>
-    <property name="file.reference.jna.jar" location="../../build/jna.jar"/>
-    <property name="main-class"			value="com.sun.jna.contrib.demo.GhostedDragImageDemo" />
-
-    <path id="classpath">
-        <fileset file="${file.reference.jna.jar}"/>
-        <fileset dir="../platform/dist" includes="platform.jar"/>
-    </path>
-
-    <!-- Run Demo. -->
-    <target name="run" depends="compile">
-        <java classname="${main-class}" fork="true">
-            <classpath>
-                <pathelement location="${classes}" />
-                <path refid="classpath"/>
-            </classpath>
-        </java>
-    </target>
-
-    <!-- Delete class and jar files. -->
-    <target name="clean">
-        <delete dir="${classes}"/>
-        <delete file="${jar}"/>
-        <delete dir="${build}"/>
-    </target>
-
-    <!-- Compile all classes. -->
-    <target name="compile">
-        <mkdir dir="${classes}"/>
-
-        <!-- Compile the project. -->
-        <javac srcdir="${src}" destdir="${classes}" target="1.5" source="1.5"
-               encoding="UTF-8" debug="on" includeantruntime="false">
-            <classpath>
-                <path refid="classpath"/>
-            </classpath>
-            <src>
-                <dirset dir="${src}"/>
-            </src>
-        </javac>
-
-        <!-- Copy all non-java files to classes. -->
-        <copy todir="${classes}/com">
-            <fileset dir="${src}/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- platform -->
-            <fileset dir="../platform/build/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        	<!-- jna -->
-            <fileset dir="${file.reference.jna.build}/classes/com">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <!-- Create jar-file. -->
-    <target name="jar" depends="compile">
-        <jar jarfile="${jar}" basedir="${classes}">
-            <manifest>
-                <attribute name="Main-Class" value="${main-class}"/>
-            </manifest>
-        </jar>
-    </target>
-</project>

jnalib/contrib/dnddemo/com/sun/jna/contrib/demo/GhostedDragImageDemo.java

@@ -1,140 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.contrib.demo;
-
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.ClipboardOwner;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragSourceDropEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.io.IOException;
-import java.net.URL;
-
-import javax.swing.Icon;
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.UIManager;
-
-import com.sun.jna.platform.dnd.DragHandler;
-import com.sun.jna.platform.dnd.DropHandler;
-
-
-/** Demonstrate ghosted drag images.  Unfortunately, Swing drag support hides
- * the hooks we need to move the drag image around, so we don't use it and
- * roll our own.  
- */
-public class GhostedDragImageDemo {
-
-    public static class ImageSelection implements Transferable, ClipboardOwner {
-        public static final DataFlavor IMAGE_FLAVOR = DataFlavor.imageFlavor;
-        private static final DataFlavor[] FLAVORS = { IMAGE_FLAVOR };
-
-        private Image image;
-        public ImageSelection(Image image) {
-            this.image = image;
-        }
-        public void lostOwnership(Clipboard clipboard, Transferable transferable) {
-            // don't care
-        }
-        public Object getTransferData(DataFlavor flavor) {
-            return isDataFlavorSupported(flavor) ? image : null;
-        }
-        public DataFlavor[] getTransferDataFlavors() { return FLAVORS; }
-        public boolean isDataFlavorSupported(DataFlavor flavor) {
-            return flavor.equals(IMAGE_FLAVOR);
-        }
-    }
-
-    public static class DragLabel extends JLabel {
-		private static final long serialVersionUID = 1L;
-		private boolean dragging;
-        public DragLabel(Icon icon) {
-            super(icon);
-            new DragHandler(this, DnDConstants.ACTION_COPY_OR_MOVE) {
-                protected Icon getDragIcon(DragGestureEvent e, Point imageOffset) {
-                    dragging = true;
-                    return getIcon(); 
-                }
-                public void dragDropEnd(DragSourceDropEvent e) {
-                    super.dragDropEnd(e);
-                    if (e.getDropSuccess() && getDropAction(e) == MOVE) {
-                        if (dragging) {
-                            setIcon(null);
-                            dragging = false;
-                        }
-                    }
-                }
-                protected Transferable getTransferable(DragGestureEvent e) {
-                    ImageIcon icon = (ImageIcon)getIcon();
-                    if (icon != null) {
-                        return new ImageSelection(icon.getImage());
-                    }
-                    return null;
-                }
-            };
-            DataFlavor[] flavors = new DataFlavor[] { DataFlavor.imageFlavor };
-            new DropHandler(this, DnDConstants.ACTION_COPY_OR_MOVE, flavors) {
-                protected void drop(DropTargetDropEvent e, int action) throws UnsupportedFlavorException, IOException {
-                    final Image image = (Image)e.getTransferable().getTransferData(DataFlavor.imageFlavor);
-                    dragging = false;
-                    setIcon(new ImageIcon(image));
-                }
-            };
-        }
-        public void setIcon(Icon icon) {
-            super.setIcon(icon);
-            if (icon == null) {
-                setText("Empty");
-            }
-            else {
-                setText(null);
-            }
-        }
-    }
-    
-    public static void main(String[] args) {
-        try {
-            System.setProperty("sun.java2d.noddraw", "true");
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-            JFrame f1 = new JFrame("Drag this");
-            JFrame f2 = new JFrame("Over here");
-            URL url = GhostedDragImageDemo.class.getResource("toucan.png");
-            if (url == null)
-                throw new RuntimeException("Icon not found");
-            Icon icon = new ImageIcon(url);
-            f1.getContentPane().add(new DragLabel(icon));
-            JLabel label2 = new DragLabel(icon);
-            f2.getContentPane().add(label2);
-            f1.setLocation(100, 100);
-            f1.pack();
-            f1.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-            f2.setLocation(300, 100);
-            f2.pack();
-            label2.setIcon(null);
-            f2.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-            f2.setVisible(true);
-            f1.setVisible(true);
-        }
-        catch(Throwable t){
-            t.printStackTrace();
-            System.exit(1);
-        }
-    }
-}

jnalib/contrib/dnddemo/package.html

@@ -1,13 +0,0 @@
-<html>
-<head>
-<!-- 
-  Copyright (c) 2007 Timothy Wall
--->
-</head>
-<body bgcolor="white">
-
-<!-- One sentence summary -->
-Cross-platform ghosted drag image implementation with demo application.
-
-</body>
-</html>

jnalib/contrib/ntservice/.classpath

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" output="build.eclipse/contrib-test-classes" path="test"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jnalib"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/ntservice/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ntservice</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/ntservice/README

@@ -1,60 +0,0 @@
-Copyright (c) 2007 Thomas Boerkel, All Rights Reserved
-
-Disclaimer:
-===========
-This code is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This code is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.  
-
-
-Description:
-============
-
-Accounts.java:
---------------
-Static methods for getting information about Win32 accounts (users
-and groups).
-- list all domain users
-- list all domain groups
-- list all local or domain groups where a user belongs to
-- get account by SID
-- get SID of account
-- get domain controller name
-- get domain name
-
-Registry.java:
---------------
-Static methods for reading and manipulating the Windows Registry.
-Only String and DWORD values supported, but could be easily
-extended.
-- create key
-- delete key
-- delete value
-- read value
-- get all sub keys of a key
-- get all values of a key
-- set value
-- check existence of value
-
-Win32Service.java:
-------------------
-Abstract class to wrap a Win32 service. Derive from this class
-to build your own service. Supports only one type of service and
-startup, but could be easily extended.
-- install service
-- uninstall service
-- start service
-- stop service
-- callback for service start request (onStart), should spawn a thread
-- callback for service stop request (onStop)
-
-TestService.java:
------------------
-Very simple example of an implementation of Win32Service.java.
-Does nothing but starting and stopping (no "useful" work).

jnalib/contrib/ntservice/build.xml

@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- You may freely edit this file. See commented blocks below for -->
-<!-- some examples of how to customize the build. -->
-<!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="JnaContrib" default="default" basedir=".">
-    <description>Builds, tests, and runs the project JnaContrib.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="JnaContrib-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

jnalib/contrib/ntservice/manifest.mf

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-X-COMMENT: Main-Class will be added automatically by build
-

jnalib/contrib/ntservice/nbproject/build-impl.xml

@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
--->
-<project name="ntservice-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
-    <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
-    <!-- 
-    ======================
-    INITIALIZATION SECTION 
-    ======================
-    -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-private" depends="-pre-init">
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target name="-init-user" depends="-pre-init,-init-private">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target name="-init-project" depends="-pre-init,-init-private,-init-user">
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <isfalse value="${javadoc.preview}"/>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="srcdir" default="${src.dir}"/>
-            <attribute name="destdir" default="${build.classes.dir}"/>
-            <attribute name="classpath" default="${javac.classpath}"/>
-            <attribute name="debug" default="${javac.debug}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="includes" default="**/*Test.java"/>
-            <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <attribute name="stopclassname" default=""/>
-            <sequential>
-                <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="dir" default="${build.classes.dir}"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="classname" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg value="-Xdebug"/>
-                    <jvmarg value="-Xnoagent"/>
-                    <jvmarg value="-Djava.compiler=none"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="classname" default="${main.class}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar jarfile="${dist.jar}" compress="${jar.compress}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar"/>
-    <!--
-    ===================
-    COMPILATION SECTION
-    ===================
-    -->
-    <target name="deps-jar" depends="init" unless="no.deps"/>
-    <target name="-pre-pre-compile" depends="init,deps-jar">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:javac>
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject3:javac>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
-    <!--
-    ====================
-    JAR BUILDING SECTION
-    ====================
-    -->
-    <target name="-pre-pre-jar" depends="init">
-        <dirname property="dist.jar.dir" file="${dist.jar}"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
-        <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
-        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert property="jar.classpath" pathsep=" ">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
-        <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
-    <!--
-    =================
-    EXECUTION SECTION
-    =================
-    -->
-    <target name="run" depends="init,compile" description="Run a main class.">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="run-single" depends="init,compile-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-    =================
-    DEBUGGING SECTION
-    =================
-    -->
-    <target name="-debug-start-debugger" if="netbeans.home" depends="init">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target name="-debug-start-debuggee" depends="init,compile">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
-    <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
-    <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
-    <target name="-pre-debug-fix" depends="init">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
-    <!--
-    ===============
-    JAVADOC SECTION
-    ===============
-    -->
-    <target name="-javadoc-build" depends="init">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <sourcepath>
-                <pathelement location="${src.dir}"/>
-            </sourcepath>
-            <packageset dir="${src.dir}" includes="*/**"/>
-            <fileset dir="${src.dir}" includes="*.java"/>
-        </javadoc>
-    </target>
-    <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
-    <!--
-    =========================
-    JUNIT COMPILATION SECTION
-    =========================
-    -->
-    <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
-        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject3:javac>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
-    <!--
-    =======================
-    JUNIT EXECUTION SECTION
-    =======================
-    -->
-    <target name="-pre-test-run" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
-        <j2seproject3:junit/>
-    </target>
-    <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-report" if="have.tests" depends="init"/>
-    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
-    <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
-    <target name="-pre-test-run-single" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit includes="${test.includes}"/>
-    </target>
-    <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
-    <!--
-    =======================
-    JUNIT DEBUGGING SECTION
-    =======================
-    -->
-    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
-            <customize>
-                <arg line="${test.class}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
-        <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
-    <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
-    <!--
-    =========================
-    APPLET EXECUTION SECTION
-    =========================
-    -->
-    <target name="run-applet" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-    =========================
-    APPLET DEBUGGING  SECTION
-    =========================
-    -->
-    <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
-    <!--
-    ===============
-    CLEANUP SECTION
-    ===============
-    -->
-    <target name="deps-clean" depends="init" unless="no.deps"/>
-    <target name="-do-clean" depends="init">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
-</project>

jnalib/contrib/ntservice/nbproject/genfiles.properties

@@ -1,8 +0,0 @@
-build.xml.data.CRC32=94714fd7
-build.xml.script.CRC32=64128189
-build.xml.stylesheet.CRC32=240b97a2
-# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
-# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=94714fd7
-nbproject/build-impl.xml.script.CRC32=9d2a0176
-nbproject/build-impl.xml.stylesheet.CRC32=65d7ca21

jnalib/contrib/ntservice/nbproject/project.properties

@@ -1,59 +0,0 @@
-application.args=
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/contrib-ntservice.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.jna.jar=../../build/jna.jar
-libs.junit.classpath=../../lib/junit.jar
-jar.compress=false
-javac.classpath=\
-    ${file.reference.jna.jar};
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.6
-javac.target=1.6
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test

jnalib/contrib/ntservice/nbproject/project.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>ntservice</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

jnalib/contrib/ntservice/src/jnacontrib/jna/Advapi32.java

@@ -1,212 +0,0 @@
-/*
- * Advapi32.java
- *
- * Created on 6. August 2007, 11:24
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.jna;
-
-import com.sun.jna.*;
-import com.sun.jna.ptr.*;
-import com.sun.jna.win32.*;
-
-/**
- *
- * @author TB
- */
-public interface Advapi32  extends StdCallLibrary {
-  Advapi32 INSTANCE = (Advapi32) Native.loadLibrary("Advapi32", Advapi32.class, 
-		  W32APIOptions.UNICODE_OPTIONS);  
-  
-/*
-SC_HANDLE WINAPI OpenSCManager(
-  LPCTSTR lpMachineName,
-  LPCTSTR lpDatabaseName,
-  DWORD dwDesiredAccess
-);*/
-  public Pointer OpenSCManager(String lpMachineName, WString lpDatabaseName, int dwDesiredAccess);
-  
-/*
-BOOL WINAPI CloseServiceHandle(
-  SC_HANDLE hSCObject
-);*/
-  public boolean CloseServiceHandle(Pointer hSCObject);
-  
-/*
-SC_HANDLE WINAPI OpenService(
-  SC_HANDLE hSCManager,
-  LPCTSTR lpServiceName,
-  DWORD dwDesiredAccess
-);*/
-  public Pointer OpenService(Pointer hSCManager, String lpServiceName, int dwDesiredAccess);
-  
-/*
-BOOL WINAPI StartService(
-  SC_HANDLE hService,
-  DWORD dwNumServiceArgs,
-  LPCTSTR* lpServiceArgVectors
-);*/
-  public boolean StartService(Pointer hService, int dwNumServiceArgs, char[] lpServiceArgVectors);
-  
-/*
-BOOL WINAPI ControlService(
-  SC_HANDLE hService,
-  DWORD dwControl,
-  LPSERVICE_STATUS lpServiceStatus
-);*/
-  public boolean ControlService(Pointer hService, int dwControl, SERVICE_STATUS lpServiceStatus);
- 
-/*  
-BOOL WINAPI StartServiceCtrlDispatcher(
-  const SERVICE_TABLE_ENTRY* lpServiceTable
-);*/
-  public boolean StartServiceCtrlDispatcher(Structure[] lpServiceTable);
-  
-/*
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandler(
-  LPCTSTR lpServiceName,
-  LPHANDLER_FUNCTION lpHandlerProc
-);*/
-  public Pointer RegisterServiceCtrlHandler(String lpServiceName, Handler lpHandlerProc);
-  
-/*
-SERVICE_STATUS_HANDLE WINAPI RegisterServiceCtrlHandlerEx(
-  LPCTSTR lpServiceName,
-  LPHANDLER_FUNCTION_EX lpHandlerProc,
-  LPVOID lpContext
-);*/
-  public Pointer RegisterServiceCtrlHandlerEx(String lpServiceName, HandlerEx lpHandlerProc, Pointer lpContext);
-  
-/*
-BOOL WINAPI SetServiceStatus(
-  SERVICE_STATUS_HANDLE hServiceStatus,
-  LPSERVICE_STATUS lpServiceStatus
-);*/
-  public boolean SetServiceStatus(Pointer hServiceStatus, SERVICE_STATUS lpServiceStatus);
-  
-/*
-SC_HANDLE WINAPI CreateService(
-  SC_HANDLE hSCManager,
-  LPCTSTR lpServiceName,
-  LPCTSTR lpDisplayName,
-  DWORD dwDesiredAccess,
-  DWORD dwServiceType,
-  DWORD dwStartType,
-  DWORD dwErrorControl,
-  LPCTSTR lpBinaryPathName,
-  LPCTSTR lpLoadOrderGroup,
-  LPDWORD lpdwTagId,
-  LPCTSTR lpDependencies,
-  LPCTSTR lpServiceStartName,
-  LPCTSTR lpPassword
-);*/
-  public Pointer CreateService(Pointer hSCManager, String lpServiceName, String lpDisplayName,
-          int dwDesiredAccess, int dwServiceType, int dwStartType, int dwErrorControl,
-          String lpBinaryPathName, String lpLoadOrderGroup, IntByReference lpdwTagId,
-          String lpDependencies, String lpServiceStartName, String lpPassword);
- 
-/*
-BOOL WINAPI DeleteService(
-  SC_HANDLE hService
-);*/
-  public boolean DeleteService(Pointer hService);
-  
-/*
-BOOL WINAPI ChangeServiceConfig2(
-  SC_HANDLE hService,
-  DWORD dwInfoLevel,
-  LPVOID lpInfo
-);*/
-  public boolean ChangeServiceConfig2(Pointer hService, int dwInfoLevel, ChangeServiceConfig2Info lpInfo);
-  
-/*
-LONG WINAPI RegEnumValue(
-  HKEY hKey,
-  DWORD dwIndex,
-  LPTSTR lpValueName,
-  LPDWORD lpcchValueName,
-  LPDWORD lpReserved,
-  LPDWORD lpType,
-  LPBYTE lpData,
-  LPDWORD lpcbData
-);*/
-  public int RegEnumValue(int hKey, int dwIndex, char[] lpValueName, IntByReference lpcchValueName, IntByReference reserved,
-          IntByReference lpType, byte[] lpData, IntByReference lpcbData);
-
-  interface SERVICE_MAIN_FUNCTION extends StdCallCallback {
-    /*
-    VOID WINAPI ServiceMain(
-    DWORD dwArgc,
-    LPTSTR* lpszArgv
-    );*/
-    public void callback(int dwArgc, Pointer lpszArgv);
-  }
-
-  interface Handler extends StdCallCallback {
-    /*
-    VOID WINAPI Handler(
-      DWORD fdwControl
-    );*/  
-    public void callback(int fdwControl);
-  }
-  
-  interface HandlerEx extends StdCallCallback {
-    /*
-    DWORD WINAPI HandlerEx(
-      DWORD dwControl,
-      DWORD dwEventType,
-      LPVOID lpEventData,
-      LPVOID lpContext
-    );*/
-    public int callback(int dwControl, int dwEventType, Pointer lpEventData, Pointer lpContext);
-  }
-  
-/*
-typedef struct _SERVICE_STATUS {
-  DWORD dwServiceType;
-  DWORD dwCurrentState;
-  DWORD dwControlsAccepted;
-  DWORD dwWin32ExitCode;
-  DWORD dwServiceSpecificExitCode;
-  DWORD dwCheckPoint;
-  DWORD dwWaitHint;
-} SERVICE_STATUS, 
- *LPSERVICE_STATUS;*/
-  public static class SERVICE_STATUS extends Structure {
-    public int dwServiceType;
-    public int dwCurrentState;
-    public int dwControlsAccepted;
-    public int dwWin32ExitCode;
-    public int dwServiceSpecificExitCode;
-    public int dwCheckPoint;
-    public int dwWaitHint;
-  }
-  
-/*  
-typedef struct _SERVICE_TABLE_ENTRY {
-  LPTSTR lpServiceName;
-  LPSERVICE_MAIN_FUNCTION lpServiceProc;
-} SERVICE_TABLE_ENTRY, 
- *LPSERVICE_TABLE_ENTRY;*/  
-  public static class SERVICE_TABLE_ENTRY extends Structure {
-    public String lpServiceName;
-    public SERVICE_MAIN_FUNCTION lpServiceProc;
-  }
- 
-  public static class ChangeServiceConfig2Info extends Structure {
-  }
-  
-/*
- typedef struct _SERVICE_DESCRIPTION {
-  LPTSTR lpDescription;
-} SERVICE_DESCRIPTION, 
- *LPSERVICE_DESCRIPTION;*/
-  public static class SERVICE_DESCRIPTION extends ChangeServiceConfig2Info {
-    public String lpDescription;
-  }  
-}
-
-

jnalib/contrib/ntservice/src/jnacontrib/jna/WINERROR.java

@@ -1,22 +0,0 @@
-/*
- * WINERROR.java
- *
- * Created on 7. August 2007, 08:09
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.jna;
-
-
-/**
- *
- * @author TB
- */
-public interface WINERROR {
-  public final static int ERROR_SUCCESS = 0;
-  public final static int NO_ERROR = 0;
-  public final static int ERROR_FILE_NOT_FOUND = 2;
-  public final static int ERROR_MORE_DATA = 234;
-}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINNT.java

@@ -1,36 +0,0 @@
-/*
- * WINNT.java
- *
- * Created on 8. August 2007, 13:41
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.jna;
-
-/**
- *
- * @author TB
- */
-public interface WINNT {
-  public final static int DELETE       = 0x00010000;
-  public final static int READ_CONTROL = 0x00020000;
-  public final static int WRITE_DAC    = 0x00040000;
-  public final static int WRITE_OWNER  = 0x00080000;
-  public final static int SYNCHRONIZE  = 0x00100000;
-
-  public final static int STANDARD_RIGHTS_REQUIRED = 0x000F0000;
-
-  public final static int STANDARD_RIGHTS_READ    = READ_CONTROL;
-  public final static int STANDARD_RIGHTS_WRITE   = READ_CONTROL;
-  public final static int STANDARD_RIGHTS_EXECUTE = READ_CONTROL;
-
-  public final static int STANDARD_RIGHTS_ALL = 0x001F0000;
-
-  public final static int SPECIFIC_RIGHTS_ALL = 0x0000FFFF;
-
-  public final static int GENERIC_EXECUTE = 0x20000000;
-  
-  public final static int SERVICE_WIN32_OWN_PROCESS = 0x00000010;
-}

jnalib/contrib/ntservice/src/jnacontrib/jna/WINSVC.java

@@ -1,104 +0,0 @@
-/*
- * WINSVC.java
- *
- * Created on 8. August 2007, 15:07
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.jna;
-
-
-/**
- *
- * @author TB
- */
-public interface WINSVC {
-  public final static int SERVICE_CONTROL_STOP         = 0x00000001;
-  public final static int SERVICE_CONTROL_SHUTDOWN     = 0x00000005;
-  
-  public final static int SERVICE_STOPPED              = 0x00000001;
-  public final static int SERVICE_START_PENDING        = 0x00000002;
-  public final static int SERVICE_STOP_PENDING         = 0x00000003;
-  public final static int SERVICE_RUNNING              = 0x00000004;
-  public final static int SERVICE_CONTINUE_PENDING     = 0x00000005;
-  public final static int SERVICE_PAUSE_PENDING        = 0x00000006;
-  public final static int SERVICE_PAUSED               = 0x00000007;
-  
-  public final static int SERVICE_ACCEPT_STOP           = 0x00000001;
-  public final static int SERVICE_ACCEPT_PAUSE_CONTINUE = 0x00000002;
-  public final static int SERVICE_ACCEPT_SHUTDOWN       = 0x00000004;
-  public final static int SERVICE_ACCEPT_PARAMCHANGE    = 0x00000008;
-  public final static int SERVICE_ACCEPT_NETBINDCHANGE  = 0x00000010;
-  
-  public final static int SC_MANAGER_CONNECT = 0x0001;
-  public final static int SC_MANAGER_CREATE_SERVICE = 0x0002;
-  public final static int SC_MANAGER_ENUMERATE_SERVICE = 0x0004;
-  public final static int SC_MANAGER_LOCK = 0x0008;
-  public final static int SC_MANAGER_QUERY_LOCK_STATUS = 0x0010;
-  public final static int SC_MANAGER_MODIFY_BOOT_CONFIG = 0x0020;
-
-  public final static int SC_MANAGER_ALL_ACCESS = WINNT.STANDARD_RIGHTS_REQUIRED |
-                                                  SC_MANAGER_CONNECT             |
-                                                  SC_MANAGER_CREATE_SERVICE      |
-                                                  SC_MANAGER_ENUMERATE_SERVICE   |
-                                                  SC_MANAGER_LOCK                |
-                                                  SC_MANAGER_QUERY_LOCK_STATUS   |
-                                                  SC_MANAGER_MODIFY_BOOT_CONFIG;
-                                        
-  public final static int SERVICE_QUERY_CONFIG         = 0x0001;
-  public final static int SERVICE_CHANGE_CONFIG        = 0x0002;
-  public final static int SERVICE_QUERY_STATUS         = 0x0004;
-  public final static int SERVICE_ENUMERATE_DEPENDENTS = 0x0008;
-  public final static int SERVICE_START                = 0x0010;
-  public final static int SERVICE_STOP                 = 0x0020;
-  public final static int SERVICE_PAUSE_CONTINUE       = 0x0040;
-  public final static int SERVICE_INTERROGATE          = 0x0080;
-  public final static int SERVICE_USER_DEFINED_CONTROL = 0x0100;
-
-  public final static int SERVICE_ALL_ACCESS = WINNT.STANDARD_RIGHTS_REQUIRED |
-                                               SERVICE_QUERY_CONFIG           |
-                                               SERVICE_CHANGE_CONFIG          |
-                                               SERVICE_QUERY_STATUS           |
-                                               SERVICE_ENUMERATE_DEPENDENTS   |
-                                               SERVICE_START                  |
-                                               SERVICE_STOP                   |
-                                               SERVICE_PAUSE_CONTINUE         |
-                                               SERVICE_INTERROGATE            |
-                                               SERVICE_USER_DEFINED_CONTROL;
-
-  public final static int SERVICE_CONFIG_DESCRIPTION     = 1;
-  public final static int SERVICE_CONFIG_FAILURE_ACTIONS = 2;
-  
-  public final static int SERVICE_KERNEL_DRIVER      = 0x00000001;
-  public final static int SERVICE_FILE_SYSTEM_DRIVER = 0x00000002;
-  public final static int SERVICE_ADAPTER            = 0x00000004;
-  public final static int SERVICE_RECOGNIZER_DRIVER  = 0x00000008;
-
-  public final static int SERVICE_DRIVER = SERVICE_KERNEL_DRIVER      |
-                                           SERVICE_FILE_SYSTEM_DRIVER |
-                                           SERVICE_RECOGNIZER_DRIVER;
-                                        
-  public final static int SERVICE_WIN32_OWN_PROCESS   = 0x00000010;
-  public final static int SERVICE_WIN32_SHARE_PROCESS = 0x00000020;
-  public final static int SERVICE_WIN32 = SERVICE_WIN32_OWN_PROCESS | SERVICE_WIN32_SHARE_PROCESS;
-
-  public final static int SERVICE_INTERACTIVE_PROCESS = 0x00000100;
-
-  public final static int SERVICE_TYPE_ALL = SERVICE_WIN32   |
-                                             SERVICE_ADAPTER | 
-                                             SERVICE_DRIVER  |
-                                             SERVICE_INTERACTIVE_PROCESS;
-  
-  public final static int SERVICE_BOOT_START   = 0x00000000;
-  public final static int SERVICE_SYSTEM_START = 0x00000001;
-  public final static int SERVICE_AUTO_START   = 0x00000002;
-  public final static int SERVICE_DEMAND_START = 0x00000003;
-  public final static int SERVICE_DISABLED     = 0x00000004;
-  
-  public final static int SERVICE_ERROR_IGNORE   = 0x00000000;
-  public final static int SERVICE_ERROR_NORMAL   = 0x00000001;
-  public final static int SERVICE_ERROR_SEVERE   = 0x00000002;
-  public final static int SERVICE_ERROR_CRITICAL = 0x00000003;
-}

jnalib/contrib/ntservice/src/jnacontrib/win32/TestService.java

@@ -1,66 +0,0 @@
-/*
- * TestService.java
- *
- * Created on 12. September 2007, 12:49
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.win32;
-
-/**
- * TestService.
- */
-public class TestService extends Win32Service {
-  
-  /**
-   * main.
-   * @param args arguments
-   */
-  public static void main(String[] args) {
-    TestService service = new TestService();
-    
-    if(args.length == 1) {
-      
-      if(args[0].equalsIgnoreCase("install")) {
-        System.out.println(service.install("TestService DisplayName", "TestService Description",
-                null, null, null));
-        
-      } else if(args[0].equalsIgnoreCase("uninstall")) {
-        System.out.println(service.uninstall());
-        
-      } else {
-        System.out.println("Arguments:");
-        System.out.println("install   = install service");
-        System.out.println("uninstall = uninstall service");
-        System.out.println("<none>    = run service");
-        System.exit(0);
-      }
-      
-    } else {
-      service.init();
-    }
-  }
-  
-  /** 
-   * Creates a new instance of TestService.
-   */
-  public TestService() {
-    super("TestService");
-  }
-
-  /**
-   * Will be called on start.
-   */
-  public void onStart() {
-    
-  }
-
-  /**
-   * Will be called on stop.
-   */
-  public void onStop() {
-  }
-  
-}

jnalib/contrib/ntservice/src/jnacontrib/win32/Win32Service.java

@@ -1,310 +0,0 @@
-/*
- * Win32Service.java
- *
- * Created on 12. September 2007, 12:05
- *
- * To change this template, choose Tools | Template Manager
- * and open the template in the editor.
- */
-
-package jnacontrib.win32;
-
-import jnacontrib.jna.*;
-import com.sun.jna.Pointer;
-
-/**
- * Baseclass for a Win32 service.
- */
-public abstract class Win32Service {
-  protected String serviceName;
-  private ServiceMain serviceMain;
-  private ServiceControl serviceControl;
-  private Pointer serviceStatusHandle;
-  private Object waitObject = new Object();
-  
-  /**
-   * Creates a new instance of Win32Service.
-   *
-   * @param serviceName internal name of the service
-   */
-  public Win32Service(String serviceName) {
-    this.serviceName = serviceName;
-  }
-  
-  /**
-   * Install the service.
-   *
-   * @param displayName visible name
-   * @param description description
-   * @param dependencies array of other services to depend on or null
-   * @param account service account or null for LocalSystem
-   * @param password password for service account or null
-   * @throws java.lang.Exception 
-   * @return true on success
-   */
-  public boolean install(String displayName, String description, String[] dependencies, String account, String password) {
-    return(install(displayName, description, dependencies, account, password, "java.exe -cp \"" + 
-           System.getProperty("java.class.path") + "\" -Xrs " + this.getClass().getName()));
-  }
-  
-  /**
-   * Install the service.
-   * 
-   * @return true on success
-   * @param displayName visible name
-   * @param description description
-   * @param dependencies array of other services to depend on or null
-   * @param account service account or null for LocalSystem
-   * @param password password for service account or null
-   * @param command command line to start the service
-   * @throws java.lang.Exception 
-   */
-  public boolean install(String displayName, String description, String[] dependencies, String account, String password, String command) {
-    Advapi32 advapi32;
-    Advapi32.SERVICE_DESCRIPTION desc;
-    Pointer serviceManager, service;
-    boolean success = false;
-    String dep = "";
-    
-    if(dependencies != null) {
-      for(String s : dependencies) {
-        dep += s + "\0";
-      }
-    }
-    dep += "\0";
-    
-    desc = new Advapi32.SERVICE_DESCRIPTION();
-    desc.lpDescription = description;
-    
-    advapi32 = Advapi32.INSTANCE;
-    serviceManager = openServiceControlManager(null, WINSVC.SC_MANAGER_ALL_ACCESS);
-    
-    if(serviceManager != null) {
-      service = advapi32.CreateService(serviceManager, serviceName, displayName,
-              WINSVC.SERVICE_ALL_ACCESS, WINSVC.SERVICE_WIN32_OWN_PROCESS, WINSVC.SERVICE_DEMAND_START, 
-              WINSVC.SERVICE_ERROR_NORMAL, 
-              command, 
-              null, null, dep, account, password);
-      
-      if(service != null) {
-        success = advapi32.ChangeServiceConfig2(service, WINSVC.SERVICE_CONFIG_DESCRIPTION, desc);
-        advapi32.CloseServiceHandle(service);
-      }
-      advapi32.CloseServiceHandle(serviceManager);
-    }
-    return(success);
-  }
-  
-  /**
-   * Uninstall the service.
-   *
-   * @throws java.lang.Exception 
-   * @return true on success
-   */
-  public boolean uninstall() {
-    Advapi32 advapi32;
-    Pointer serviceManager, service;
-    boolean success = false;
-    
-    advapi32 = Advapi32.INSTANCE;
-    serviceManager = openServiceControlManager(null, WINSVC.SC_MANAGER_ALL_ACCESS);
-    
-    if(serviceManager != null) {
-      service = advapi32.OpenService(serviceManager, serviceName, WINSVC.SERVICE_ALL_ACCESS);
-      
-      if(service != null) {
-        success = advapi32.DeleteService(service);
-        advapi32.CloseServiceHandle(service);
-      }
-      advapi32.CloseServiceHandle(serviceManager);
-    }
-    return(success);
-  }
-  
-  /**
-   * Ask the ServiceControlManager to start the service.
-   * @return true on success
-   */
-  public boolean start() {
-    Advapi32 advapi32;
-    Pointer serviceManager, service;
-    boolean success = false;
-    
-    advapi32 = Advapi32.INSTANCE;
-    
-    serviceManager = openServiceControlManager(null, WINNT.GENERIC_EXECUTE);
-    
-    if(serviceManager != null) {
-      service = advapi32.OpenService(serviceManager, serviceName, WINNT.GENERIC_EXECUTE);
-      
-      if(service != null) {
-        success = advapi32.StartService(service, 0, null);
-        advapi32.CloseServiceHandle(service);
-      }
-      advapi32.CloseServiceHandle(serviceManager);
-    }
-    
-    return(success);
-  }
-  
-  /**
-   * Ask the ServiceControlManager to stop the service.
-   * @return true on success
-   */
-  public boolean stop() throws Exception {
-    Advapi32 advapi32;
-    Pointer serviceManager, service;
-    Advapi32.SERVICE_STATUS serviceStatus;
-    boolean success = false;
-    
-    advapi32 = Advapi32.INSTANCE;
-    
-    serviceManager = openServiceControlManager(null, WINNT.GENERIC_EXECUTE);
-    
-    if(serviceManager != null) {
-      service = advapi32.OpenService(serviceManager, serviceName, WINNT.GENERIC_EXECUTE);
-      
-      if(service != null) {
-        serviceStatus = new Advapi32.SERVICE_STATUS();
-        success = advapi32.ControlService(service, WINSVC.SERVICE_CONTROL_STOP, serviceStatus);
-        advapi32.CloseServiceHandle(service);
-      }
-      advapi32.CloseServiceHandle(serviceManager);
-    }
-    
-    return(success);
-  }
-  
-  /**
-   * Initialize the service, connect to the ServiceControlManager.
-   */
-  public void init() {
-    Advapi32 advapi32;
-    Advapi32.SERVICE_TABLE_ENTRY entry;
-    
-    serviceMain = new ServiceMain();
-    advapi32 = Advapi32.INSTANCE;
-    entry = new Advapi32.SERVICE_TABLE_ENTRY();
-    entry.lpServiceName = serviceName;
-    entry.lpServiceProc = serviceMain;
-    
-    advapi32.StartServiceCtrlDispatcher(entry.toArray(2));
-  }
-  
-  /**
-   * Get a handle to the ServiceControlManager.
-   *
-   * @param machine name of the machine or null for localhost
-   * @param access access flags
-   * @return handle to ServiceControlManager or null when failed
-   */
-  private Pointer openServiceControlManager(String machine, int access) {
-    Pointer handle = null;
-    Advapi32 advapi32;
-    
-    advapi32 = Advapi32.INSTANCE;
-    handle = advapi32.OpenSCManager(machine, null, access);
-    return(handle);
-  }
-  
-  /**
-   * Report service status to the ServiceControlManager.
-   *
-   * @param status status
-   * @param win32ExitCode exit code 
-   * @param waitHint time to wait
-   */
-  private void reportStatus(int status, int win32ExitCode, int waitHint) {
-    Advapi32 advapi32;
-    Advapi32.SERVICE_STATUS serviceStatus;
-    
-    advapi32 = Advapi32.INSTANCE;
-    serviceStatus = new Advapi32.SERVICE_STATUS();
-    serviceStatus.dwServiceType = WINNT.SERVICE_WIN32_OWN_PROCESS;
-    serviceStatus.dwControlsAccepted = WINSVC.SERVICE_ACCEPT_STOP | WINSVC.SERVICE_ACCEPT_SHUTDOWN;
-    serviceStatus.dwWin32ExitCode = win32ExitCode;
-    serviceStatus.dwWaitHint = waitHint;
-    serviceStatus.dwCurrentState = status;
-    
-    advapi32.SetServiceStatus(serviceStatusHandle, serviceStatus);
-  }
-  
-  /**
-   * Called when service is starting.
-   */
-  public abstract void onStart();
-  
-  /*
-   * Called when service should stop.
-   */
-  public abstract void onStop();
-  
-  
-  /**
-   * Implementation of the service main function.
-   */
-  private class ServiceMain implements Advapi32.SERVICE_MAIN_FUNCTION {
-    
-    /**
-     * Called when the service is starting.
-     *
-     * @param dwArgc number of arguments
-     * @param lpszArgv pointer to arguments
-     */
-    public void callback(int dwArgc, Pointer lpszArgv) {
-      Advapi32 advapi32;
-      
-      advapi32 = Advapi32.INSTANCE;
-      
-      serviceControl = new ServiceControl();
-      serviceStatusHandle = advapi32.RegisterServiceCtrlHandlerEx(serviceName, serviceControl, null);
-      
-      reportStatus(WINSVC.SERVICE_START_PENDING, WINERROR.NO_ERROR, 3000);
-      reportStatus(WINSVC.SERVICE_RUNNING, WINERROR.NO_ERROR, 0);
-      
-      onStart();
-      
-      try {
-        synchronized(waitObject) {
-          waitObject.wait();
-        }
-      } catch (InterruptedException ex) {
-      }
-      reportStatus(WINSVC.SERVICE_STOPPED, WINERROR.NO_ERROR, 0);
-
-      // Avoid returning from ServiceMain, which will cause a crash
-      // See http://support.microsoft.com/kb/201349, which recommends
-      // having init() wait for this thread.  
-      // Waiting on this thread in init() won't fix the crash, though.
-      //System.exit(0);
-    }
-  }
-  
-  
-  /**
-   * Implementation of the service control function.
-   */
-  private class ServiceControl implements Advapi32.HandlerEx {
-
-    /**
-     * Called when the service get a control code.
-     *
-     * @param dwControl 
-     * @param dwEventType 
-     * @param lpEventData 
-     * @param lpContext 
-     */
-    public int callback(int dwControl, int dwEventType, Pointer lpEventData, Pointer lpContext) {
-      switch(dwControl) {
-        case WINSVC.SERVICE_CONTROL_STOP:
-        case WINSVC.SERVICE_CONTROL_SHUTDOWN:
-          reportStatus(WINSVC.SERVICE_STOP_PENDING, WINERROR.NO_ERROR, 5000);
-          onStop();
-          synchronized(waitObject) {
-            waitObject.notifyAll();
-          }
-      }
-      return WINERROR.NO_ERROR;
-    }
-  }
-}

jnalib/contrib/ntservice/test/placeholder.txt

@@ -1,2 +0,0 @@
-# placeholder
-

jnalib/contrib/platform/.classpath

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" output="build.eclipse/contrib-test-classes" path="test"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/jnalib"/>
-	<classpathentry kind="lib" path="/jnalib/dist/jna.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

jnalib/contrib/platform/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>platform</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

jnalib/contrib/platform/build.xml

@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="platform" default="default" basedir=".">
-    <description>Builds, tests, and runs the project platform.</description>
-    <import file="nbproject/build-impl.xml"/>
-    <!--
-
-    There exist several targets which are by default empty and which can be 
-    used for execution of your tasks. These targets are usually executed 
-    before and after some main targets. They are: 
-
-      -pre-init:                 called before initialization of project properties
-      -post-init:                called after initialization of project properties
-      -pre-compile:              called before javac compilation
-      -post-compile:             called after javac compilation
-      -pre-compile-single:       called before javac compilation of single file
-      -post-compile-single:      called after javac compilation of single file
-      -pre-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <target name="-post-compile">
-            <obfuscate>
-                <fileset dir="${build.classes.dir}"/>
-            </obfuscate>
-        </target>
-
-    For list of available properties check the imported 
-    nbproject/build-impl.xml file. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="JnaContrib-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-    <condition property="tests.platform" value="test-win32">
-      <os family="windows"/>
-    </condition>
-    <target name="test" description="Run unit tests." if="tests.platform">
-    	<antcall target="${tests.platform}" />
-    </target>
-	<target name="test-report">
-	    <junitreport todir="${build.test.results.dir}">
-	      <fileset dir="${build.test.results.dir}">
-	        <include name="TEST-*.xml"/>
-	      </fileset>
-	      <report todir="${build.test.results.dir}"/>
-	    </junitreport>
-	  	<echo message="View test report in file://${build.test.results.dir}/index.html" />
-	</target>
-    <target name="test-win32" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" />
-</project>

jnalib/contrib/platform/nbproject/build-impl.xml

@@ -1,541 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT  ***
-***         EDIT ../build.xml INSTEAD         ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
-  - initialization
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
--->
-<project name="platform-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
-    <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
-    <!-- 
-    ======================
-    INITIALIZATION SECTION 
-    ======================
-    -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-private" depends="-pre-init">
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target name="-init-user" depends="-pre-init,-init-private">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target name="-init-project" depends="-pre-init,-init-private,-init-user">
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <isfalse value="${javadoc.preview}"/>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="srcdir" default="${src.dir}"/>
-            <attribute name="destdir" default="${build.classes.dir}"/>
-            <attribute name="classpath" default="${javac.classpath}"/>
-            <attribute name="debug" default="${javac.debug}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="includes" default="**/*Test.java"/>
-            <sequential>
-                <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" includes="@{includes}"/>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper type="glob" from="test-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <attribute name="stopclassname" default=""/>
-            <sequential>
-                <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="dir" default="${build.classes.dir}"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute name="classname" default="${main.class}"/>
-            <attribute name="classpath" default="${debug.classpath}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg value="-Xdebug"/>
-                    <jvmarg value="-Xnoagent"/>
-                    <jvmarg value="-Djava.compiler=none"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="classname" default="${main.class}"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java fork="true" classname="@{classname}" dir="${work.dir}">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper type="glob" from="run-sys-prop.*" to="*"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar jarfile="${dist.jar}" compress="${jar.compress}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar"/>
-    <!--
-    ===================
-    COMPILATION SECTION
-    ===================
-    -->
-    <target name="deps-jar" depends="init" unless="no.deps"/>
-    <target name="-pre-pre-compile" depends="init,deps-jar">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:javac>
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject3:javac>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
-    <!--
-    ====================
-    JAR BUILDING SECTION
-    ====================
-    -->
-    <target name="-pre-pre-jar" depends="init">
-        <dirname property="dist.jar.dir" file="${dist.jar}"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
-        <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
-        <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert property="jar.classpath" pathsep=" ">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
-        <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property name="dist.jar.resolved" location="${dist.jar}"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
-    <!--
-    =================
-    EXECUTION SECTION
-    =================
-    -->
-    <target name="run" depends="init,compile" description="Run a main class.">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="run-single" depends="init,compile-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-    =================
-    DEBUGGING SECTION
-    =================
-    -->
-    <target name="-debug-start-debugger" if="netbeans.home" depends="init">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target name="-debug-start-debuggee" depends="init,compile">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
-    <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
-    <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
-    <target name="-pre-debug-fix" depends="init">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
-    <!--
-    ===============
-    JAVADOC SECTION
-    ===============
-    -->
-    <target name="-javadoc-build" depends="init">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <sourcepath>
-                <pathelement location="${src.dir}"/>
-            </sourcepath>
-            <packageset dir="${src.dir}" includes="*/**"/>
-            <fileset dir="${src.dir}" includes="*.java"/>
-        </javadoc>
-    </target>
-    <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
-    <!--
-    =========================
-    JUNIT COMPILATION SECTION
-    =========================
-    -->
-    <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
-        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
-            <customize>
-                <patternset includes="${javac.includes}"/>
-            </customize>
-        </j2seproject3:javac>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="**/*.java"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
-    <!--
-    =======================
-    JUNIT EXECUTION SECTION
-    =======================
-    -->
-    <target name="-pre-test-run" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
-        <j2seproject3:junit/>
-    </target>
-    <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-report" if="have.tests" depends="init"/>
-    <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
-    <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
-    <target name="-pre-test-run-single" if="have.tests" depends="init">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit includes="${test.includes}"/>
-    </target>
-    <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
-    <!--
-    =======================
-    JUNIT DEBUGGING SECTION
-    =======================
-    -->
-    <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
-            <customize>
-                <arg line="${test.class}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
-        <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
-    </target>
-    <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
-    <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
-    <!--
-    =========================
-    APPLET EXECUTION SECTION
-    =========================
-    -->
-    <target name="run-applet" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-    =========================
-    APPLET DEBUGGING  SECTION
-    =========================
-    -->
-    <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
-    <!--
-    ===============
-    CLEANUP SECTION
-    ===============
-    -->
-    <target name="deps-clean" depends="init" unless="no.deps"/>
-    <target name="-do-clean" depends="init">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
-</project>

jnalib/contrib/platform/nbproject/project.properties

@@ -1,59 +0,0 @@
-application.args=
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/platform.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-file.reference.jna.jar=../../build/jna.jar
-libs.junit.classpath=../../lib/junit.jar
-jar.compress=false
-javac.classpath=\
-    ${file.reference.jna.jar};
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=1.5
-javac.target=1.5
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-src.dir=src
-test.src.dir=test

jnalib/contrib/platform/nbproject/project.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>platform</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-    </configuration>
-</project>

jnalib/contrib/platform/src/com/sun/jna/platform/FileMonitor.java

@@ -1,135 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.sun.jna.platform.win32.W32FileMonitor;
-
-/** Provides notification of file system changes.  Actual capabilities may
- * vary slightly by platform.
- * <p>
- * Watched files which are removed from the filesystem are no longer watched.
- * @author twall
- */
-
-@SuppressWarnings("serial")
-public abstract class FileMonitor {
-
-    public static final int FILE_CREATED = 0x1;
-    public static final int FILE_DELETED = 0x2;
-    public static final int FILE_MODIFIED = 0x4;
-    public static final int FILE_ACCESSED = 0x8;
-    public static final int FILE_NAME_CHANGED_OLD = 0x10;
-    public static final int FILE_NAME_CHANGED_NEW = 0x20;
-    public static final int FILE_RENAMED = FILE_NAME_CHANGED_OLD|FILE_NAME_CHANGED_NEW;
-    public static final int FILE_SIZE_CHANGED = 0x40;
-    public static final int FILE_ATTRIBUTES_CHANGED = 0x80;
-    public static final int FILE_SECURITY_CHANGED = 0x100;
-    public static final int FILE_ANY = 0x1FF;
-
-    public interface FileListener {
-        public void fileChanged(FileEvent e);
-    }
-    
-	public class FileEvent extends EventObject {
-        private final File file;
-        private final int type;
-        public FileEvent(File file, int type) {
-            super(FileMonitor.this);
-            this.file = file;
-            this.type = type;
-        }
-        public File getFile() { return file; }
-        public int getType() { return type; }
-        public String toString() {
-            return "FileEvent: " + file + ":" + type;
-        }
-    }
-    
-    private final Map<File, Integer> watched = new HashMap<File, Integer>();
-    private List<FileListener> listeners = new ArrayList<FileListener>();
-    
-    protected abstract void watch(File file, int mask, boolean recursive) throws IOException ;
-    protected abstract void unwatch(File file);
-    public abstract void dispose();
-
-    public void addWatch(File dir) throws IOException {
-        addWatch(dir, FILE_ANY);
-    }
-    
-    public void addWatch(File dir, int mask) throws IOException {
-        addWatch(dir, mask, dir.isDirectory());
-    }
-    
-    public void addWatch(File dir, int mask, boolean recursive) throws IOException {
-        watched.put(dir, new Integer(mask));
-        watch(dir, mask, recursive);
-    }
-
-    public void removeWatch(File file) {
-        if (watched.remove(file) != null) {
-            unwatch(file);
-        }
-    }
-    
-    protected void notify(FileEvent e) {
-    	for (FileListener listener : listeners) {
-    		listener.fileChanged(e);
-    	}
-    }
-    
-    public synchronized void addFileListener(FileListener listener) {
-        List<FileListener> list = new ArrayList<FileListener>(listeners);
-        list.add(listener);
-        listeners = list;
-    }
-    
-    public synchronized void removeFileListener(FileListener x) {
-        List<FileListener> list = new ArrayList<FileListener>(listeners);
-        list.remove(x);
-        listeners = list;
-    }
-    
-    protected void finalize() {
-    	for (File watchedFile : watched.keySet()) {
-    		removeWatch(watchedFile);
-    	}
-    	
-        dispose();
-    }
-    
-    /** Canonical lazy loading of a singleton. */
-    private static class Holder {
-        public static final FileMonitor INSTANCE;
-        static {
-            String os = System.getProperty("os.name");
-            if (os.startsWith("Windows")) {
-                INSTANCE = new W32FileMonitor();
-            }
-            else {
-                throw new Error("FileMonitor not implemented for " + os);
-            }
-        }
-    }
-    
-    public static FileMonitor getInstance() {
-        return Holder.INSTANCE;
-    }
- }

jnalib/contrib/platform/src/com/sun/jna/platform/FileUtils.java

@@ -1,106 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.jna.platform.mac.MacFileUtils;
-import com.sun.jna.platform.win32.W32FileUtils;
-
-/** Miscellaneous file utils not provided for by Java. */
-public abstract class FileUtils {
-
-    public boolean hasTrash() {
-        return false;
-    }
-
-    /** Move the given file to the system trash, if one is available.
-        Throws an exception on failure.
-    */
-    public abstract void moveToTrash(File[] files) throws IOException;
-
-    /** Canonical lazy loading of a singleton. */
-    private static class Holder {
-        public static final FileUtils INSTANCE;
-        static {
-            String os = System.getProperty("os.name");
-            if (os.startsWith("Windows")) {
-                INSTANCE = new W32FileUtils();
-            }
-            else if (os.startsWith("Mac")){
-                INSTANCE = new MacFileUtils();
-            }
-            else {
-                INSTANCE = new DefaultFileUtils();
-            }
-        }
-    }
-    
-    public static FileUtils getInstance() {
-        return Holder.INSTANCE;
-    }    
-    
-    private static class DefaultFileUtils extends FileUtils {
-
-        private File getTrashDirectory() {
-            // very simple implementation.  should take care of renaming when
-            // a file already exists, or any other platform-specific behavior
-            File home = new File(System.getProperty("user.home"));
-            File trash = new File(home, ".Trash");
-            if (!trash.exists()) {
-                trash = new File(home, "Trash");
-                if (!trash.exists()) {
-                    File desktop = new File(home, "Desktop");
-                    if (desktop.exists()) {
-                        trash = new File(desktop, ".Trash");
-                        if (!trash.exists()) {
-                            trash = new File(desktop, "Trash");
-                            if (!trash.exists()) {
-                                trash = new File(System.getProperty("fileutils.trash", "Trash"));
-                            }
-                        }
-                    }
-                }
-            }
-            return trash;
-        }
-
-        public boolean hasTrash() {
-            return getTrashDirectory().exists();
-        }
-
-        /** The default implementation attempts to move the file to 
-         * the desktop "Trash" folder.
-         */
-        public void moveToTrash(File[] files) throws IOException {
-            File trash = getTrashDirectory();
-            if (!trash.exists()) {
-                throw new IOException("No trash location found (define fileutils.trash to be the path to the trash)");
-            }
-            List<File> failed = new ArrayList<File>();
-            for (int i=0;i < files.length;i++) {
-                File src = files[i];
-                File target = new File(trash, src.getName());
-                if (!src.renameTo(target)) {
-                    failed.add(src);
-                }
-            }
-            if (failed.size() > 0) {
-                throw new IOException("The following files could not be trashed: " + failed);
-            }
-        }
-    }
-}

jnalib/contrib/platform/src/com/sun/jna/platform/KeyboardUtils.java

@@ -1,169 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform;
-
-import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
-import java.awt.event.KeyEvent;
-
-import com.sun.jna.Platform;
-import com.sun.jna.platform.unix.X11;
-import com.sun.jna.platform.unix.X11.Display;
-import com.sun.jna.platform.win32.User32;
-import com.sun.jna.platform.win32.WinUser;
-
-/** Provide access to the local keyboard state.  Note that this is meaningless
- * on a headless system and some VNC setups.
- * 
- * @author twall
- */
-// TODO: key clicks
-// TODO: auto-repeat
-// TODO: keyboard bell
-// TODO: led state
-public class KeyboardUtils {
-    static final NativeKeyboardUtils INSTANCE; 
-    static {
-        if (GraphicsEnvironment.isHeadless()) {
-            throw new HeadlessException("KeyboardUtils requires a keyboard");
-        }
-        if (Platform.isWindows()) {
-            INSTANCE = new W32KeyboardUtils();
-        }
-        else if (Platform.isMac()) {
-            INSTANCE = new MacKeyboardUtils();
-            throw new UnsupportedOperationException("No support (yet) for " 
-                                                    + System.getProperty("os.name"));
-        }
-        else {
-            INSTANCE = new X11KeyboardUtils();
-        }
-    }
-    
-    public static boolean isPressed(int keycode, int location) {
-        return INSTANCE.isPressed(keycode, location);
-    }
-    public static boolean isPressed(int keycode) {
-        return INSTANCE.isPressed(keycode);
-    }
-    
-    private static abstract class NativeKeyboardUtils {
-        public abstract boolean isPressed(int keycode, int location);
-        public boolean isPressed(int keycode) {
-            return isPressed(keycode, KeyEvent.KEY_LOCATION_UNKNOWN);
-        }
-    }
-    
-    private static class W32KeyboardUtils extends NativeKeyboardUtils {
-        private int toNative(int code, int loc) {
-            if ((code >= KeyEvent.VK_A && code <= KeyEvent.VK_Z)
-                || (code >= KeyEvent.VK_0 && code <= KeyEvent.VK_9)) {
-                return code;
-            }
-            if (code == KeyEvent.VK_SHIFT) {
-                if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return WinUser.VK_RSHIFT; 
-                }
-                if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return WinUser.VK_LSHIFT; 
-                }
-                return WinUser.VK_SHIFT;
-            }
-            if (code == KeyEvent.VK_CONTROL) {
-                if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return WinUser.VK_RCONTROL; 
-                }
-                if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return WinUser.VK_LCONTROL; 
-                }
-                return WinUser.VK_CONTROL;
-            }
-            if (code == KeyEvent.VK_ALT) {
-                if ((loc & KeyEvent.KEY_LOCATION_RIGHT) != 0) {
-                    return WinUser.VK_RMENU; 
-                }
-                if ((loc & KeyEvent.KEY_LOCATION_LEFT) != 0) {
-                    return WinUser.VK_LMENU; 
-                }
-                return WinUser.VK_MENU;
-            }
-            return 0;
-        }
-        public boolean isPressed(int keycode, int location) {
-            User32 lib = User32.INSTANCE;
-            return (lib.GetAsyncKeyState(toNative(keycode, location)) & 0x8000) != 0;
-        }
-    }
-    private static class MacKeyboardUtils extends NativeKeyboardUtils {
-        public boolean isPressed(int keycode, int location) {
-            return false;
-        }
-    }
-    private static class X11KeyboardUtils extends NativeKeyboardUtils {
-        // TODO: fully map from X11 keycodes to java keycodes
-        // this is a minimal implementation
-        private int toKeySym(int code, int location) {
-            if (code >= KeyEvent.VK_A && code <= KeyEvent.VK_Z)
-                return X11.XK_a + (code - KeyEvent.VK_A);
-            if (code >= KeyEvent.VK_0 && code <= KeyEvent.VK_9)
-                return X11.XK_0 + (code - KeyEvent.VK_0);
-            if (code == KeyEvent.VK_SHIFT) {
-                if ((location & KeyEvent.KEY_LOCATION_RIGHT) != 0)
-                    return X11.XK_Shift_R;
-                return X11.XK_Shift_L;
-            }
-            if (code == KeyEvent.VK_CONTROL) {
-                if ((location & KeyEvent.KEY_LOCATION_RIGHT) != 0)
-                    return X11.XK_Control_R;
-                return X11.XK_Control_L;
-            }
-            if (code == KeyEvent.VK_ALT) {
-                if ((location & KeyEvent.KEY_LOCATION_RIGHT) != 0)
-                    return X11.XK_Alt_R;
-                return X11.XK_Alt_L;
-            }
-            if (code == KeyEvent.VK_META) {
-                if ((location & KeyEvent.KEY_LOCATION_RIGHT) != 0)
-                    return X11.XK_Meta_R;
-                return X11.XK_Meta_L;
-            }
-            return 0;
-        }
-        public boolean isPressed(int keycode, int location) {
-            X11 lib = X11.INSTANCE;
-            Display dpy = lib.XOpenDisplay(null);
-            if (dpy == null) {
-                throw new Error("Can't open X Display");
-            }
-            try {
-                byte[] keys = new byte[32];
-                // Ignore the return value
-                lib.XQueryKeymap(dpy, keys);
-                int keysym = toKeySym(keycode, location);
-                for (int code=5;code < 256;code++) {
-                    int idx = code / 8;
-                    int shift = code % 8;
-                    if ((keys[idx] & (1 << shift)) != 0) {
-                        int sym = lib.XKeycodeToKeysym(dpy, (byte)code, 0).intValue();
-                        if (sym == keysym)
-                            return true;
-                    }
-                }
-            }
-            finally {
-                lib.XCloseDisplay(dpy);
-            }
-            return false;
-        }
-    }
-}

jnalib/contrib/platform/src/com/sun/jna/platform/RasterRangesUtils.java

@@ -1,258 +0,0 @@
-/* Copyright (c) 2007 Olivier Chafik, All Rights Reserved
- * Copyright (c) 2008 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- */
-package com.sun.jna.platform;
-
-import java.awt.Rectangle;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.awt.image.DataBufferInt;
-import java.awt.image.MultiPixelPackedSampleModel;
-import java.awt.image.Raster;
-import java.awt.image.SampleModel;
-import java.awt.image.SinglePixelPackedSampleModel;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Methods that are useful to decompose a raster into a set of rectangles.
- * An occupied pixel has two possible meanings, depending on the raster : 
- * <ul>
- * <li>if the raster has an alpha layer, occupied means with alpha not null</li>
- * <li>if the raster doesn't have any alpha layer, occupied means not completely black</li>
- * </ul>
- * @author Olivier Chafik
- */
-public class RasterRangesUtils {
-    /// Masks used to isolate the current column in a set of 8 binary columns packed in a byte
-    private static final int[] subColMasks = new int[] {
-        0x0080, 0x0040, 0x0020, 0x0010,
-        0x0008, 0x0004, 0x0002, 0x0001
-    };
-
-    private static final Comparator<Object> COMPARATOR = new Comparator<Object>() {
-        public int compare(Object o1, Object o2) {
-            return ((Rectangle)o1).x - ((Rectangle)o2).x;
-        }
-    };
-
-    /**
-     * Abstraction of a sink for ranges.
-     */
-    public static interface RangesOutput {
-        /**
-         * Output a rectangular range.
-         * @param x x coordinate of the top-left corner of the range
-         * @param y y coordinate of the top-left corner of the range
-         * @param w width of the range
-         * @param h height of the range
-         * @return true if the output succeeded, false otherwise
-         */
-        boolean outputRange(int x, int y, int w, int h);
-    }
-
-    /**
-     * Outputs ranges of occupied pixels.
-     * In a raster that has an alpha layer, a pixel is occupied if its alpha value is not null.
-     * In a raster without alpha layer, a pixel is occupied if it is not completely black.
-     * @param raster image to be segmented in non black or non-transparent ranges
-     * @param out destination of the non null ranges
-     * @return true if the output succeeded, false otherwise
-     */
-    public static boolean outputOccupiedRanges(Raster raster, RangesOutput out) {
-        Rectangle bounds = raster.getBounds();
-        SampleModel sampleModel = raster.getSampleModel();
-        boolean hasAlpha = sampleModel.getNumBands() == 4;
-
-        // Try to use the underlying data array directly for a few common raster formats
-        if (raster.getParent() == null && bounds.x == 0 && bounds.y == 0) {
-            // No support for subraster (as obtained with Image.getSubimage(...))
-
-            DataBuffer data = raster.getDataBuffer();
-            if (data.getNumBanks() == 1) {
-                // There is always a single bank for all BufferedImage types, except maybe TYPE_CUSTOM
-
-                if (sampleModel instanceof MultiPixelPackedSampleModel) {
-                    MultiPixelPackedSampleModel packedSampleModel = (MultiPixelPackedSampleModel)sampleModel;
-                    if (packedSampleModel.getPixelBitStride() == 1) {
-                        // TYPE_BYTE_BINARY
-                        return outputOccupiedRangesOfBinaryPixels(((DataBufferByte)data).getData(), bounds.width, bounds.height, out);
-                    }
-                } else if (sampleModel instanceof SinglePixelPackedSampleModel) {
-                    if (sampleModel.getDataType() == DataBuffer.TYPE_INT) {
-                        // TYPE_INT_ARGB, TYPE_INT_ARGB_PRE, TYPE_INT_BGR or TYPE_INT_RGB
-                        return outputOccupiedRanges(((DataBufferInt)data).getData(), bounds.width, bounds.height, hasAlpha ? 0xff000000 : 0xffffff, out);
-                    }
-                    // TODO could easily handle cases of TYPE_USHORT_GRAY and TYPE_BYTE_GRAY.
-                }
-            }
-        }
-
-        // Fallback behaviour : copy pixels of raster
-        int[] pixels = raster.getPixels(0, 0, bounds.width, bounds.height, (int[])null);
-        return outputOccupiedRanges(pixels, bounds.width, bounds.height, hasAlpha ? 0xff000000 : 0xffffff, out);
-    }
-
-    /**
-     * Output the non-null values of a binary image as ranges of contiguous values.
-     * @param binaryBits byte-packed binary bits of an image
-     * @param w width of the image (in pixels)
-     * @param h height of the image
-     * @param out
-     * @return true if the output succeeded, false otherwise
-     */
-    public static boolean outputOccupiedRangesOfBinaryPixels(byte[] binaryBits, int w, int h, RangesOutput out) {
-        Set<Rectangle> rects = new HashSet<Rectangle>();
-        Set<Rectangle> prevLine = Collections.EMPTY_SET;
-        int scanlineBytes = binaryBits.length / h;
-        for (int row = 0; row < h; row++) {
-            Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
-            int rowOffsetBytes = row * scanlineBytes;
-            int startCol = -1;
-            // Look at each batch of 8 columns in this row
-            for (int byteCol = 0; byteCol < scanlineBytes; byteCol++) {
-                int firstByteCol = byteCol << 3;
-                byte byteColBits = binaryBits[rowOffsetBytes + byteCol];
-                if (byteColBits == 0) {
-                    // all 8 bits are zeroes
-                    if (startCol >= 0) {
-                        // end of current region
-                        curLine.add(new Rectangle(startCol, row, firstByteCol - startCol, 1));
-                        startCol = -1;
-                    }
-                } else if (byteColBits == 0xff) {
-                    // all 8 bits are ones
-                    if (startCol < 0) {
-                        // start of new region
-                        startCol = firstByteCol;
-                    }
-                } else {
-                    // mixed case : some bits are ones, others are zeroes
-                    for (int subCol = 0; subCol < 8; subCol++) {
-                        int col = firstByteCol | subCol;
-                        if ((byteColBits & subColMasks[subCol]) != 0) {
-                            if (startCol < 0) {
-                                // start of new region
-                                startCol = col;
-                            }
-                        } else {
-                            if (startCol >= 0) {
-                                // end of current region
-                                curLine.add(new Rectangle(startCol, row, col - startCol, 1));
-                                startCol = -1;
-                            }
-                        }
-                    }
-                }
-            }
-            if (startCol >= 0) {
-                // end of last region
-                curLine.add(new Rectangle(startCol, row, w - startCol, 1));
-            }
-            Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
-            rects.addAll(unmerged);
-            prevLine = curLine;
-        }
-        // Add anything left over
-        rects.addAll(prevLine);
-        for (Iterator<Rectangle> i=rects.iterator();i.hasNext();) {
-            Rectangle r = i.next();
-            if (!out.outputRange(r.x, r.y, r.width, r.height)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Output the occupied values of an integer-pixels image as ranges of contiguous values.
-     * A pixel is considered occupied if the bitwise AND of its integer value with the provided occupationMask is not null.
-     * @param pixels integer values of the pixels of an image
-     * @param w width of the image (in pixels)
-     * @param h height of the image
-     * @param occupationMask mask used to select which bits are used in a pixel to check its occupied status. 0xff000000 would only take the alpha layer into account, for instance.
-     * @param out where to output all the contiguous ranges of non occupied pixels
-     * @return true if the output succeeded, false otherwise
-     */
-    public static boolean outputOccupiedRanges(int[] pixels, int w, int h, int occupationMask, RangesOutput out) {
-        Set<Rectangle> rects = new HashSet<Rectangle>();
-        Set<Rectangle> prevLine = Collections.EMPTY_SET;
-        for (int row = 0; row < h; row++) {
-            Set<Rectangle> curLine = new TreeSet<Rectangle>(COMPARATOR);
-            int idxOffset = row * w;
-            int startCol = -1;
-
-            for (int col = 0; col < w; col++) {
-                if ((pixels[idxOffset + col] & occupationMask) != 0) {
-                    if (startCol < 0) {
-                        startCol = col;
-                    }
-                } else {
-                    if (startCol >= 0) {
-                        // end of current region
-                        curLine.add(new Rectangle(startCol, row, col-startCol, 1));
-                        startCol = -1;
-                    }
-                }
-            }
-            if (startCol >= 0) {
-                // end of last region of current row
-                curLine.add(new Rectangle(startCol, row, w-startCol, 1));
-            }
-            Set<Rectangle> unmerged = mergeRects(prevLine, curLine);
-            rects.addAll(unmerged);
-            prevLine = curLine;
-        }
-        // Add anything left over
-        rects.addAll(prevLine);
-        for (Iterator<Rectangle> i=rects.iterator();i.hasNext();) {
-            Rectangle r = i.next();
-            if (!out.outputRange(r.x, r.y, r.width, r.height)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static Set<Rectangle> mergeRects(Set<Rectangle> prev, Set<Rectangle> current) {
-        Set<Rectangle> unmerged = new HashSet<Rectangle>(prev);
-        if (!prev.isEmpty() && !current.isEmpty()) {
-            Rectangle[] pr = prev.toArray(new Rectangle[prev.size()]);
-            Rectangle[] cr = current.toArray(new Rectangle[current.size()]);
-            int ipr = 0;
-            int icr = 0;
-            while (ipr < pr.length && icr < cr.length) {
-                while (cr[icr].x < pr[ipr].x) {
-                    if (++icr == cr.length) {
-                        return unmerged;
-                    }
-                }
-                if (cr[icr].x == pr[ipr].x && cr[icr].width == pr[ipr].width) {
-                    unmerged.remove(pr[ipr]);
-                    cr[icr].y = pr[ipr].y;
-                    cr[icr].height = pr[ipr].height + 1;
-                    ++icr;
-                }
-                else {
-                    ++ipr;
-                }
-            }
-        }
-        return unmerged;
-    }
-
-}

jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DragHandler.java

@@ -1,533 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform.dnd;
-
-import java.awt.AlphaComposite;
-import java.awt.Component;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.Image;
-import java.awt.Point;
-import java.awt.Transparency;
-import java.awt.datatransfer.Transferable;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DragGestureEvent;
-import java.awt.dnd.DragGestureListener;
-import java.awt.dnd.DragSource;
-import java.awt.dnd.DragSourceContext;
-import java.awt.dnd.DragSourceDragEvent;
-import java.awt.dnd.DragSourceDropEvent;
-import java.awt.dnd.DragSourceEvent;
-import java.awt.dnd.DragSourceListener;
-import java.awt.dnd.DragSourceMotionListener;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.awt.dnd.InvalidDnDOperationException;
-import java.awt.event.InputEvent;
-import java.awt.image.BufferedImage;
-
-import javax.swing.Icon;
-import javax.swing.JColorChooser;
-import javax.swing.JFileChooser;
-import javax.swing.JList;
-import javax.swing.JTable;
-import javax.swing.JTree;
-import javax.swing.text.JTextComponent;
-
-/** Provides simplified drag handling for a component.  
- * Usage:<br>
- * <pre><code>
- * int actions = DnDConstants.MOVE_OR_COPY;
- * Component component = ...;
- * DragHandler handler = new DragHandler(component, actions);
- * </code></pre>
- * <ul>
- * <li>Supports painting an arbitrary {@link Icon} with transparency to
- * represent the item being dragged (restricted to the {@link java.awt.Window} 
- * of the drag source if the platform doesn't support drag images).
- * <li>Disallow starting a drag if the user requests an unsupported action.
- * <li>Adjusts the cursor on drags with no modifier for which the default action
- * is disallowed but where one or more non-default actions are allowed, e.g. a 
- * drag (with no modifiers) to a target which supports "link" should change the 
- * cursor to "link" (prior to 1.6, the JRE behavior is to display a 
- * "not allowed" cursor, even though the action actually depends on how the 
- * drop target responds).  
- * <a href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4869264">
- * The bug</a> is fixed in java 1.6.
- * <li>Disallow drops to targets if the non-default (user-requested) action 
- * is not supported by the target, e.g. the user requests a "copy" when the 
- * target only supports "move".  This is generally the responsibility of the
- * drop handler, which decides whether or not to accept a drag.  The DragHandler
- * provides static modifier state information since the drop handler doesn't
- * have access to it.
- * </ul>
- * NOTE: Fundamentally, the active action is determined by the drop handler
- * in {@link DropTargetDragEvent#acceptDrag}, but often client code
- * simply relies on {@link DropTargetDragEvent#getDropAction}.
- */
-//TODO: separate into the the following drag pieces:
-// * default cursor changing behavior fix (fixed in jre1.6) (global DSL)
-// * drag unselected item (fixed in 1.6, flag in 1.5.0.05+) bug not an issue w/DragHandler
-// * multi-selection drag workaround (if not using swing drag gesture recognizer)
-//   proper multi-selection drag is provided for swing dnd as of 1.4
-// (use swing drag gesture recognizer if possible?) DSL+mouse listener
-//TODO: identify overlap with default Swing support + TransferHandler
-// * TransferHandler doesn't have drop location information (included in 1.6)
-// * SwingDropTarget allows listeners, so target highlighting is possible
-
-//NOTE: acceptDrag(int) is simply indicates the drag is accepted; the action
-// value doesn't get propagated anywhere, it's certainly not communicated to 
-// the drag source
-//MAYBE: should Transferable/Icon provision be a separate interface
-//(i.e. TransferHandler)?  only if the rest of the drag handler is constant and 
-// only the image needs to change (for standard components, e.g. tree cells, 
-// table cells, etc.)
-
-public abstract class DragHandler 
-    implements DragSourceListener, DragSourceMotionListener, DragGestureListener {
-
-    /** Default maximum size for ghosted images. */
-    public static final Dimension MAX_GHOST_SIZE = new Dimension(250, 250);
-
-    /** Default transparency for ghosting. */
-    public static final float DEFAULT_GHOST_ALPHA = 0.5f;
-
-    /** {@link #getModifiers} returns this value when the current
-     * modifiers state is unknown.
-     */
-    public static final int UNKNOWN_MODIFIERS = -1;
-    
-    /** {@link #getTransferable} returns this value when 
-     * the current {@link Transferable} is unknown.
-     */
-    public static final Transferable UNKNOWN_TRANSFERABLE = null;
-    /** Convenience to reference {@link DnDConstants#ACTION_MOVE}. */
-    protected static final int MOVE = DnDConstants.ACTION_MOVE;
-    /** Convenience to reference {@link DnDConstants#ACTION_COPY}. */
-    protected static final int COPY = DnDConstants.ACTION_COPY;
-    /** Convenience to reference {@link DnDConstants#ACTION_LINK}. */
-    protected static final int LINK = DnDConstants.ACTION_LINK;
-    /** Convenience to reference {@link DnDConstants#ACTION_NONE}. */
-    protected static final int NONE = DnDConstants.ACTION_NONE;
-    
-    // TODO: w32 explorer: link=alt or ctrl+shift, copy=ctrl or shift
-    // w32 others: copy=ctrl
-    /** Modifier mask for a user-requested move. */
-    static final int MOVE_MASK = InputEvent.SHIFT_DOWN_MASK;
-    static final boolean OSX = 
-        System.getProperty("os.name").toLowerCase().indexOf("mac") != -1;
-    /** Modifier mask for a user-requested copy. */
-    static final int COPY_MASK = 
-        OSX ? InputEvent.ALT_DOWN_MASK : InputEvent.CTRL_DOWN_MASK;
-    /** Modifier mask for a user-requested link. */
-    static final int LINK_MASK =
-        OSX ? InputEvent.ALT_DOWN_MASK|InputEvent.META_DOWN_MASK 
-            : InputEvent.CTRL_DOWN_MASK|InputEvent.SHIFT_DOWN_MASK;
-    /** Modifier mask for any user-requested action. */
-    static final int KEY_MASK =
-        InputEvent.ALT_DOWN_MASK|InputEvent.META_DOWN_MASK
-        |InputEvent.CTRL_DOWN_MASK|InputEvent.SHIFT_DOWN_MASK
-        |InputEvent.ALT_GRAPH_DOWN_MASK;
-
-    private static int modifiers = UNKNOWN_MODIFIERS;
-    private static Transferable transferable = UNKNOWN_TRANSFERABLE;
-    
-    /** Used to communicate modifier state to {@link DropHandler}.  Note that
-     * this field will only be accurate when a {@link DragHandler} in
-     * the same VM started the drag.  Otherwise, {@link #UNKNOWN_MODIFIERS}
-     * will be returned.
-     */
-    static int getModifiers() {
-        return modifiers;
-    }
-    
-    /** Used to communicate the current {@link Transferable} during a drag, 
-     * if available.  Work around absence of access to the data when dragging 
-     * pre-1.5. 
-     */
-    public static Transferable getTransferable(DropTargetEvent e) {
-        if (e instanceof DropTargetDragEvent) {
-            try {
-                // getTransferable is available during drag only on 1.5+
-                return (Transferable)
-                    e.getClass().getMethod("getTransferable", (Class[])null).invoke(e, (Object[])null);
-            }
-            catch(Exception ex) {
-                // Method not available
-            }
-        }
-        else if (e instanceof DropTargetDropEvent) {
-            return ((DropTargetDropEvent)e).getTransferable();
-        }
-        return transferable;
-    }
-    
-    private int supportedActions;
-    private boolean fixCursor = true;
-    private Component dragSource;
-    private GhostedDragImage ghost;
-    private Point imageOffset;
-	private Dimension maxGhostSize = MAX_GHOST_SIZE;
-    private float ghostAlpha = DEFAULT_GHOST_ALPHA;
-
-    /** Enable drags from the given component, supporting the actions in
-     * the given action mask.
-     */
-    protected DragHandler(Component dragSource, int actions) {
-        this.dragSource = dragSource;
-        this.supportedActions = actions;
-        try {
-            String alpha = System.getProperty("DragHandler.alpha");
-            if (alpha != null) {
-                try {
-                    ghostAlpha = Float.parseFloat(alpha);
-                }
-                catch(NumberFormatException e) { }
-            }
-            String max = System.getProperty("DragHandler.maxDragImageSize");
-            if (max != null) {
-                String[] size = max.split("x");
-                if (size.length == 2) {
-                    try {
-                        maxGhostSize = new Dimension(Integer.parseInt(size[0]),
-                                                     Integer.parseInt(size[1]));
-                    }
-                    catch(NumberFormatException e) { }
-                }
-            }
-        }
-        catch(SecurityException e) { }
-        // Avoid having more than one gesture recognizer active
-        disableSwingDragSupport(dragSource);
-        DragSource src = DragSource.getDefaultDragSource();
-        src.createDefaultDragGestureRecognizer(dragSource, supportedActions, this);
-    }
-
-    private void disableSwingDragSupport(Component comp) {
-        if (comp instanceof JTree) {
-            ((JTree)comp).setDragEnabled(false);
-        }
-        else if (comp instanceof JList) {
-            ((JList)comp).setDragEnabled(false);
-        }
-        else if (comp instanceof JTable) {
-            ((JTable)comp).setDragEnabled(false);
-        }
-        else if (comp instanceof JTextComponent) {
-            ((JTextComponent)comp).setDragEnabled(false);
-        }
-        else if (comp instanceof JColorChooser) {
-            ((JColorChooser)comp).setDragEnabled(false);
-        }
-        else if (comp instanceof JFileChooser) {
-            ((JFileChooser)comp).setDragEnabled(false);
-        }
-    }
-
-    /** Override to control whether a drag is started.  The default 
-     * implementation disallows the drag if the user is applying modifiers
-     * and the user-requested action is not supported.  
-     */
-    protected boolean canDrag(DragGestureEvent e) {
-        int mods = e.getTriggerEvent().getModifiersEx() & KEY_MASK;
-        if (mods == MOVE_MASK)
-            return (supportedActions & MOVE) != 0;
-        if (mods == COPY_MASK)
-            return (supportedActions & COPY) != 0;
-        if (mods == LINK_MASK)
-            return (supportedActions & LINK) != 0;
-        return true;
-    }
-
-    /** Update the modifiers hint. */
-    protected void setModifiers(int mods) {
-        modifiers = mods;
-    }
-    /** Override to provide an appropriate {@link Transferable} representing
-     * the data being dragged.
-     */
-    protected abstract Transferable getTransferable(DragGestureEvent e);
-
-    /** Override this to provide a custom image.  The {@link Icon}
-     * returned by this method by default is <code>null</code>, which results
-     * in no drag image.
-     * @param srcOffset set this to be the offset from the drag source 
-     * component's upper left corner to the image's upper left corner.  
-     * For example, when dragging a row from a list, the offset would be the 
-     * row's bounding rectangle's (x,y) coordinate.<p>
-     * The default value is (0,0), so if unchanged, the image is will
-     * use the same origin as the drag source component.  
-     */
-    protected Icon getDragIcon(DragGestureEvent e, Point srcOffset) {
-        return null; 
-    }
-    
-    /** Override to perform any decoration of the target at the start of a drag, 
-     * if desired. 
-     */
-    protected void dragStarted(DragGestureEvent e) { }
-
-    /** Called when a user drag gesture is recognized.  This method is 
-     * responsible for initiating the drag operation.
-     */
-    public void dragGestureRecognized(DragGestureEvent e) {
-        if ((e.getDragAction() & supportedActions) != 0
-            && canDrag(e)) {
-            setModifiers(e.getTriggerEvent().getModifiersEx() & KEY_MASK);
-            Transferable transferable = getTransferable(e);
-            if (transferable == null)
-                return;
-            try {
-                Point srcOffset = new Point(0, 0);
-                Icon icon = getDragIcon(e, srcOffset);
-                Point origin = e.getDragOrigin();
-                // offset of the image origin from the cursor
-                imageOffset = new Point(srcOffset.x - origin.x,
-                                        srcOffset.y - origin.y);
-                Icon dragIcon = scaleDragIcon(icon, imageOffset);
-                Cursor cursor = null;
-                if (dragIcon != null && DragSource.isDragImageSupported()) {
-                    GraphicsConfiguration gc = e.getComponent().getGraphicsConfiguration();
-                    e.startDrag(cursor, createDragImage(gc, dragIcon), 
-                                imageOffset, transferable, this);
-                }
-                else {
-                    if (dragIcon != null) {
-                        Point screen = dragSource.getLocationOnScreen();
-                        screen.translate(origin.x, origin.y);
-                        Point cursorOffset = new Point(-imageOffset.x, -imageOffset.y);
-                        ghost = new GhostedDragImage(dragSource, dragIcon, 
-                                                     getImageLocation(screen), cursorOffset);
-                        ghost.setAlpha(ghostAlpha);
-                    }
-                    e.startDrag(cursor, transferable, this);
-                }
-                dragStarted(e);
-                moved = false;
-                e.getDragSource().addDragSourceMotionListener(this);
-                DragHandler.transferable = transferable;
-            }
-            catch (InvalidDnDOperationException ex) {
-                if (ghost != null) {
-                    ghost.dispose();
-                    ghost = null;
-                }
-            }
-        }
-    }
-
-    /** Reduce the size of the given drag icon, if appropriate.  When using
-     * a smaller drag icon, we also need to adjust the cursor offset within
-     * the icon.
-     */
-    protected Icon scaleDragIcon(Icon icon, Point imageOffset) {
-        /*
-        if (icon != null && maxGhostSize != null) {
-            if (icon.getIconWidth() > maxGhostSize.width
-                || icon.getIconHeight() > maxGhostSize.height) {
-                Icon scaled = new ScaledIcon(icon, maxGhostSize.width, 
-                                             maxGhostSize.height);
-                double scale = (double)scaled.getIconWidth()/icon.getIconWidth();
-                imageOffset.x *= scale;
-                imageOffset.y *= scale;
-                return scaled;
-            }
-        }*/
-        return icon;
-    }
-
-    /** Create an image from the given icon.  The image is provided to the
-     * native handler if drag images are supported natively.
-     */
-    protected Image createDragImage(GraphicsConfiguration gc, Icon icon) {
-        int w = icon.getIconWidth();
-        int h = icon.getIconHeight();
-        BufferedImage image = gc.createCompatibleImage(w, h, Transparency.TRANSLUCENT);
-        Graphics2D g = (Graphics2D)image.getGraphics();
-        g.setComposite(AlphaComposite.Clear);
-        g.fillRect(0, 0, w, h);
-        // Ignore pixels in the buffered image
-        g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC, ghostAlpha));
-        icon.paintIcon(dragSource, g, 0, 0);
-        g.dispose();
-        return image;
-    }
-
-    /** Reduce a multiply-set bit mask to a single bit. */
-    private int reduce(int actions) {
-        if ((actions & MOVE) != 0 && actions != MOVE) {
-            return MOVE;
-        }
-        else if ((actions & COPY) != 0 && actions != COPY) {
-            return COPY;
-        }
-        return actions;
-    }
-
-    protected Cursor getCursorForAction(int actualAction) {
-        switch(actualAction) {
-        case MOVE: 
-            return DragSource.DefaultMoveDrop; 
-        case COPY:
-            return DragSource.DefaultCopyDrop;
-        case LINK: 
-            return DragSource.DefaultLinkDrop;
-        default:
-            return DragSource.DefaultMoveNoDrop;
-        }
-    }
-
-    /** Returns the first available action supported by source and target. */
-    protected int getAcceptableDropAction(int targetActions) {
-        return reduce(supportedActions & targetActions);
-    }
-    
-    /** Get the currently requested drop action. */
-    protected int getDropAction(DragSourceEvent ev) {
-        if (ev instanceof DragSourceDragEvent) {
-            DragSourceDragEvent e = (DragSourceDragEvent)ev;
-            return e.getDropAction();
-        }
-        if (ev instanceof DragSourceDropEvent) {
-            return ((DragSourceDropEvent)ev).getDropAction();
-        }
-        return NONE;
-    }
-
-    /** Pick a different drop action if the target doesn't support the current
-     * one and there are no modifiers.
-     */
-    protected int adjustDropAction(DragSourceEvent ev) {
-        int action = getDropAction(ev);
-        if (ev instanceof DragSourceDragEvent) {
-            DragSourceDragEvent e = (DragSourceDragEvent)ev;
-            if (action == NONE) {
-                int mods = e.getGestureModifiersEx() & KEY_MASK;
-                if (mods == 0) {
-                    action = getAcceptableDropAction(e.getTargetActions());
-                }
-            }
-        }
-        return action;
-    }
-    
-    protected void updateCursor(DragSourceEvent ev) {
-        if (!fixCursor)
-            return;
-        Cursor cursor = getCursorForAction(adjustDropAction(ev));
-        ev.getDragSourceContext().setCursor(cursor);
-    }
-    
-    static String actionString(int action) {
-        switch(action) {
-        case MOVE: return "MOVE";
-        case MOVE|COPY: return "MOVE|COPY";
-        case MOVE|LINK: return "MOVE|LINK";
-        case MOVE|COPY|LINK: return "MOVE|COPY|LINK";
-        case COPY: return "COPY";
-        case COPY|LINK: return "COPY|LINK";
-        case LINK: return "LINK";
-        default: return "NONE";
-        }
-    }
-    private String lastAction;
-    private void describe(String type, DragSourceEvent e) {
-        if (false) {
-            DragSourceContext ds = e.getDragSourceContext();
-            String msg = "drag: " + type;
-            if (e instanceof DragSourceDragEvent) {
-                DragSourceDragEvent ev = (DragSourceDragEvent)e;
-                msg += ": src=" + actionString(ds.getSourceActions())
-                    + " usr=" + actionString(ev.getUserAction())
-                    + " tgt=" + actionString(ev.getTargetActions())
-                    + " act=" + actionString(ev.getDropAction())
-                    + " mods=" + ev.getGestureModifiersEx();
-            }
-            else {
-                msg += ": e=" + e;
-            }
-            if (!msg.equals(lastAction)) {
-                System.out.println(lastAction = msg);
-            }
-        }
-    }
-
-    public void dragDropEnd(DragSourceDropEvent e) {
-        describe("end", e);
-        setModifiers(UNKNOWN_MODIFIERS);
-        transferable = UNKNOWN_TRANSFERABLE;
-        if (ghost != null) {
-            if (e.getDropSuccess()) { 
-                ghost.dispose();
-            }
-            else {
-                ghost.returnToOrigin();
-            }
-            ghost = null;
-        }
-        DragSource src = e.getDragSourceContext().getDragSource();
-        src.removeDragSourceMotionListener(this);
-        moved = false;
-    }
-
-    private Point getImageLocation(Point where) {
-        where.translate(imageOffset.x, imageOffset.y);
-        return where;
-    }
-    
-    public void dragEnter(DragSourceDragEvent e) {
-        describe("enter", e);
-        if (ghost != null) {
-            ghost.move(getImageLocation(e.getLocation()));
-        }
-        updateCursor(e);
-    }
-
-    // bug workaround; need to skip initial dragMouseMoved event,
-    // which has reports "0" for the available target actions (1.4+?)
-    // filed a bug for this
-    private boolean moved;
-    public void dragMouseMoved(DragSourceDragEvent e) {
-        describe("move", e);
-        if (ghost != null) {
-            ghost.move(getImageLocation(e.getLocation()));
-        }
-        if (moved) 
-            updateCursor(e);
-        moved = true;
-    }
-
-    public void dragOver(DragSourceDragEvent e) {
-        describe("over", e);
-        if (ghost != null) {
-            ghost.move(getImageLocation(e.getLocation()));
-        }
-        updateCursor(e);
-    }
-
-    public void dragExit(DragSourceEvent e) {
-        describe("exit", e);
-    }
-
-    public void dropActionChanged(DragSourceDragEvent e) {
-        describe("change", e);
-        setModifiers(e.getGestureModifiersEx() & KEY_MASK);
-        if (ghost != null) {
-            ghost.move(getImageLocation(e.getLocation()));
-        }
-        updateCursor(e);
-    }
-}

jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropHandler.java

@@ -1,393 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform.dnd;
-
-import java.awt.Component;
-import java.awt.Point;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.awt.dnd.DnDConstants;
-import java.awt.dnd.DropTarget;
-import java.awt.dnd.DropTargetContext;
-import java.awt.dnd.DropTargetDragEvent;
-import java.awt.dnd.DropTargetDropEvent;
-import java.awt.dnd.DropTargetEvent;
-import java.awt.dnd.DropTargetListener;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/** Provides simplified drop handling for a component.
- * Usage:<br>    
- * <pre><code>
- * int actions = DnDConstants.MOVE_OR_COPY;
- * Component component = ...;
- * DropHandler handler = new DropHandler(component, actions);
- * </code></pre>
- * <p>
- * <ul>
- * <li>Accept drops where the action is the default (i.e. no modifiers) but
- * the intersection of source and target actions is <i>not</i> the default.
- * Doing so allows the source to adjust the cursor appropriately.
- * <li>Refuse drops where the user modifiers request an action that is not
- * supported (this works for all cases except when the drag source is not
- * a {@link DragHandler} and the user explicitly requests a MOVE operation;
- * this is indistinguishable from a drag with no modifiers unless we have
- * access to the key modifiers, which {@link DragHandler} provides).
- * <li>Drops may be refused based on data flavor, location, intended drop
- * action, or any combination of those, by overriding {@link #canDrop}.
- * <li>Custom decoration of the drop area may be performed in 
- * {@link #paintDropTarget(DropTargetEvent, int, Point)} or by providing
- * a {@link DropTargetPainter}.
- * </ul>
- * 
- * The method {@link #getDropAction(DropTargetEvent)} follows these steps to
- * determine the appropriate action (if any).  
- * <ul>
- * <li>{@link #isSupported(DataFlavor[])} determines if there are any supported 
- * flavors
- * <li>{@link #getDropActionsForFlavors(DataFlavor[])} reduces the supported 
- * actions based on available flavors.  For instance, a text field for file 
- * paths might support {@link DnDConstants#ACTION_COPY_OR_MOVE} on a plain 
- * string, but {@link DnDConstants#ACTION_LINK} might be the only action 
- * supported on a file.
- * <li>{@link #getDropAction(DropTargetEvent, int, int, int)} relax the action
- * if it's the default, or restrict it for user requested actions.
- * <li>{@link #canDrop(DropTargetEvent, int, Point)} change the action based on 
- * the location in the drop target component, or any other criteria.
- * </ul>
- * 
- * Override {@link #drop(DropTargetDropEvent, int)} to handle the drop.  
- * You should invoke {@link DropTargetDropEvent#dropComplete} as soon
- * as the {@link Transferable} data is obtained, to avoid making the DnD
- * operation look suspended.
- * 
- * @see DragHandler
- * @author twall
- */
-// NOTE: you could probably make one of these handlers serve several targets, 
-// but for simplicity, keep the mapping 1-1-1 handler/droptarget/component
-// TODO: look into making use of the existing 
-// Transferable.SwingDropTarget on JComponent instances instead of
-// creating a new DropTarget; we can add self as a listener; probably would
-// want to remove the default TransferHandler.DropHandler, which uses
-// the TransferHandler to drop
-public abstract class DropHandler implements DropTargetListener {
-
-    private int acceptedActions;
-    private List<DataFlavor> acceptedFlavors;
-    private DropTarget dropTarget;
-    private boolean active = true;
-    private DropTargetPainter painter;
-    
-    /** Create a handler that allows the given set of actions.  If using
-     * this constructor, you will need to override {@link #isSupported} to
-     * indicate which data flavors are allowed.
-     */
-    public DropHandler(Component c, int acceptedActions) {
-        this(c, acceptedActions, new DataFlavor[0]);
-    }
-    
-    /** Enable handling of drops, indicating what actions and flavors are
-     * acceptable.  
-     * @param c The component to receive drops
-     * @param acceptedActions Allowed actions for drops
-     * @param acceptedFlavors Allowed data flavors for drops
-     * @see #isSupported
-     */
-    public DropHandler(final Component c, int acceptedActions, DataFlavor[] acceptedFlavors) {
-        this(c, acceptedActions, acceptedFlavors, null);
-    }
-    
-    /** Enable handling of drops, indicating what actions and flavors are
-     * acceptable, and providing a painter for drop target feedback.
-     * @param c The component to receive drops
-     * @param acceptedActions Allowed actions for drops
-     * @param acceptedFlavors Allowed data flavors for drops
-     * @param painter Painter to handle drop target feedback
-     * @see #paintDropTarget
-     */
-    public DropHandler(final Component c, int acceptedActions, 
-                       DataFlavor[] acceptedFlavors, DropTargetPainter painter) {
-        this.acceptedActions = acceptedActions;
-        this.acceptedFlavors = Arrays.asList(acceptedFlavors);
-        this.painter = painter;
-        dropTarget = new DropTarget(c, acceptedActions, this, active);
-    }
-    
-    protected DropTarget getDropTarget() {
-        return dropTarget;
-    }
-
-    /** Whether this drop target is active. */
-    public boolean isActive() { return active; }
-    
-    /** Set whether this handler (and thus its drop target) will accept
-     * any drops.
-     */ 
-    public void setActive(boolean active) {
-        this.active = active;
-        if (dropTarget != null) {
-            dropTarget.setActive(active);
-        }
-    }
-
-    /** Indicate the actions available for the given list of data flavors.
-     * Override this method if the acceptable drop actions depend
-     * on the currently available {@link DataFlavor}.  The default returns
-     * the accepted actions passed into the constructor.
-     * @param dataFlavors currently available flavors
-     * @see #getDropAction(DropTargetEvent, int, int, int)
-     * @see #canDrop(DropTargetEvent, int, Point)
-     */
-    protected int getDropActionsForFlavors(DataFlavor[] dataFlavors) {
-        return acceptedActions;
-    }
-    
-    /** Calculate the effective action.  The default implementation 
-     * checks whether any {@link DataFlavor}s are supported, and if so,
-     * will change the current action from {@link DnDConstants#ACTION_NONE} to 
-     * something in common between the source and destination.  Refuse 
-     * user-requested actions if they are not supported (rather than silently 
-     * accepting a non-user-requested action, which is the Java's DnD default 
-     * behavior).  The drop action is forced to {@link DnDConstants#ACTION_NONE} 
-     * if there is no supported data flavor.<p>
-     * @see #isSupported(DataFlavor[])
-     * @see #getDropActionsForFlavors
-     * @see #getDropAction(DropTargetEvent, int, int, int)
-     * @see #canDrop(DropTargetEvent, int, Point)
-     */
-    protected int getDropAction(DropTargetEvent e) {
-        int currentAction = DragHandler.NONE;
-        int sourceActions = DragHandler.NONE;
-        Point location = null;
-        DataFlavor[] flavors = new DataFlavor[0];
-        if (e instanceof DropTargetDragEvent) {
-            DropTargetDragEvent ev = (DropTargetDragEvent)e;
-            currentAction = ev.getDropAction();
-            sourceActions = ev.getSourceActions();
-            flavors = ev.getCurrentDataFlavors();
-            location = ev.getLocation();
-        }
-        else if (e instanceof DropTargetDropEvent) {
-            DropTargetDropEvent ev = (DropTargetDropEvent)e;
-            currentAction = ev.getDropAction();
-            sourceActions = ev.getSourceActions();
-            flavors = ev.getCurrentDataFlavors();
-            location = ev.getLocation();
-        }
-        if (isSupported(flavors)) {
-            int availableActions = getDropActionsForFlavors(flavors);
-            currentAction = getDropAction(e, currentAction, sourceActions, availableActions);
-            if (currentAction != DragHandler.NONE) {
-                if (canDrop(e, currentAction, location)) {
-                    return currentAction;
-                }
-            }
-        }
-        return DragHandler.NONE;
-    }
-
-    /* Adjust the drop action depending on whether the
-     * current action is the default or a specific user-requested action.
-     * The default implementation will change the current action from 
-     * {@link DnDConstants#ACTION_NONE} if there are actions in 
-     * common between the source and destination.  It will refuse user-requested
-     * actions if they are not supported (rather than silently accepting
-     * a non-user-requested action, which is the behavior of Swing's default
-     * drop handlers).<p>
-     * You can override this method if you wish to adjust the action based
-     * on the the drag location; if you wish to deny drops based on location,
-     * override {@link #canDrop} instead.  If you wish to adjust
-     * the action based on the available data flavors, override
-     * {@link #getDropActionsForFlavor} instead.
-     * @see #getDropActionsForFlavor
-     * @see #canDrop(DropTargetEvent, int, Point)
-     */
-    protected int getDropAction(DropTargetEvent e, int currentAction, 
-                                int sourceActions, int acceptedActions) {
-        boolean modifiersActive = modifiersActive(currentAction);
-        if ((currentAction & acceptedActions) == DragHandler.NONE
-            && !modifiersActive) {
-            int action = acceptedActions & sourceActions;
-            currentAction = action;
-        }
-        else if (modifiersActive) {
-            int action = currentAction & acceptedActions & sourceActions;
-            if (action != currentAction) {
-                currentAction = action;
-            }
-        }
-        return currentAction;
-    }
-    
-    /** Returns whether there are key modifiers active , 
-     * or false if they can't be determined.
-     * We use the DragHandler hint, if available, or fall back to whether
-     * the drop action is other than the default (move).
-     */
-    protected boolean modifiersActive(int dropAction) {
-        int mods = DragHandler.getModifiers();
-        if (mods == DragHandler.UNKNOWN_MODIFIERS) {
-            if (dropAction == DragHandler.LINK
-                || dropAction == DragHandler.COPY) {
-                return true;
-            }
-            // Can't (yet) distinguish between a forced and a default move
-            // without help from DragHandler
-            return false;
-        }
-        return mods != 0;
-    }
-
-    private String lastAction;
-    private void describe(String type, DropTargetEvent e) {
-        if (false) {
-            String msg = "drop: " + type;
-            if (e instanceof DropTargetDragEvent) {
-                DropTargetContext dtc = e.getDropTargetContext();
-                DropTarget dt = dtc.getDropTarget();
-                DropTargetDragEvent ev = (DropTargetDragEvent)e;
-                msg += ": src=" + DragHandler.actionString(ev.getSourceActions())
-                    + " tgt=" + DragHandler.actionString(dt.getDefaultActions())
-                    + " act=" + DragHandler.actionString(ev.getDropAction());
-            }
-            else if (e instanceof DropTargetDropEvent) {
-                DropTargetContext dtc = e.getDropTargetContext();
-                DropTarget dt = dtc.getDropTarget();
-                DropTargetDropEvent ev = (DropTargetDropEvent)e;
-                msg += ": src=" + DragHandler.actionString(ev.getSourceActions())
-                + " tgt=" + DragHandler.actionString(dt.getDefaultActions())
-                + " act=" + DragHandler.actionString(ev.getDropAction());
-            }
-            if (!msg.equals(lastAction)) {
-                System.out.println(lastAction = msg);
-            }
-        }
-    }
-    
-    /** Accept or reject the drag represented by the given event.  Returns
-     * the action determined by {@link #getDropAction(DropTargetEvent)}.
-     */
-    protected int acceptOrReject(DropTargetDragEvent e) {
-        int action = getDropAction(e);
-        if (action != DragHandler.NONE) {
-            // NOTE: the action argument (as of 1.5+) is only passed
-            // to the DropTargetContextPeer, *not* the drag source
-            e.acceptDrag(action);
-        }
-        else {
-            e.rejectDrag();
-        }
-        return action;
-    }
-
-    public void dragEnter(DropTargetDragEvent e) {
-        describe("enter(tgt)", e);
-        int action = acceptOrReject(e);
-        paintDropTarget(e, action, e.getLocation());
-    }
-
-    public void dragOver(DropTargetDragEvent e) {
-        describe("over(tgt)", e);
-        int action = acceptOrReject(e);
-        paintDropTarget(e, action, e.getLocation());
-    }
-
-    public void dragExit(DropTargetEvent e) {
-        describe("exit(tgt)", e);
-        paintDropTarget(e, DragHandler.NONE, null);
-    }
-
-    public void dropActionChanged(DropTargetDragEvent e) {
-        describe("change(tgt)", e);
-        int action = acceptOrReject(e);
-        paintDropTarget(e, action, e.getLocation());
-    }
-
-    /** Indicates the user has initiated a drop.  The default performs all
-     * standard drop validity checking and handling, then invokes
-     * {@link #drop(DropTargetDropEvent,int)} if the drop looks acceptable.
-     */
-    public void drop(DropTargetDropEvent e) {
-        describe("drop(tgt)", e);
-        int action = getDropAction(e);
-        if (action != DragHandler.NONE) {
-            e.acceptDrop(action);
-            try {
-                drop(e, action);
-                // Just in case this hasn't been done yet
-                e.dropComplete(true);
-            }
-            catch (Exception ex) {
-                e.dropComplete(false);
-            }
-        }
-        else {
-            e.rejectDrop();
-        }
-        paintDropTarget(e, DragHandler.NONE, e.getLocation());
-    }
-    
-    /** Return whether any of the flavors in the given list are accepted. 
-     * The list is compared against the accepted list provided in the
-     * constructor.
-     */
-    protected boolean isSupported(DataFlavor[] flavors) {
-        Set<DataFlavor> set = new HashSet<DataFlavor>(Arrays.asList(flavors));
-        set.retainAll(acceptedFlavors);
-        return !set.isEmpty();
-    }
-
-    /** Update the appearance of the target component.  Normally the decoration
-     * should be painted only if the event is an instance of 
-     * {@link DropTargetDragEvent} with an action that is not 
-     * {@link DragHandler#NONE}.  Otherwise the decoration should be removed
-     * or hidden.
-     * <p>
-     * For an easy way to highlight the drop target, consider using a single
-     * instance of <code>AbstractComponentDecorator</code> and moving it 
-     * according to the intended drop location.
-     * @param e The drop target event
-     * @param action The action for the drop  
-     * @param location The intended drop location, or null if there is none
-     */
-    protected void paintDropTarget(DropTargetEvent e, int action, Point location) { 
-        if (painter != null) {
-            painter.paintDropTarget(e, action, location);
-        }
-    } 
-
-    /** Indicate whether the given drop action is acceptable at the given
-     * location.  This method is the last check performed by 
-     * {@link #getDropAction(DropTargetEvent)}.
-     * You may override this method to refuse drops on certain areas
-     * within the drop target component.  The default always returns true.
-     */ 
-    protected boolean canDrop(DropTargetEvent e, int action, Point location) { 
-        return true;
-    }
-    
-    /** Handle an incoming drop with the given action.  The action passed in
-     * might be different from {@link DropTargetDropEvent#getDropAction}, 
-     * for instance, if there are no modifiers and the default action is not 
-     * supported.  Calling {@link DropTargetDropEvent#dropComplete} is
-     * recommended as soon as the {@link Transferable} data is obtained; this
-     * allows the drag source to reset the cursor and any drag images which
-     * may be in effect.
-     */
-    protected abstract void drop(DropTargetDropEvent e, int action) throws UnsupportedFlavorException, IOException;
-}

jnalib/contrib/platform/src/com/sun/jna/platform/dnd/DropTargetPainter.java

@@ -1,24 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform.dnd;
-
-import java.awt.Point;
-import java.awt.dnd.DropTargetEvent;
-
-/** Provides a callback for {@link DropHandler} to customize drop target
- * feedback.
- * @author twall
- */
-public interface DropTargetPainter {
-    void paintDropTarget(DropTargetEvent e, int action, Point location);
-}

jnalib/contrib/platform/src/com/sun/jna/platform/dnd/GhostedDragImage.java

@@ -1,144 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * <p/>
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.  
- */
-package com.sun.jna.platform.dnd;
-
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Window;
-import java.awt.dnd.DragSource;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.geom.Area;
-
-import javax.swing.Icon;
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-import javax.swing.Timer;
-
-import com.sun.jna.platform.WindowUtils;
-
-/** Provide a ghosted drag image for use during drags where 
- * {@link DragSource#isDragImageSupported} returns false.<p>
- * Its location in screen coordinates may be changed via {@link #move}.<p>  
- * When the image is no longer needed, invoke {@link #dispose}, which
- * hides the graphic immediately, or {@link #returnToOrigin}, which 
- * moves the image to its original location and then disposes it.
- */
-public class GhostedDragImage {
-
-    private static final float DEFAULT_ALPHA = .5f;
-    private Window dragImage;
-    // Initial image position, relative to drag source
-    private Point origin;
-
-    /** Create a ghosted drag image, using the given icon.
-     * @param icon image to be drawn
-     * @param initialScreenLoc initial screen location of the image
-     */
-    public GhostedDragImage(Component dragSource, final Icon icon, Point initialScreenLoc, 
-                            final Point cursorOffset) {
-        Window parent = dragSource instanceof Window
-            ? (Window)dragSource : SwingUtilities.getWindowAncestor(dragSource);
-        // FIXME ensure gc is compatible (X11)
-        GraphicsConfiguration gc = parent.getGraphicsConfiguration();
-        dragImage = new Window(JOptionPane.getRootFrame(), gc) {
-    		private static final long serialVersionUID = 1L;
-            public void paint(Graphics g) {
-                icon.paintIcon(this, g, 0, 0);
-            }
-            public Dimension getPreferredSize() {
-                return new Dimension(icon.getIconWidth(), icon.getIconHeight()); 
-            }
-            public Dimension getMinimumSize() {
-                return getPreferredSize();
-            }
-            public Dimension getMaximumSize() {
-                return getPreferredSize();
-            }
-        };
-        dragImage.setFocusableWindowState(false);
-        dragImage.setName("###overrideRedirect###");
-        Icon dragIcon = new Icon() {
-            public int getIconHeight() {
-                return icon.getIconHeight();
-            }
-            public int getIconWidth() {
-                return icon.getIconWidth();
-            }
-            public void paintIcon(Component c, Graphics g, int x, int y) {
-                g = g.create();
-                Area area = new Area(new Rectangle(x, y, getIconWidth(), getIconHeight()));
-                // X11 needs more of a window due to differences in event processing
-                area.subtract(new Area(new Rectangle(x + cursorOffset.x-1, y + cursorOffset.y-1, 3, 3)));
-                g.setClip(area);
-                icon.paintIcon(c, g, x, y);
-                g.dispose();
-            }
-            
-        };
-        dragImage.pack();
-        WindowUtils.setWindowMask(dragImage, dragIcon);
-        WindowUtils.setWindowAlpha(dragImage, DEFAULT_ALPHA);
-        move(initialScreenLoc);
-        dragImage.setVisible(true);
-    }
-
-    /** Set the transparency of the ghosted image. */
-    public void setAlpha(float alpha) {
-        WindowUtils.setWindowAlpha(dragImage, alpha);
-    }
-    
-    /** Make all ghosted images go away. */
-    public void dispose() {
-        dragImage.dispose();
-        dragImage = null;
-    }
-
-    /** Move the ghosted image to the requested location. 
-     * @param screenLocation Where to draw the image, in screen coordinates
-     */
-    public void move(Point screenLocation) {
-        if (origin == null) {
-            origin = screenLocation;
-        }
-        dragImage.setLocation(screenLocation.x, screenLocation.y);
-    }
-    
-    private static final int SLIDE_INTERVAL = 1000/30;
-    /** Animate the ghosted image returning to its origin. */
-    public void returnToOrigin() {
-        final Timer timer = new Timer(SLIDE_INTERVAL, null);
-        timer.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                Point location = dragImage.getLocationOnScreen();
-                Point dst = new Point(origin);
-                int dx = (dst.x - location.x)/2;
-                int dy = (dst.y - location.y)/2;
-                if (dx != 0 || dy != 0) {
-                    location.translate(dx, dy);
-                    move(location);
-                }
-                else {
-                    timer.stop();
-                    dispose();
-                }
-            }
-        });
-        timer.setInitialDelay(0);
-        timer.start();
-    }
-}

jnalib/contrib/platform/src/com/sun/jna/platform/dnd/package.html

@@ -1,14 +0,0 @@
-<html>
-<head>
-<!-- 
-  Copyright (c) 2010 Timothy Wall
--->
-</head>
-<body bgcolor="white">
-
-<!-- One sentence summary -->
-Provides integrated, extended drag and drop functionality,
-allowing ghosted drag images to be used on all platforms.
-
-</body>
-</html>

jnalib/contrib/platform/src/com/sun/jna/platform/mac/MacFileUtils.java

@@ -1,45 +0,0 @@
-/* Copyright (c) 2007 Timothy Wall, All Rights Reserved
- * 
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- * 
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- */
-package com.sun.jna.platform.mac;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.jna.platform.FileUtils;
-
-public class MacFileUtils extends FileUtils {
-
-    public boolean hasTrash() { return true; }
-
-    public void moveToTrash(File[] files) throws IOException {
-        // TODO: use native API for moving to trash (if any)
-        File home = new File(System.getProperty("user.home"));
-        File trash = new File(home, ".Trash");
-        if (!trash.exists()) {
-            throw new IOException("The Trash was not found in its expected location (" + trash + ")");
-        }
-        List<File> failed = new ArrayList<File>();
-        for (int i=0;i < files.length;i++) {
-            File src = files[i];
-            File target = new File(trash, src.getName());
-            if (!src.renameTo(target)) {
-                failed.add(src);
-            }
-        }
-        if (failed.size() > 0) {
-            throw new IOException("The following files could not be trashed: " + failed);
-        }
-    }
-}