[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2003773f3e8630d1df6c2cdf65c561ce2d6c806c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  2003773f3e8630d1df6c2cdf65c561ce2d6c806c (commit)
       via  6c3b38683ef6308869ac062467f84bfa981d37d7 (commit)
      from  e0e96d831bcb284ba0360cbff43c62ff0a6fd75a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2003773f3e8630d1df6c2cdf65c561ce2d6c806c
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Oct 31 13:25:04 2012 -0400

    Fix OSRF_HOME and EXT in Open-ILs/src/java/Makefil.am.
    
    Change the paths so that they work.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/java/Makefile.am b/Open-ILS/src/java/Makefile.am
index ee4607c..5b9dc24 100644
--- a/Open-ILS/src/java/Makefile.am
+++ b/Open-ILS/src/java/Makefile.am
@@ -1,9 +1,9 @@
 JAVA_LIBDIR = .lib
 JAVAC = javac -J-Xmx256m
 JAVA = java -Xmx256m 
-OSRF_HOME = ../../../../../OpenSRF/trunk/src/java
+OSRF_HOME = ../../../../OpenSRF/src/java
 OSRFJAVA = $(OSRF_HOME)/opensrf.jar
-EXT = $(OSRF_HOME)/ext
+EXT = $(OSRF_HOME)/deps
 JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json.jar:$(EXT)/java_memcached-release_2.0.1.jar
 JAVA_SRC = \
 	org/open_ils/*.java\

commit 6c3b38683ef6308869ac062467f84bfa981d37d7
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Tue Oct 30 17:10:42 2012 -0400

    Update Java dependencies.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

diff --git a/Open-ILS/src/java/Makefile.am b/Open-ILS/src/java/Makefile.am
index 98a975e..ee4607c 100644
--- a/Open-ILS/src/java/Makefile.am
+++ b/Open-ILS/src/java/Makefile.am
@@ -4,7 +4,7 @@ JAVA = java -Xmx256m
 OSRF_HOME = ../../../../../OpenSRF/trunk/src/java
 OSRFJAVA = $(OSRF_HOME)/opensrf.jar
 EXT = $(OSRF_HOME)/ext
-JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json-jdk1.5-2007-05-01.jar:$(EXT)/wstx-lgpl-3.2.1.jar:$(EXT)/stax-api-1.0.1.jar:$(EXT)/java_memcached-release_1.5.1.jar
+JAVA_LIBS = .:$(JAVA_LIBDIR):$(OSRFJAVA):$(EXT)/json.jar:$(EXT)/java_memcached-release_2.0.1.jar
 JAVA_SRC = \
 	org/open_ils/*.java\
 	org/open_ils/idl/*.java\
@@ -45,6 +45,5 @@ docs:
 
 clean:
 	rm -r $(JAVA_LIBDIR)
-	
 
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/java/Makefile.am |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS