[OpenSRF-GIT] OpenSRF branch master updated. 02f3d36e5979c78708d7afab28436af07a8a4054
Evergreen Git
git at git.evergreen-ils.org
Tue May 1 22:17:17 EDT 2012
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 "OpenSRF".
The branch, master has been updated
via 02f3d36e5979c78708d7afab28436af07a8a4054 (commit)
via 98c262055ada2bb24eaa714b49a13055a5ac4566 (commit)
from 80f437bb57d56f8cefcf590d2bf906be79a629f7 (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 02f3d36e5979c78708d7afab28436af07a8a4054
Author: Dan Scott <dan at coffeecode.net>
Date: Tue May 1 22:11:00 2012 -0400
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 <dan at coffeecode.net>
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"
-
commit 98c262055ada2bb24eaa714b49a13055a5ac4566
Author: Dan Scott <dan at coffeecode.net>
Date: Tue May 1 22:08:23 2012 -0400
Clean up root directory: INSTALL, .gitignore, autoreconf
* Update the README to avoid running autoreconf with the "-f" flag.
* Make the INSTALL file a symbolic link to the README to avoid
creating a generic INSTALL file each time autoreconf is run.
* Add a .gitignore file that ignores all of the built files.
Signed-off-by: Dan Scott <dan at coffeecode.net>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2c1e6ec
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,181 @@
+aclocal.m4
+autom4te.cache/
+bin/opensrf-perl.pl
+bin/osrf_config
+bin/osrf_ctl.sh
+compile
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+doc/dokuwiki-doc-stubber.pl
+examples/math_bench.pl
+examples/math_client.py
+examples/math_xul_client/Makefile
+examples/multisession-test.pl
+examples/simple_text.py
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.in
+missing
+src/c-apps/.deps/
+src/c-apps/.libs/
+src/c-apps/Makefile
+src/c-apps/Makefile.in
+src/c-apps/osrf_dbmath.la
+src/c-apps/osrf_dbmath.lo
+src/c-apps/osrf_dbmath.o
+src/c-apps/osrf_math.la
+src/c-apps/osrf_math.lo
+src/c-apps/osrf_math.o
+src/c-apps/osrf_version.la
+src/c-apps/osrf_version.lo
+src/c-apps/osrf_version.o
+src/c-apps/timejson
+src/c-apps/timejson.o
+src/gateway/Makefile
+src/gateway/Makefile.in
+src/java/deps/
+src/java/.lib/
+src/java/Makefile
+src/java/Makefile.in
+src/java/opensrf.jar
+src/jserver/.deps/
+src/jserver/Makefile
+src/jserver/Makefile.in
+src/libopensrf/.deps/
+src/libopensrf/libopensrf.la
+src/libopensrf/libopensrf_la-log.lo
+src/libopensrf/libopensrf_la-log.o
+src/libopensrf/libopensrf_la-md5.lo
+src/libopensrf/libopensrf_la-md5.o
+src/libopensrf/libopensrf_la-osrf_application.lo
+src/libopensrf/libopensrf_la-osrf_application.o
+src/libopensrf/libopensrf_la-osrf_app_session.lo
+src/libopensrf/libopensrf_la-osrf_app_session.o
+src/libopensrf/libopensrf_la-osrf_cache.lo
+src/libopensrf/libopensrf_la-osrf_cache.o
+src/libopensrf/libopensrf_la-osrfConfig.lo
+src/libopensrf/libopensrf_la-osrfConfig.o
+src/libopensrf/libopensrf_la-osrf_hash.lo
+src/libopensrf/libopensrf_la-osrf_hash.o
+src/libopensrf/libopensrf_la-osrf_json_object.lo
+src/libopensrf/libopensrf_la-osrf_json_object.o
+src/libopensrf/libopensrf_la-osrf_json_tools.lo
+src/libopensrf/libopensrf_la-osrf_json_tools.o
+src/libopensrf/libopensrf_la-osrf_json_xml.lo
+src/libopensrf/libopensrf_la-osrf_json_xml.o
+src/libopensrf/libopensrf_la-osrf_legacy_json.lo
+src/libopensrf/libopensrf_la-osrf_legacy_json.o
+src/libopensrf/libopensrf_la-osrf_list.lo
+src/libopensrf/libopensrf_la-osrf_list.o
+src/libopensrf/libopensrf_la-osrf_message.lo
+src/libopensrf/libopensrf_la-osrf_message.o
+src/libopensrf/libopensrf_la-osrf_parse_json.lo
+src/libopensrf/libopensrf_la-osrf_parse_json.o
+src/libopensrf/libopensrf_la-osrf_prefork.lo
+src/libopensrf/libopensrf_la-osrf_prefork.o
+src/libopensrf/libopensrf_la-osrf_settings.lo
+src/libopensrf/libopensrf_la-osrf_settings.o
+src/libopensrf/libopensrf_la-osrf_stack.lo
+src/libopensrf/libopensrf_la-osrf_stack.o
+src/libopensrf/libopensrf_la-osrf_system.lo
+src/libopensrf/libopensrf_la-osrf_system.o
+src/libopensrf/libopensrf_la-osrf_transgroup.lo
+src/libopensrf/libopensrf_la-osrf_transgroup.o
+src/libopensrf/libopensrf_la-osrf_utf8.lo
+src/libopensrf/libopensrf_la-osrf_utf8.o
+src/libopensrf/libopensrf_la-sha.lo
+src/libopensrf/libopensrf_la-sha.o
+src/libopensrf/libopensrf_la-socket_bundle.lo
+src/libopensrf/libopensrf_la-socket_bundle.o
+src/libopensrf/libopensrf_la-string_array.lo
+src/libopensrf/libopensrf_la-string_array.o
+src/libopensrf/libopensrf_la-transport_client.lo
+src/libopensrf/libopensrf_la-transport_client.o
+src/libopensrf/libopensrf_la-transport_message.lo
+src/libopensrf/libopensrf_la-transport_message.o
+src/libopensrf/libopensrf_la-transport_session.lo
+src/libopensrf/libopensrf_la-transport_session.o
+src/libopensrf/libopensrf_la-utils.lo
+src/libopensrf/libopensrf_la-utils.o
+src/libopensrf/libopensrf_la-xml_utils.lo
+src/libopensrf/libopensrf_la-xml_utils.o
+src/libopensrf/libosrf_json.la
+src/libopensrf/libosrf_json_la-log.lo
+src/libopensrf/libosrf_json_la-log.o
+src/libopensrf/libosrf_json_la-md5.lo
+src/libopensrf/libosrf_json_la-md5.o
+src/libopensrf/libosrf_json_la-osrf_hash.lo
+src/libopensrf/libosrf_json_la-osrf_hash.o
+src/libopensrf/libosrf_json_la-osrf_json_object.lo
+src/libopensrf/libosrf_json_la-osrf_json_object.o
+src/libopensrf/libosrf_json_la-osrf_json_tools.lo
+src/libopensrf/libosrf_json_la-osrf_json_tools.o
+src/libopensrf/libosrf_json_la-osrf_json_xml.lo
+src/libopensrf/libosrf_json_la-osrf_json_xml.o
+src/libopensrf/libosrf_json_la-osrf_legacy_json.lo
+src/libopensrf/libosrf_json_la-osrf_legacy_json.o
+src/libopensrf/libosrf_json_la-osrf_list.lo
+src/libopensrf/libosrf_json_la-osrf_list.o
+src/libopensrf/libosrf_json_la-osrf_parse_json.lo
+src/libopensrf/libosrf_json_la-osrf_parse_json.o
+src/libopensrf/libosrf_json_la-osrf_utf8.lo
+src/libopensrf/libosrf_json_la-osrf_utf8.o
+src/libopensrf/libosrf_json_la-string_array.lo
+src/libopensrf/libosrf_json_la-string_array.o
+src/libopensrf/libosrf_json_la-utils.lo
+src/libopensrf/libosrf_json_la-utils.o
+src/libopensrf/.libs/
+src/libopensrf/log.o
+src/libopensrf/Makefile
+src/libopensrf/Makefile.in
+src/libopensrf/md5.o
+src/libopensrf/opensrf-c
+src/libopensrf/opensrf.o
+src/libopensrf/osrf_hash.o
+src/libopensrf/osrf_json_object.o
+src/libopensrf/osrf_json_test
+src/libopensrf/osrf_json_test.o
+src/libopensrf/osrf_json_tools.o
+src/libopensrf/osrf_json_xml.o
+src/libopensrf/osrf_legacy_json.o
+src/libopensrf/osrf_list.o
+src/libopensrf/osrf_parse_json.o
+src/libopensrf/osrf_utf8.o
+src/libopensrf/string_array.o
+src/libopensrf/utils.o
+src/Makefile
+src/Makefile.in
+src/perl/blib/
+src/perl/_build/
+src/perl/Build
+src/perl/Makefile
+src/perl/Makefile.in
+src/perl/MYMETA.json
+src/perl/MYMETA.yml
+src/ports/strn_compat/Makefile
+src/python/build/
+src/python/Makefile
+src/python/Makefile.in
+src/python/opensrf.py
+src/router/.deps/
+src/router/.libs/
+src/router/Makefile
+src/router/Makefile.in
+src/router/opensrf_router
+src/router/osrf_router_main.o
+src/router/osrf_router.o
+src/srfsh/.deps/
+src/srfsh/.libs/
+src/srfsh/Makefile
+src/srfsh/Makefile.in
+src/srfsh/srfsh
+src/srfsh/srfsh.o
+tests/.deps/
+tests/Makefile
+tests/Makefile.in
diff --git a/INSTALL b/INSTALL
new file mode 120000
index 0000000..100b938
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1 @@
+README
\ No newline at end of file
diff --git a/README b/README
index b0b6541..9a895d9 100644
--- a/README
+++ b/README
@@ -81,7 +81,7 @@ source directory to generate the configure script and Makefiles:
[source, bash]
------------------------------------------------------------------------------
-autoreconf -f -i
+autoreconf -i
------------------------------------------------------------------------------
Configuration and compilation instructions
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 181 ++++++++++++++++++++++++++++++++++++++++++++++++++
INSTALL | 1 +
README | 2 +-
src/java/Makefile.am | 7 +-
src/java/deps.inc | 5 --
5 files changed, 187 insertions(+), 9 deletions(-)
create mode 100644 .gitignore
create mode 120000 INSTALL
delete mode 100644 src/java/deps.inc
hooks/post-receive
--
OpenSRF
More information about the opensrf-commits
mailing list