diff --git a/pom.xml b/pom.xml index 0d2d581..a1a7ebd 100644 --- a/pom.xml +++ b/pom.xml @@ -51,6 +51,11 @@ scm:hg:ssh://k@ailis.de/hg/java/usb4java + + http://www.ailis.de/nexus/content/repositories/releases/de/ailis/${project.artifactId}/${project.artifactId}/${project.version} + http://www.ailis.de/nexus/content/repositories/snapshots/de/ailis/${project.artifactId}/${project.artifactId} + + @@ -65,8 +70,9 @@ + org.apache.maven.plugins maven-assembly-plugin - 2.2-beta-3 + 2.2 src/main/assembly/src.xml diff --git a/src/site/apt/build.apt b/src/site/apt/build.apt deleted file mode 100644 index 01debfe..0000000 --- a/src/site/apt/build.apt +++ /dev/null @@ -1,80 +0,0 @@ - ----------------------------------------------------------------------------- - Build Instructions - ----------------------------------------------------------------------------- - -Build Instructions - - This page describes how to compile the JNI wrapper library on various - platforms. For all platforms it is recommended to correctly configure the - JAVA_HOME environment variable so the Java header files are found - automatically. - -* Linux - -** Build libusb4java on Linux - - You need to install the development files of libusb 0.1.x first. On - Debian systems this is done with the following command: - ---- - sudo apt-get install libusb-dev ---- - - To compile and install libusb4java simply run the following commands: - ---- - ./configure - make - sudo make install ---- - - The library is then located in . - - -** Compile 32 bit libusb4java on 64 bit Linux - - You need to install the 32 bit development files. On Debian systems this can - be done with the following command which also installs the 32 bit version of - libusb: - ---- - sudo apt-get install ia32-libs-dev libc6-dev-i386 ---- - - To compile the library for 32 bit run the following commands: - ---- - ./configure CFLAGS="-m32" - make - make install DESTDIR=/tmp/usb4java-linux-x86 ---- - - The library is then located in . - - -* Windows - -** Cross-compile libusb4java for Windows 32 bit on Linux - - First install the mingw32 cross compiler. On Debian systems this can be - done with the following command: - ---- - sudo apt-get install mingw32 ---- - - Then you need the development files of libusb-win32. Download the latest - binary archive from the - {{{http://sourceforge.net/apps/trac/libusb-win32/wiki}libusb-win32 website}} - and unpack it somwhere (I assume you extracted it to ). - - Now compile the library: - ---- - ./configure --host=i586-mingw32msvc --prefix="" CFLAGS="-I/tmp/libusb-win32/include/ -L/tmp/libusb-win32/lib/gcc" - make - make install DESTDIR=/tmp/usb4java-win32 ---- - - The compiled DLL is then located in - \ No newline at end of file diff --git a/src/site/apt/download.apt b/src/site/apt/download.apt deleted file mode 100644 index e07f0d6..0000000 --- a/src/site/apt/download.apt +++ /dev/null @@ -1,9 +0,0 @@ - ----------------------------------------------------------------------------- - Download - ----------------------------------------------------------------------------- - -Download - - TODO - - Sources are also available in the {{{./source-repository.html}source repository}}. diff --git a/src/site/apt/download.apt.vm b/src/site/apt/download.apt.vm new file mode 100644 index 0000000..6a86415 --- /dev/null +++ b/src/site/apt/download.apt.vm @@ -0,0 +1,51 @@ + ----------------------------------------------------------------------------- + Download + ----------------------------------------------------------------------------- + +Download + +* Binaries + + First of all you need the platform independent Java library for usb4java: + + * {{{${releasesUrl}/usb4java-${project.version}.jar}usb4java-${project.version}.jar}} + + [] + + Additionally you need the JNI library for the platform on which you want + to use usb4java. The JARs for Windows and Mac OS X also contain the libusb + shared library. On Linux machines this library is provided by the linux + distribution (Usually a package called libusb, make sure it is version 0.x + and not the newer 1.x). + + * {{{${releasesUrl}/usb4java-${project.version}-linux-x86.jar}usb4java-${project.version}-linux-x86.jar}} + + * {{{${releasesUrl}/usb4java-${project.version}-linux-x86_64.jar}usb4java-${project.version}-linux-x86_64.jar}} + + * {{{${releasesUrl}/usb4java-${project.version}-windows-x86_64.jar}usb4java-${project.version}-windows-x86_64.jar}} + + * {{{${releasesUrl}/usb4java-${project.version}-windows-x86_64.jar}usb4java-${project.version}-windows-x86_64.jar}} + + * {{{${releasesUrl}/usb4java-${project.version}-macosx-universal.jar}usb4java-${project.version}-macosx-universal.jar}} + + [] + + If you prefer using bleeding edge snapshots then you can download + them from the {{{$snapshotsUrl/}snapshot repository}}. + + +* Sources + + You can also compile usb4java manually. Simply download one of the following + archives and run <>. The source archive contains the pre-compiled + shared libraries for Linux, Windows and Mac OS X but also the C source code + of the JNI library if you want to compile it yourself or want to use usb4java + on a different platform. + + * {{{http://www.ailis.de/nexus/content/repositories/releases/de/ailis/usb4java/${project.version}/usb4java-${project.version}-src.tar.bz2}usb4java-${project.version}-src.tar.bz2}} + + * {{{http://www.ailis.de/nexus/content/repositories/releases/de/ailis/usb4java/${project.version}/usb4java-${project.version}-src.zip}usb4java-${project.version}-src.zip}} + + [] + + Sources are also available in the {{{./source-repository.html}source repository}}. diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt deleted file mode 100644 index a43d4ab..0000000 --- a/src/site/apt/index.apt +++ /dev/null @@ -1,30 +0,0 @@ - ----------------------------------------------------------------------------- - About - ----------------------------------------------------------------------------- - -What is usb4java? - - usb4java is a Java library to access USB devices. It is based on the native - libusb-0.1.x shared library and reflects this API as complete as possible. - Java NIO buffers are used for data exchange between libusb and Java. - -News - - * 2011/01/23 - Version 0.1.12-1 has been released. - - [] - - -Getting started - - {{{./download.html}Download}} the latest usb4java and then - read the {{{./manual.html}manual}} for some basic instructions how to use it. - If you prefer building usb4java from source then follow - {{{./build.html}build instructions}}. - -Report problems - - If you have any problems with usb4java or find bugs in the software or this - web site (even if it's just a typo) then please let me know: - {{{mailto:k@ailis.de}k@ailis.de}} - \ No newline at end of file diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm new file mode 100644 index 0000000..e77fd46 --- /dev/null +++ b/src/site/apt/index.apt.vm @@ -0,0 +1,55 @@ + ----------------------------------------------------------------------------- + About + ----------------------------------------------------------------------------- + +What is usb4java? + + usb4java is a Java library to access USB devices. It is based on the native + {{{http://www.libusb.org/}libusb 0.1}} shared library and reflects this + API as complete as possible. Java NIO buffers are used for data exchange + between libusb and Java. + + Supported platforms are Linux (Intel 32/64 bit), Mac OS X (Intel 32/64 bit, + PowerPC 32 bit) and Windows (Intel 32/64 bit). But other platforms may work + as well (as long as they have Java 6 and are supported by libusb) by + compiling the JNI library manually. + + For Windows the libusb port of the + {{{http://sourceforge.net/apps/trac/libusb-win32/wiki}libusb-win32}} project + is used and you need to create and install a driver for the USB device you + want to use with usb4java (Instructions can be found on the libusb-win32 + website). + + +News + + * 2011/01/29 - Version 0.1.12-1 has been released. + + [] + + +License + + 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 3 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 + {{{./license.html}GNU Lesser General Public License}} for more details. + + +Getting started + + {{{./download.html}Download}} the latest usb4java and then + read the {{{./manual.html}manual}} for some basic instructions how to use it. + + +Report problems + + If you have any problems with usb4java or find bugs in the software or this + web site (even if it's just a typo) then please let me know: + {{{mailto:k@ailis.de}k@ailis.de}} + \ No newline at end of file diff --git a/src/site/apt/manual.apt b/src/site/apt/manual.apt.vm similarity index 100% rename from src/site/apt/manual.apt rename to src/site/apt/manual.apt.vm diff --git a/src/site/site.xml b/src/site/site.xml index e043e03..25304f8 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -8,6 +8,10 @@ + + + + @@ -16,7 +20,6 @@ -