[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. f055ff46b9eb702767f7fa8ed074a38d4e7ca727

[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, rel_2_12 has been updated
       via  f055ff46b9eb702767f7fa8ed074a38d4e7ca727 (commit)
       via  42d453450f813364cda92863468f3c3cd06ffd82 (commit)
       via  317b3c85f08ee658bc7423088079e647f28d616b (commit)
      from  2e9d3f7886c064d6534df7ffa8a4bf045ccd9ba2 (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 f055ff46b9eb702767f7fa8ed074a38d4e7ca727
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>
    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 311a2fb..6af1e50 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -38,7 +38,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 42d453450f813364cda92863468f3c3cd06ffd82
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>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    
    Conflicts:
    	Open-ILS/src/extras/install/Makefile.debian-jessie
    	Open-ILS/src/extras/install/Makefile.debian-stretch
    	Open-ILS/src/extras/install/Makefile.ubuntu-xenial
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 945ba20..79d77b1 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:
 # packages, use the packaged versions 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
 	npm install -g bower
 
 install_translator: install_developer
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index f977825..9166924 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 ead590f..4c2b517 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:
 # packages, use the packaged versions 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
 	npm install -g bower
 
 install_translator: install_developer

commit 317b3c85f08ee658bc7423088079e647f28d616b
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>
    
    Conflicts:
    	Open-ILS/src/extras/install/Makefile.ubuntu-trusty
    
    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 81dd53c..80f7ba0 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
 	npm install -g bower
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index bcddd7e..f977825 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:
 # packages, use the packaged versions 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
 	npm install -g bower
 
 install_translator: install_developer

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

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |    9 ++++++---
 Open-ILS/src/extras/install/Makefile.common        |    8 +++-----
 Open-ILS/src/extras/install/Makefile.debian-jessie |    9 ++-------
 Open-ILS/src/extras/install/Makefile.ubuntu-trusty |    9 ++-------
 Open-ILS/src/extras/install/Makefile.ubuntu-xenial |    9 ++-------
 5 files changed, 15 insertions(+), 29 deletions(-)


hooks/post-receive
-- 
Evergreen ILS