From 776506a7d2fbb9ee6ce7038e0de36bae3e8da94a Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 14 Nov 2014 10:45:07 -0500 Subject: [PATCH] LP#1392759 ubunty trust developer/packager targets Adds support for ubuntu-trusty-developer and ubuntu-trusty-packager Makefile.install prerequisite build targets. Signed-off-by: Bill Erickson --- Open-ILS/src/extras/Makefile.install | 6 ++++ Open-ILS/src/extras/install/Makefile.ubuntu-trusty | 32 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install index bb46f6dfc8..dd6233ead0 100644 --- a/Open-ILS/src/extras/Makefile.install +++ b/Open-ILS/src/extras/Makefile.install @@ -91,4 +91,10 @@ postgres-server-ubuntu-precise: postgres-server-fedora: @make -f $(DIR)/Makefile.fedora install_postgres_server +ubuntu-trusty-developer: + @make -f $(DIR)/Makefile.ubuntu-trusty install_developer + +ubuntu-trusty-packager: + @make -f $(DIR)/Makefile.ubuntu-trusty install_packager + # vim:noet:sw=4:ts=4: diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty index fb8da3ca0d..ff533b0a4d 100644 --- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty +++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty @@ -101,6 +101,27 @@ PGSQL_SERVER_DEBS_93 = \ postgresql-plperl-9.3 \ postgresql-server-dev-9.3 +# nodejs-legacy creates a symlink for /usr/bin/node -> /usr/bin/nodejs +# which is needed by our npm-installed packages +DEVELOPER_DEBS = \ + autoconf \ + automake \ + libtool \ + nodejs-legacy \ + npm + +PACKAGER_DEBS = \ + translate-toolkit \ + python-dev \ + python-levenshtein \ + python-polib \ + python-setuptools \ + python-simplejson \ + python-lxml \ + zip \ + unzip \ + nsis + all: make -f $(DIR)/Makefile.debian install_debs make -f $(DIR)/Makefile.debian test_for_libdbi_pkg @@ -112,6 +133,17 @@ all: install_postgres_server: make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_93)" +# note: if/when grunt-cli and bower are available as +# packages, use the packaged versions instead. +install_developer: + make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)" + npm update + npm install -g grunt-cli + npm install -g bower + +install_packager: + make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)" + clean: make -f $(DIR)/Makefile.common clean make -f $(DIR)/Makefile.debian clean -- 2.11.0