[open-ils-commits] r8792 - in branches/acq-experiment/Open-ILS: .
src src/c-apps src/extras src/support-scripts/test-scripts
web/oilsweb/oilsweb/lib
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Feb 19 19:57:57 EST 2008
Author: erickson
Date: 2008-02-19 19:27:37 -0500 (Tue, 19 Feb 2008)
New Revision: 8792
Added:
branches/acq-experiment/Open-ILS/include/
Removed:
branches/acq-experiment/Open-ILS/src/c-apps/openils/
Modified:
branches/acq-experiment/Open-ILS/src/Makefile
branches/acq-experiment/Open-ILS/src/c-apps/Makefile
branches/acq-experiment/Open-ILS/src/extras/Makefile
branches/acq-experiment/Open-ILS/src/extras/Makefile.install
branches/acq-experiment/Open-ILS/src/support-scripts/test-scripts/acq_fund.py
branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py
Log:
mergin in some trunk changes
svn merge -r8460:8461 svn://svn.open-ils.org/ILS/trunk/
svn merge -r8458:8459 svn://svn.open-ils.org/ILS/trunk/
Copied: branches/acq-experiment/Open-ILS/include (from rev 8459, trunk/Open-ILS/include)
Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/Makefile 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/src/Makefile 2008-02-20 00:27:37 UTC (rev 8792)
@@ -2,7 +2,7 @@
export LDFLAGS += -L . -L$(TMP) -L $(OPENSRF_LIBS)
export CFLAGS += -pipe -g -Wall -O2 -fPIC -I$(LIBXML2_HEADERS) -I$(APACHE2_HEADERS) -I$(APR_HEADERS) \
- -D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS)
+ -D_LARGEFILE64_SOURCE -I$(LIBXML2_HEADERS)/libxml -I$(TMP) -I$(OPENSRF_HEADERS)
export INCDIR = "$(INCLUDEDIR)/openils/"
Modified: branches/acq-experiment/Open-ILS/src/c-apps/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/c-apps/Makefile 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/src/c-apps/Makefile 2008-02-20 00:27:37 UTC (rev 8792)
@@ -1,6 +1,6 @@
LDLIBS += -lobjson -lopensrf #-lfieldmapper
LDFLAGS += -Wl,-rpath=$(LIBDIR) -L$(DBI_LIBS)
-CFLAGS += -DOSRF_LOG_PARAMS
+CFLAGS += -DOSRF_LOG_PARAMS -I../../include
#all: oils_auth.so oils_fetch.so oils_cstore.so
all: liboils_idl.so oils_auth.so oils_cstore.so oils_rstore.so oils_dataloader
@@ -22,7 +22,7 @@
$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) -loils_idl -ldbi -loils_utils -ldbdpgsql oils_cstore.o -o $@
oils_rstore.o: oils_cstore.c
- $(CC) $(CFLAGS) -I$(TMP) -DRSTORE -c -o $@ oils_cstore.c
+ $(CC) $(CFLAGS) -DRSTORE -c -o $@ oils_cstore.c
oils_rstore.so: oils_rstore.o liboils_utils.so liboils_idl.so
@echo $@
@@ -36,11 +36,7 @@
liboils_idl.so: oils_idl-core.o
@echo $@
- $(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@
-# cp $@ $(TMP)/
-# mkdir -p $(TMP)/openils/
-# cp oils_idl.h $(TMP)/openils/
-# cp idl_fieldmapper.h $(TMP)/openils/
+ $(CC) $(CFLAGS) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_idl-core.o -o $@
oils_auth.so: oils_auth.o liboils_utils.so
@echo $@
@@ -49,23 +45,17 @@
liboils_utils.so: oils_utils.o oils_event.o
@echo $@
$(CC) -shared -W1 $(LDLIBS) $(LDFLAGS) oils_utils.o oils_event.o -o $@
-# cp $@ $(TMP)/
-# mkdir -p $(TMP)/openils/
-# cp oils_event.h $(TMP)/openils/
-# cp oils_utils.h $(TMP)/openils/
-# cp oils_constants.h $(TMP)/openils/
install:
@echo $@;
cp oils_auth.so $(LIBDIR)/
- #cp $(TMP)/oils_fetch.so $(LIBDIR)/
cp oils_cstore.so $(LIBDIR)/
cp oils_rstore.so $(LIBDIR)/
cp liboils_utils.so $(LIBDIR)/
cp liboils_idl.so $(LIBDIR)/
cp oils_dataloader $(BINDIR)/
mkdir -p $(INCDIR)/
- cp openils/*.h $(INCDIR)/
+ cp ../../include/openils/*.h $(INCDIR)/
clean:
@echo $@;
Modified: branches/acq-experiment/Open-ILS/src/extras/Makefile
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/Makefile 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/src/extras/Makefile 2008-02-20 00:27:37 UTC (rev 8792)
@@ -1,4 +1,5 @@
-LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl
+LDLIBS += -lreadline -loils_utils -lopensrf -lobjson -lxml2 -loils_idl -L../c-apps
+CFLAGS += -I../../include
all: oils_requestor
oils_requestor: oils_requestor.o
Modified: branches/acq-experiment/Open-ILS/src/extras/Makefile.install
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/Makefile.install 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/src/extras/Makefile.install 2008-02-20 00:27:37 UTC (rev 8792)
@@ -28,8 +28,8 @@
# not require fetching the sources externally ... needs testing/updating in here
-LIBJS=js-1.60
-LIBJS_PERL=JavaScript-SpiderMonkey-0.17
+LIBJS=js-1.7.0
+LIBJS_PERL=JavaScript-SpiderMonkey-0.19
LIBJS_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
LIBJS_PERL_URL=ftp://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz
# used for installing libjs lib and header files
@@ -95,10 +95,10 @@
libreadline5-dev\
libtext-csv-perl\
libspreadsheet-writeexcel-perl\
- libtie-ixhash-perl
+ libtie-ixhash-perl\
+ python-setuptools
-
GENTOOS = \
vim\
ntp\
@@ -204,7 +204,7 @@
cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/
cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/
- cd JavaScript-SpiderMonkey-0.17 && perl Makefile.PL -E4X && make && make test && make install
+ cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install
# Install libdbi and the postgres drivers
Modified: branches/acq-experiment/Open-ILS/src/support-scripts/test-scripts/acq_fund.py
===================================================================
--- branches/acq-experiment/Open-ILS/src/support-scripts/test-scripts/acq_fund.py 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/src/support-scripts/test-scripts/acq_fund.py 2008-02-20 00:27:37 UTC (rev 8792)
@@ -4,10 +4,10 @@
import osrf.net_obj, osrf.ses
# ---------------------------------------------------------------
-# Usage: python acq_fund.py <user> <password> <workstation>
+# Usage: python acq_fund_source.py <user> <password> <workstation>
# ---------------------------------------------------------------
-oils.system.oilsConnect('/openils/conf/opensrf_core.xml', 'config.opensrf')
+oils.system.System.connect(config_file='/openils/conf/opensrf_core.xml', config_context='config.opensrf')
auth_info = oils.utils.utils.login(sys.argv[1], sys.argv[2], 'staff', sys.argv[3])
authtoken = auth_info['payload']['authtoken']
@@ -17,22 +17,22 @@
# XXX This loop assumes the existence of orgs with IDs 1-6 and a USD currency
ids = []
for i in range(0,5):
- fund = osrf.net_obj.NetworkObject.acqfund()
- fund.name("test-fund-%d" % i)
- fund.owner(i+1)
- fund.currency_type('USD')
- req = ses.request('open-ils.acq.fund.create', authtoken, fund)
+ fund_source = osrf.net_obj.NetworkObject.acqfs()
+ fund_source.name("test-fund_source-%d" % i)
+ fund_source.owner(i+1)
+ fund_source.currency_type('USD')
+ req = ses.request('open-ils.acq.funding_source.create', authtoken, fund_source)
id = req.recv().content()
- print 'created fund ' + str(id)
+ print 'created fund_source ' + str(id)
ids.append(id)
-req = ses.request('open-ils.acq.fund.org.retrieve', authtoken, 1, {"children":1})
+req = ses.request('open-ils.acq.funding_source.org.retrieve', authtoken, 1, {"children":1})
resp = req.recv().content()
-for fund in resp:
- print 'fetched fund ' + str(fund.name())
+for fund_source in resp:
+ print 'fetched fund_source ' + str(fund_source.name())
for i in ids:
- req = ses.request('open-ils.acq.fund.delete', authtoken, i)
+ req = ses.request('open-ils.acq.funding_source.delete', authtoken, i)
print 'delete returned ' + str(req.recv().content())
Modified: branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py
===================================================================
--- branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py 2008-02-19 23:55:56 UTC (rev 8791)
+++ branches/acq-experiment/Open-ILS/web/oilsweb/oilsweb/lib/user.py 2008-02-20 00:27:37 UTC (rev 8792)
@@ -38,7 +38,7 @@
evt = oils.event.Event.parse_event(self.ctx.user.value)
if evt and evt.text_code == 'NO_SESSION':
- # our authtoken.value has timed out. See if we can autologin
+ # our authtoken has timed out. See if we can autologin
self.try_auto_login()
if not self.ctx.authtoken.value:
raise AuthException(_('No authentication token provided'))
More information about the open-ils-commits
mailing list