[open-ils-commits] [GIT] Evergreen ILS branch master updated. 85053a29a1f6b7cf1d04bd64175762eba5fb7351

[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  85053a29a1f6b7cf1d04bd64175762eba5fb7351 (commit)
       via  cbeb079a36c1a24678dcf711b706017834b483e6 (commit)
      from  474afc4472f737f2f17d290f854f733209487d96 (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 85053a29a1f6b7cf1d04bd64175762eba5fb7351
Author: Ben Shum <ben at evergreener.net>
Date:   Wed Sep 20 15:50:44 2017 -0400

    LP#1718549: Bump NodeJS version to v6.11.3
    
    Latest LTS release for NodeJS is v6.11.3. Should update this periodically
    depending on releases by that community.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 43bebfe..abb1086 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -40,7 +40,7 @@ export LIBDBI_HOST=http://open-ils.org/~denials/evergreen
 
 # some OSes require a newer version of NodeJS
 # NOTE: Using the LTS binaries for NodeJS
-export NODEJS_VERSION=v6.10.1
+export NODEJS_VERSION=v6.11.3
 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)"

commit cbeb079a36c1a24678dcf711b706017834b483e6
Author: Ben Shum <ben at evergreener.net>
Date:   Wed Sep 20 15:49:37 2017 -0400

    LP#1718549: Use Nodejs source install for all distributions
    
    Due to dependency issues and the need for newer NodeJS version, install
    from source for all distributions, not just the ones without pre-packaged
    apt sources.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 53039fb..c72c9a8 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -109,14 +109,10 @@ PGSQL_SERVER_DEBS_94 = \
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
 
-# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs
-# which is needed by our npm-installed packages
 DEVELOPER_DEBS = \
 	automake \
 	autoconf \
-	libtool \
-	nodejs-legacy \
-	npm
+	libtool
 
 PACKAGER_DEBS = \
 	asciidoc \
@@ -150,8 +146,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)"
diff --git a/Open-ILS/src/extras/install/Makefile.debian-stretch b/Open-ILS/src/extras/install/Makefile.debian-stretch
index bd15ce5..0918ef8 100644
--- a/Open-ILS/src/extras/install/Makefile.debian-stretch
+++ b/Open-ILS/src/extras/install/Makefile.debian-stretch
@@ -108,8 +108,6 @@ PGSQL_SERVER_DEBS_96 = \
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
 
-# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs
-# which is needed by our npm-installed packages
 DEVELOPER_DEBS = \
 	automake \
 	autoconf \
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index def3fb6..2f051a6 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -112,8 +112,6 @@ PGSQL_SERVER_DEBS_94 = \
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
 
-# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs
-# which is needed by our npm-installed packages
 DEVELOPER_DEBS = \
 	automake \
 	autoconf \
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
index ca0cdf3..a0a9e86 100644
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
@@ -108,14 +108,10 @@ PGSQL_SERVER_DEBS_95 = \
 # sections to support building Evergreen packages on servers
 # where Evergreen and its prereqs are not installed.
 
-# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs
-# which is needed by our npm-installed packages
 DEVELOPER_DEBS = \
 	automake \
 	autoconf \
-	libtool \
-	nodejs-legacy \
-	npm
+	libtool
 
 PACKAGER_DEBS = \
 	asciidoc \
@@ -149,8 +145,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               |    2 +-
 Open-ILS/src/extras/install/Makefile.debian-jessie |    9 ++-------
 .../src/extras/install/Makefile.debian-stretch     |    2 --
 Open-ILS/src/extras/install/Makefile.ubuntu-trusty |    2 --
 Open-ILS/src/extras/install/Makefile.ubuntu-xenial |    9 ++-------
 5 files changed, 5 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
Evergreen ILS