Skip to content

Commit

Permalink
LP#1312308 script circ and deps removal
Browse files Browse the repository at this point in the history
* Remove libjs and spidermonkey from prereq installer
* Remove references to spidermonkey and script runner
* Remove stock JS circ and catalog scripts

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
  • Loading branch information
berick authored and Jason Stephenson committed Jul 1, 2015
1 parent 40605b3 commit 2d8af35
Show file tree
Hide file tree
Showing 45 changed files with 57 additions and 9,696 deletions.
3 changes: 0 additions & 3 deletions Makefile.am
Expand Up @@ -18,9 +18,6 @@ export TEMPLATEDIR=@localstatedir@/templates
export UPDATESDIR=@localstatedir@/updates

export datadir=@localstatedir@/data
export circrulesdir=@localstatedir@/circ
export catalogscriptdir=@localstatedir@/catalog
export penaltyrulesdir=@localstatedir@/penalty
export XSLDIR=@localstatedir@/xsl
export REPORTERDIR=@localstatedir@/reporter
export SOCK=@localstatedir@/lock
Expand Down
35 changes: 0 additions & 35 deletions Open-ILS/examples/json-request-test.pl

This file was deleted.

16 changes: 0 additions & 16 deletions Open-ILS/examples/opensrf.xml.example
Expand Up @@ -849,22 +849,6 @@ vim:et:ts=4:sw=4:
<notify_hold>
<email>false</email> <!-- set to false to disable hold notice emails -->
</notify_hold>

<!-- circulation policy scripts -->
<script_path>LIBDIR/javascript</script_path>
<script_path>LOCALSTATEDIR</script_path>
<script_path>LOCALSTATEDIR/catalog</script_path>
<legacy_script_support>false</legacy_script_support>
<scripts>
<circ_permit_patron>circ/circ_permit_patron.js</circ_permit_patron>
<circ_permit_copy>circ/circ_permit_copy.js</circ_permit_copy>
<circ_duration>circ/circ_duration.js</circ_duration>
<circ_recurring_fines>circ/circ_recurring_fines.js</circ_recurring_fines>
<circ_max_fines>circ/circ_max_fines.js</circ_max_fines>
<circ_permit_renew>circ/circ_permit_renew.js</circ_permit_renew>
<circ_permit_hold>circ/circ_permit_hold.js</circ_permit_hold>
</scripts>

</app_settings>
</open-ils.circ>

Expand Down
20 changes: 0 additions & 20 deletions Open-ILS/src/Makefile.am
Expand Up @@ -24,11 +24,7 @@ export DEF_LDLIBS = -lopensrf
prefix=@prefix@
exec_prefix=@exec_prefix@
datadir=@localstatedir@/data
circrulesdir=@localstatedir@/circ
catalogscriptdir=@localstatedir@/catalog
penaltyrulesdir=@localstatedir@/penalty
examples = @top_srcdir@/Open-ILS/examples
jsbackend = @srcdir@/javascript/backend
supportscr = @srcdir@/support-scripts

# Collect files to be used by multiple targets
Expand Down Expand Up @@ -80,22 +76,6 @@ core_scripts = $(examples)/oils_ctl.sh \

installautojs = $(autojsbinscripts)

#circ-rules-install
circrules_SCRIPTS = $(jsbackend)/circ/circ_duration.js \
$(jsbackend)/circ/circ_groups.js \
$(jsbackend)/circ/circ_item_config.js \
$(jsbackend)/circ/circ_lib.js \
$(jsbackend)/circ/circ_permit_copy.js \
$(jsbackend)/circ/circ_permit_hold.js \
$(jsbackend)/circ/circ_permit_patron.js \
$(jsbackend)/circ/circ_permit_renew.js
penaltyrules_SCRIPTS = $(jsbackend)/penalty/patron_penalty.js
catalogscript_SCRIPTS = $(jsbackend)/catalog/biblio_descriptor.js \
$(jsbackend)/catalog/biblio_fingerprint.js \
$(jsbackend)/catalog/fixed_fields.js \
$(jsbackend)/catalog/phys_char.js \
$(jsbackend)/catalog/record_type.js

endif

#--------------------
Expand Down
10 changes: 1 addition & 9 deletions Open-ILS/src/extras/Makefile.install
Expand Up @@ -7,7 +7,7 @@
# Currently supports Debian (jessie, wheezy, squeeze), Ubuntu (12.04),
# Ubuntu (14.04) and Fedora (16 and 17).
#
# Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
# Installs Perl prereqs, libdbi, libdbi-drivers, and libyaz
#
# usage:
# make -f Makefile.install debian-jessie
Expand All @@ -29,14 +29,6 @@
# Make any assumptions about the shell being used explicit
export SHELL=/bin/bash

export LIBJS=js-1.7.0
export LIBJS_PERL=JavaScript-SpiderMonkey-0.21
export LIBJS_URL=http://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
export LIBJS_PERL_URL=http://mirror.datapipe.net/pub/CPAN/authors/id/T/TB/TBUSCH/$(LIBJS_PERL).tar.gz

# used for installing libjs lib and header files
export JS_INSTALL_PREFIX=/usr/

export LIBNET_Z3950_SIMPLESERVER=Net-Z3950-SimpleServer-1.15
export LIBNET_Z3950_SIMPLESERVER_URL=http://ftp.indexdata.dk/pub/simpleserver/$(LIBNET_Z3950_SIMPLESERVER)

