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>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 53039fb..c72c9a8 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)"