From: Mike Taylor Date: Fri, 18 Sep 2009 16:47:10 +0000 (+0100) Subject: Resolve X-Git-Tag: v1.0~16^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=7ac43a3790740b30c3ae8d93ee6ae1d3692ef330;hp=f1dc0de045f5d44f2f97d44e96139ac712fb359c;p=yaz4j-moved-to-github.git Resolve --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f904b11 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +bin +distributions diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..c40cdd9 --- /dev/null +++ b/AUTHORS @@ -0,0 +1,7 @@ +Most of the work on yaz4j was done by: + +Rob Styles + +Current version is maintained by: + +Adam Dickmeiss diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..40f6ee0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,26 @@ +Copyright (c) 2006-2007, Talis Group Ltd. +Copyright (c) 2008-2009, Index Data. +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Index Data nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + diff --git a/README b/README new file mode 100644 index 0000000..5f06606 --- /dev/null +++ b/README @@ -0,0 +1,29 @@ +yaz4j is a Java wrapper for the ZOOM API of YAZ. This allows developers +to write Z39.50 clients in Java. + +yaz4j is distributed under the revised BSD license. + +Copyright (C) 2006-2007, Talis Group Ltd. +Copyright (C) 2008-2009, Index Data. +See LICENSE for details. + +In order to built yaz4j the Java JDK, ant, YAZ and Swig must be installed. +The exact process varies from platform to platform. + +For example, on Ubuntu/Debian the following installs the components: + apt-get install sun-java6-jdk ant libyaz3-dev swig + +The compilation is a two-step process. The environment variable JAVA_HOME +should point to the Java JDK of your preference. For example, + export JAVA_HOME=/usr/lib/jvm/java-6-sun + +Build the shared libary (.so) with: + cd libyaz4j + ./build.sh + +Rest is built by ant which reads build.xml: + cd .. + ant + +If you network-connected you should be able to run tests with: + ant unit-test diff --git a/build.xml b/build.xml index 3ad9842..16bc930 100644 --- a/build.xml +++ b/build.xml @@ -50,7 +50,6 @@ - diff --git a/distributions/.DS_Store b/distributions/.DS_Store deleted file mode 100644 index 73e446d..0000000 Binary files a/distributions/.DS_Store and /dev/null differ diff --git a/libyaz4j/build.sh b/libyaz4j/build.sh index 9b15b74..98f55d9 100755 --- a/libyaz4j/build.sh +++ b/libyaz4j/build.sh @@ -1,9 +1,5 @@ #!/bin/bash - -# You may need to do something like this: -# env JAVA_HOME=/usr/lib/jvm/java-6-sun ./build.sh - -JNI_DIR=${JAVA_HOME}/include +JNI_DIR=${JAVA_HOME:-/usr/lib/jvm/java-6-sun}/include set -x YAZ_CONFIG=yaz-config YAZ_PREFIX=`${YAZ_CONFIG} --prefix`