From: Ben Shum <ben@evergreener.net>
Date: Wed, 20 Sep 2017 19:49:37 +0000 (-0400)
Subject: LP#1718549: Use Nodejs source install for all distributions
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=42d453450f813364cda92863468f3c3cd06ffd82;p=contrib%2FConifer.git

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@evergreener.net>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@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@masslnc.org>
---

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 945ba203be..79d77b10c1 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 f977825537..9166924170 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 ead590f273..4c2b517324 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