update of jbigi scripts

- merge mbuild_jbigi.sh into build_jbigi.sh and drop mbuild_jbigi.sh
- make build.sh's tests optional
- try to determine the locations of JAVA_HOME and I2P
This commit is contained in:
kytv
2012-01-08 23:23:00 +00:00
parent f5b6d56489
commit b09071f20f
7 changed files with 168 additions and 171 deletions

View File

@@ -2,18 +2,18 @@ From: Kill Your TV <killyourtv@i2pmail.org>
Date: Wed, 11 May 2011 00:12:04 +0000
Subject: jbigi soname
The purpose of this patch is to change the path that mbuild_jbigi.sh
The purpose of this patch is to change the path that build_jbigi.sh
expects to find the source files at. At the same time I'm specifying
a soname to shut lintian up.
---
core/c/jbigi/mbuild_jbigi.sh | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
core/c/jbigi/build_jbigi.sh | 4 +++---
1 files changed, 2 insertions(+), 2 deletions(-)
--- a/core/c/jbigi/mbuild_jbigi.sh
+++ b/core/c/jbigi/mbuild_jbigi.sh
@@ -47,7 +47,7 @@
fi
--- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh
@@ -37,7 +37,7 @@
UNIXTYPE="solaris"
fi
COMPILEFLAGS="-fPIC -Wall"
- INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
@@ -21,7 +21,7 @@ a soname to shut lintian up.
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";;
*)
@@ -66,7 +66,7 @@
@@ -56,7 +56,7 @@
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE