From 098dc59699a224127e0540e24e0ff75de666a04b Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Fri, 14 Apr 2017 18:33:31 -0400 Subject: [PATCH] LP#1683388:Install newer NodeJS binary for Ubuntu Trusty and Debian Wheezy We need newer stuff! Signed-off-by: Ben Shum Signed-off-by: Kathy Lussier --- Open-ILS/src/extras/Makefile.install | 9 ++++++--- Open-ILS/src/extras/install/Makefile.common | 8 +++----- Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 7 ++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index 55f7635ee9..311a2fb607 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 20bdb07ce1..0cc35b1b43 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 385c342e5b..def3fb620c 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)" -- 2.11.0