[open-ils-commits] [GIT] Evergreen ILS branch master updated. 495b2539b26195235dc62ba4e388d522784ead92

[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  495b2539b26195235dc62ba4e388d522784ead92 (commit)
       via  098dc59699a224127e0540e24e0ff75de666a04b (commit)
      from  ea4d8b9bcaa982dc06292c8bc72c9ee76ca94f0f (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 495b2539b26195235dc62ba4e388d522784ead92
Author: Ben Shum <ben at evergreener.net>
Date:   Fri Apr 14 18:51:01 2017 -0400

    LP#1683388: Docs: README change for nodejs installation
    
    Now that we have Makefile developer support for Wheezy too, we can
    skip the extra steps if we use the developer make target for any
    supported distribution.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index 8d8c49a..3d2d973 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -146,8 +146,7 @@ Install dependencies for web staff client
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [NOTE]
-You may skip this section if you are installing on either Debian Jessie,
-Ubuntu Trusty, or Ubuntu Xenial and you have installed the previously described
+You may skip this section if you have installed the previously described
 'Optional: Developer Additions'.  You will still need to do the following
 steps in <<install_files_for_web_staff_client,Install files for web staff client>>.
 

commit 098dc59699a224127e0540e24e0ff75de666a04b
Author: Ben Shum <ben at evergreener.net>
Date:   Fri Apr 14 18:33:31 2017 -0400

    LP#1683388:Install newer NodeJS binary for Ubuntu Trusty and Debian Wheezy
    
    We need newer stuff!
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 55f7635..311a2fb 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -36,9 +36,12 @@ export LIBDBI=libdbi-0.8.3
 export LIBDBI_DRIVERS=libdbi-drivers-0.8.3
 export LIBDBI_HOST=http://open-ils.org/~denials/evergreen
 
-# some OSes require a source install of NodeJS.
-# NOTE: Deprecate me with wheezy
-export NODEJS_SOURCE_VERSION=v0.10.28
+# some OSes require a newer version of NodeJS
+# NOTE: Using the LTS binaries for NodeJS
+export NODEJS_VERSION=v6.10.1
+export NODEJS_BINDIR=node-$(NODEJS_VERSION)-linux-x64
+export NODEJS_TARBIN=$(NODEJS_BINDIR).tar.xz
+export NODEJS_BINARY="https://nodejs.org/dist/$(NODEJS_VERSION)/$(NODEJS_TARBIN)"
 
 # As this Makefile is designed to be used by a make process running as
 # root, this will avoid problems on some systems when tar extracts
diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index 20bdb07..0cc35b1 100644
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -28,12 +28,10 @@ install_libdbi:
 		--with-pgsql --with-pgsql-incdir=$$(pg_config --includedir) \
 		--with-pgsql-libdir=$$(pg_config --libdir) && make all install  
 
-# NOTE: Deprecate me with wheezy
+# NOTE: Use the NodeJS Binary
 install_nodejs_from_source:
-	git clone https://github.com/joyent/node.git
-	cd node; \
-	git checkout -b $(NODEJS_SOURCE_VERSION) $(NODEJS_SOURCE_VERSION); \
-	./configure && make && make install
+	wget -N $(NODEJS_BINARY)
+	tar -C /usr/local --strip-components 1 -xJf $(NODEJS_TARBIN)
 	npm update
 	npm install -g grunt-cli
 
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 385c342..def3fb6 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -117,9 +117,7 @@ PGSQL_SERVER_DEBS_94 = \
 DEVELOPER_DEBS = \
 	automake \
 	autoconf \
-	libtool \
-	nodejs-legacy \
-	npm
+	libtool
 
 PACKAGER_DEBS = \
 	asciidoc \
@@ -156,8 +154,7 @@ install_postgres_server:
 # package, use the packaged version instead.
 install_developer:
 	make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)"
-	npm update
-	npm install -g grunt-cli
+	make -f $(DIR)/Makefile.common install_nodejs_from_source
 
 install_translator: install_developer
 	make -f $(DIR)/Makefile.debian DEBS="$(TRANSLATOR_DEBS)"

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

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |    9 ++++++---
 Open-ILS/src/extras/install/Makefile.common        |    8 +++-----
 Open-ILS/src/extras/install/Makefile.ubuntu-trusty |    7 ++-----
 docs/installation/server_installation.txt          |    3 +--
 4 files changed, 12 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
Evergreen ILS