LP#1392759 dev/packager Makefile.install additions

Add additional packages to the "packager" target to help support
building Evergreen packages on machines where Evergreen and its prereqs
are not installed.

The "packager" target now depends internally on the "developer" target,
since packagers have to build the browser client dependencies.

Since older OSes have to build the nodejs dependencies, the autoconf,
etc. targets have been moved into the developer target, again to support
"headless" packaging.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/Open-ILS/src/extras/install/Makefile.debian-jessie b/Open-ILS/src/extras/install/Makefile.debian-jessie
index 170afa7..b8c661f 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-jessie
+++ b/Open-ILS/src/extras/install/Makefile.debian-jessie
@@ -93,13 +93,25 @@ PGSQL_SERVER_DEBS_93 = \
        postgresql-plperl-9.3 \
        postgresql-server-dev-9.3
 
+# note: some prereqs are repeated in the developer/packager 
+# 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 = \
+       make \
+       automake \
+       autoconf \
+       libtool \
        nodejs-legacy \
        npm
 
 PACKAGER_DEBS = \
+       libtemplate-perl \
+       liblocale-maketext-lexicon-perl \
+       asciidoc \
+       source-highlight \
        translate-toolkit \
        python-dev \
        python-levenshtein \
@@ -131,7 +143,7 @@ install_developer:
        npm install -g grunt-cli
        npm install -g bower
 
-install_packager:
+install_packager: install_developer
        make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
 
 clean:

diff --git a/Open-ILS/src/extras/install/Makefile.debian-wheezy b/Open-ILS/src/extras/install/Makefile.debian-wheezy
index ef76695..cc1c2e1 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.debian-wheezy
+++ b/Open-ILS/src/extras/install/Makefile.debian-wheezy
@@ -93,7 +93,25 @@ PGSQL_SERVER_DEBS_91 = \
        postgresql-plperl-9.1 \
        postgresql-server-dev-9.1
 
+# note: some prereqs are repeated in the developer/packager 
+# sections to support building Evergreen packages on servers
+# where Evergreen and its prereqs are not installed.
+
+DEVELOPER_DEBS = \
+       make \
+       automake \
+       autoconf \
+       libtool 
+
 PACKAGER_DEBS = \
+       make \
+       automake \
+       autoconf \
+       libtool \
+       libtemplate-perl \
+       liblocale-maketext-lexicon-perl \
+       asciidoc \
+       source-highlight \
        translate-toolkit \
        python-dev \
        python-levenshtein \
@@ -118,9 +136,10 @@ install_postgres_server:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
 
 install_developer:
+       make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)"
        make -f $(DIR)/Makefile.common install_nodejs_from_source
 
-install_packager:
+install_packager: install_developer
        make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
 
 clean:

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-precise b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
index 6ab5025..af09464 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-precise
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-precise
@@ -97,7 +97,21 @@ PGSQL_SERVER_DEBS_91 = \
        postgresql-plperl-9.1 \
        postgresql-server-dev-9.1
 
+# note: some prereqs are repeated in the developer/packager 
+# sections to support building Evergreen packages on servers
+# where Evergreen and its prereqs are not installed.
+
+DEVELOPER_DEBS = \
+       make \
+       automake \
+       autoconf \
+       libtool 
+
 PACKAGER_DEBS = \
+       libtemplate-perl \
+       liblocale-maketext-lexicon-perl \
+       asciidoc \
+       source-highlight \
        translate-toolkit \
        python-dev \
        python-levenshtein \
@@ -121,9 +135,10 @@ install_postgres_server:
        make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_91)"
 
 install_developer:
+       make -f $(DIR)/Makefile.debian DEBS="$(DEVELOPER_DEBS)"
        make -f $(DIR)/Makefile.common install_nodejs_from_source
 
-install_packager:
+install_packager: install_developer
        make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
 
 clean:

diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
index 8bed83e..abfb0fc 100644 (file)
--- a/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-trusty
@@ -101,13 +101,25 @@ PGSQL_SERVER_DEBS_93 = \
        postgresql-plperl-9.3 \
        postgresql-server-dev-9.3
 
+# note: some prereqs are repeated in the developer/packager 
+# 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 = \
+       make \
+       automake \
+       autoconf \
+       libtool \
        nodejs-legacy \
        npm
 
 PACKAGER_DEBS = \
+       libtemplate-perl \
+       liblocale-maketext-lexicon-perl \
+       asciidoc \
+       source-highlight \
        translate-toolkit \
        python-dev \
        python-levenshtein \
@@ -138,7 +150,7 @@ install_developer:
        npm install -g grunt-cli
        npm install -g bower
 
-install_packager:
+install_packager: install_developer
        make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
 
 clean: