From 02f3d36e5979c78708d7afab28436af07a8a4054 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Tue, 1 May 2012 22:11:00 -0400 Subject: [PATCH] Minor cleanups to Java dependency build process While configure.ac still hardcodes the expected location of the Java dependencies (JSON and Memcached classes), we can clean up some of the lower-level challenges with the Java build. * StAX and WSTX were rolled into the core Java environment long ago, so there's no need to download them and even less need to verify that the downloaded version exist. * The Memcached class is now up to 2.0.1, per deps.sh, but the deps.inc file was pointing at 1.5.1. * Speaking of the deps.inc file, nothing seems to use it; delete it. * The Makefile was dying because the variables for the Memcached and JSON classes weren't defined. Define those at the top of the Makefile. Signed-off-by: Dan Scott --- src/java/Makefile.am | 7 ++++--- src/java/deps.inc | 5 ----- 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/java/deps.inc diff --git a/src/java/Makefile.am b/src/java/Makefile.am index fca8600..bc9615b 100644 --- a/src/java/Makefile.am +++ b/src/java/Makefile.am @@ -1,9 +1,12 @@ DISTCLEANFILES = Makefile.in Makefile +MEMCACHE=java_memcached-release_2.0.1.jar +JSON=json.jar + JAVAC=javac -J-Xmx256m JAVA=java -Xmx256m JAVA_LIBDIR = .lib -JAVA_LIBS = .:$(OSRF_JAVA_DEPSDIR)/$(WSTX):$(OSRF_JAVA_DEPSDIR)/$(STAX):$(OSRF_JAVA_DEPSDIR)/$(MEMCACHE):$(OSRF_JAVA_DEPSDIR)/$(JSON) +JAVA_LIBS = .:$(OSRF_JAVA_DEPSDIR)/$(MEMCACHE):$(OSRF_JAVA_DEPSDIR)/$(JSON) JAVA_SRC = \ org/opensrf/net/xmpp/*.java \ org/opensrf/util/*.java \ @@ -15,8 +18,6 @@ JAVA_SRC = \ all-local: verify_deps dirs jar verify_deps: - @if [ ! -e "$(OSRF_JAVA_DEPSDIR)/$(WSTX)" ]; then echo -e "\nmissing dependency $(WSTX)!\n" && exit 1; fi - @if [ ! -e "$(OSRF_JAVA_DEPSDIR)/$(STAX)" ]; then echo -e "\nmissing dependency $(STAX)!\n" && exit 1; fi @if [ ! -e "$(OSRF_JAVA_DEPSDIR)/$(MEMCACHE)" ]; then echo -e "\nmissing dependency $(MEMCACHE)!\n" && exit 1; fi @if [ ! -e "$(OSRF_JAVA_DEPSDIR)/$(JSON)" ]; then echo -e "\nmissing dependency $(JSON)!\n" && exit 1; fi diff --git a/src/java/deps.inc b/src/java/deps.inc deleted file mode 100644 index dc21f6c..0000000 --- a/src/java/deps.inc +++ /dev/null @@ -1,5 +0,0 @@ -export STAX="stax-api-1.0.1.jar" -export WSTX="wstx-lgpl-3.2.1.jar" -export MEMCACHE="java_memcached-release_1.5.1.jar" -export JSON="json.jar" - -- 2.11.0