Expand Down
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.common
Expand Up @@ -40,6 +40,5 @@ install_nodejs_from_source:
clean:
make -C $(LIBDBI) clean
make -C $(LIBDBI_DRIVERS) clean
make -C $(LIBJS_PERL) clean

# vim:noet:sw=4:ts=4:
24 changes: 1 addition & 23 deletions Open-ILS/src/extras/install/Makefile.debian
Expand Up @@ -5,27 +5,6 @@ APT_TOOL=apt-get -yq
install_debs:
$(APT_TOOL) install $(DEBS)

# Install the custom spidermonkey libs and JavaScript-SpiderMonkey Perl modules
install_js_sm: install_libjs install_spidermonkey

install_libjs:
if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
tar -zxf $(LIBJS).tar.gz
cd js/src/ && JS_DIST=/usr make -f Makefile.ref
mkdir -p $(JS_INSTALL_PREFIX)/include/js/
cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
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/
ldconfig


install_spidermonkey:
if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi
tar -zxf $(LIBJS_PERL).tar.gz
cd $(LIBJS_PERL) && perl Makefile.PL -E4X \
&& make && make test && make install

# On Ubuntu and possibly Debian, the libdbi0 package prevents the
# compiled-from-source version from being used and breaks the install.
# This package might get installed depending on the install-time choices
Expand All @@ -52,7 +31,6 @@ debian_sys_config:
ldconfig

clean:
make -f Makefile.ref -C js/src/ clean

echo "cleaning"

# vim:noet:sw=4:ts=4:
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.debian-jessie
Expand Up @@ -131,7 +131,6 @@ all:
make -f $(DIR)/Makefile.debian install_debs
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
make -f $(DIR)/Makefile.debian install_js_sm
make -f $(DIR)/Makefile.debian debian_sys_config

install_postgres_server:
Expand Down
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.debian-squeeze
Expand Up @@ -101,7 +101,6 @@ all: install_pgsql_client_backport_debs_91 install_yaz
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
make -f $(DIR)/Makefile.common install_libdbi
make -f $(DIR)/Makefile.debian install_js_sm
make -f $(DIR)/Makefile.debian debian_sys_config

install_yaz:
Expand Down
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.debian-wheezy
Expand Up @@ -125,7 +125,6 @@ all:
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
make -f $(DIR)/Makefile.common install_libdbi
make -f $(DIR)/Makefile.debian install_js_sm
make -f $(DIR)/Makefile.debian debian_sys_config

install_postgres_server:
Expand Down
32 changes: 1 addition & 31 deletions Open-ILS/src/extras/install/Makefile.fedora
Expand Up @@ -92,7 +92,7 @@ PGSQL_FEDORA_RPMS = \
postgresql-plperl \
postgresql-server

all: install_fedora_rpms install_js_sm
all: install_fedora_rpms
make -f $(DIR)/Makefile.common install_net_z3950_simpleserver
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
Expand All @@ -104,36 +104,6 @@ install_fedora_rpms:
yum -y update
yum -y install $(FEDORA_RPMS)

install_js_sm: install_libjs install_spidermonkey

install_libjs:
if [ ! -f $(LIBJS).tar.gz ]; then wget $(LIBJS_URL); fi;
tar -zxf $(LIBJS).tar.gz
cd js/src/ && JS_DIST=/usr make -f Makefile.ref
mkdir -p $(JS_INSTALL_PREFIX)/include/js/
cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
if [ ! -z $(FEDORA_64) ]; then \
cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib64/ && \
cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib64/; \
else \
cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
fi;
ldconfig

install_spidermonkey:
if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;
tar -zxf $(LIBJS_PERL).tar.gz
if [ ! -z $(FEDORA_64) ]; then \
sed -i -e 's/"\/usr\/lib"/"\/usr\/lib64"/' $(LIBJS_PERL)/Makefile.PL ; \
fi;
if [ ! -z $(FEDORA) ]; then \
sed -i -e 's/js32.dll/libjs.so/' $(LIBJS_PERL)/Makefile.PL ; \
fi;
cd $(LIBJS_PERL) && perl Makefile.PL -E4X && make && make test && make install


clean:
make -f $(DIR)/Makefile.common clean

Expand Down
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.ubuntu-precise
Expand Up @@ -128,7 +128,6 @@ all:
make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
make -f $(DIR)/Makefile.debian install_js_sm
make -f $(DIR)/Makefile.debian debian_sys_config

install_postgres_server:
Expand Down
1 change: 0 additions & 1 deletion Open-ILS/src/extras/install/Makefile.ubuntu-trusty
Expand Up @@ -136,7 +136,6 @@ all:
make -f $(DIR)/Makefile.debian test_for_libdbi_pkg
make -f $(DIR)/Makefile.common install_cpan
make -f $(DIR)/Makefile.common install_cpan_force
make -f $(DIR)/Makefile.debian install_js_sm
make -f $(DIR)/Makefile.debian debian_sys_config

install_postgres_server:
Expand Down
29 changes: 0 additions & 29 deletions Open-ILS/src/javascript/backend/catalog/biblio_descriptor.js

This file was deleted.

0 comments on commit 2d8af35

Please sign in to comment.