[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2cf65ef923145aade9a6ced615dfd29d4d6216b3

Evergreen Git git at git.evergreen-ils.org
Wed May 4 13:34:43 EDT 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  2cf65ef923145aade9a6ced615dfd29d4d6216b3 (commit)
       via  ae4505cb7ae130906d8801b6ec726e052357eed9 (commit)
       via  f811b197ab5381883961f38f1cf2a3e2d47f2e05 (commit)
       via  0605c1eb6d22a616773e6fba27a10e936a2c5d35 (commit)
       via  233e14df23361ef2e14e086be57d584ecb3eaca4 (commit)
      from  463f5358841f1ec668290ad598dc0e83b9e8fc90 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2cf65ef923145aade9a6ced615dfd29d4d6216b3
Author: Ben Shum <ben at evergreener.net>
Date:   Wed May 4 13:22:28 2016 -0400

    LP#1551084: Add 16.04 version notes in server_upgrade doc
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/docs/installation/server_upgrade.txt b/docs/installation/server_upgrade.txt
index 1266901..2b4cb54 100644
--- a/docs/installation/server_upgrade.txt
+++ b/docs/installation/server_upgrade.txt
@@ -9,7 +9,7 @@ Software Prerequisites
  * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
     is 9.1.
   * **Linux**: Evergreen 2.10.1 has been tested on Debian Jessie (8.0),
-    Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04),
+    Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), Ubuntu Trusty Tahr (14.04),
     Ubuntu Precise Pangolin (12.04), and Fedora.
     If you are running an older version of these distributions, you may want
     to upgrade before upgrading Evergreen. For instructions on upgrading these
@@ -70,6 +70,7 @@ indexterm:[Linux, Ubuntu]
 +
   * `debian-jessie` for Debian Jessie (8.0) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
   * `debian-wheezy` for Debian Wheezy (7.0)
+  * `ubuntu-xenial` for Ubuntu Xenial Xerus (16.04) (EDI compatibility in progress)
   * `ubuntu-trusty` for Ubuntu Trusty Tahr (14.04) (See https://bugs.launchpad.net/evergreen/+bug/1342227[Bug 134222] if you want to use EDI)
   * `ubuntu-precise` for Ubuntu Precise Pangolin (12.04)
   * `fedora` for Fedora

commit ae4505cb7ae130906d8801b6ec726e052357eed9
Author: Ben Shum <ben at evergreener.net>
Date:   Tue Apr 19 10:36:39 2016 -0400

    LP#1551084: Fixup typo for ubuntu-xenial-developer
    
    Jason spotted a typo. Can probably squash this in later.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index f6144a3..2a372b6 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -88,7 +88,7 @@ postgres-server-fedora:
 	@make -f $(DIR)/Makefile.fedora install_postgres_server
 
 ubuntu-xenial-developer:
-	@make -f $(DIR)/Makefile.xenial-trusty install_developer
+	@make -f $(DIR)/Makefile.ubuntu-xenial install_developer
 ubuntu-trusty-developer:
 	@make -f $(DIR)/Makefile.ubuntu-trusty install_developer
 debian-jessie-developer:

commit f811b197ab5381883961f38f1cf2a3e2d47f2e05
Author: Ben Shum <ben at evergreener.net>
Date:   Mon Feb 29 01:30:29 2016 -0500

    LP#1551084: Update README to include references for 'ubuntu-xenial'
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index a218903..74679c0 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -57,8 +57,8 @@ Installing prerequisites
   * **PostgreSQL**: Version 9.3 is recommended. The minimum supported version
     is 9.1.
   * **Linux**: Evergreen 2.8 has been tested on Debian Jessie (8.0), 
-    Debian Wheezy (7.0), Ubuntu Trusty Tahr (14.04), 
-    Ubuntu Precise Pangolin (12.04), and Fedora. 
+    Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), 
+    Ubuntu Trusty Tahr (14.04), Ubuntu Precise Pangolin (12.04), and Fedora. 
     If you are running an older version of these distributions, you may want 
     to upgrade before upgrading Evergreen. For instructions on upgrading these
     distributions, visit the Debian, Ubuntu or Fedora websites.
@@ -73,7 +73,7 @@ before you can successfully configure, compile, and install Evergreen.
 2. On some distributions, it is necessary to install PostgreSQL 9.1+ from external
    repositories.
 +
-  * Debian Wheezy and Jessie Ubuntu Precise and Trusty comes with
+  * Debian (Wheezy and Jessie) and Ubuntu (Precise, Trusty, and Xenial) comes with
     PostgreSQL 9.1+, so no additional steps are required.
   * Fedora 19 and 20 come with PostgreSQL 9.2+, so no additional steps are required.
 +
@@ -82,7 +82,7 @@ before you can successfully configure, compile, and install Evergreen.
 4. Issue the following commands as the *root* Linux account to install
    prerequisites using the `Makefile.install` prerequisite installer,
    substituting `debian-jessie`, `debian-wheezy`, `fedora`, 
-   `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
+   `ubuntu-xenial`, `ubuntu-trusty`, or `ubuntu-precise` for <osname> below:
 +
 [source, bash]
 ------------------------------------------------------------------------------
@@ -93,7 +93,7 @@ make -f Open-ILS/src/extras/Makefile.install <osname>
    issuing the following commands as the *root* Linux account:
 +
 [NOTE]
-You should skip this step if installing on Ubuntu Precise, Trusty or Debian Jessie. The ubuntu
+You should skip this step if installing on Ubuntu Precise, Trusty, Xenial or Debian Jessie. The Ubuntu
 and Debian Jessie targets use libdbd-pgsql from packages.
 +
 .Debian Wheezy
@@ -142,7 +142,7 @@ from http://evergreen-ils.org/downloads
 
 [NOTE]
 You make skip the subsection `Install dependencies for browser-based staff client'
-if you are installing on either Debian Jessie or Ubuntu Trusty and you have
+if you are installing on either Debian Jessie, Ubuntu Trusty, or Ubuntu Xenial and you have
 installed the `Optional: Developer Additions' described above.  You will still
 need to do the steps in `Install files for browser-based staff client' below.
 
@@ -309,7 +309,7 @@ mkdir /etc/apache2/ssl
 cd /etc/apache2/ssl
 ------------------------------------------------------------------------------
 +
-.Ubuntu Trusty and Debian Jessie
+.Ubuntu Trusty, Ubuntu Xenial, and Debian Jessie
 [source,bash]
 ------------------------------------------------------------------------------------
 cp Open-ILS/examples/apache_24/eg_24.conf       /etc/apache2/sites-available/eg.conf
@@ -379,7 +379,7 @@ place.
    MaxRequestsPerChild 10000
 </IfModule>
 ------------------------------------------------------------------------------
-    d. (Ubuntu Trusty, Debian Jessie) As the *root* user, edit 
+    d. (Ubuntu Trusty, Ubuntu Xenial, Debian Jessie) As the *root* user, edit 
        /etc/apache2/mods-available/mpm_prefork.conf to match the above values.  
        Then, also as the *root* user, enable the mpm_prefork module by doing:
 +
@@ -400,7 +400,7 @@ a2dissite default  # OPTIONAL: disable the default site (the "It Works" page)
 a2ensite eg.conf
 ------------------------------------------------------------------------------
 +
-(Ubuntu Trusty, Debian Jessie):
+(Ubuntu Trusty, Ubuntu Xenial, Debian Jessie):
 +
 [source,bash]
 ------------------------------------------------------------------------------
@@ -474,6 +474,7 @@ make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-jessie
 make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-wheezy
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-precise
 make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-trusty
+make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial
 make -f Open-ILS/src/extras/Makefile.install postgres-server-fedora
 ------------------------------------------------------------------------------
 
@@ -497,7 +498,7 @@ distribution as the *root* Linux account:
 cpan Rose::URI
 ---------------------------------------------------------------------------------
 
-.(Debian "wheezy" and Ubuntu Trusty) 
+.(Debian Wheezy, Ubuntu Trusty, and Ubuntu Xenial) 
 No extra modules required for these distributions.
 
 .(Fedora)

commit 0605c1eb6d22a616773e6fba27a10e936a2c5d35
Author: Ben Shum <ben at evergreener.net>
Date:   Mon Feb 29 01:20:34 2016 -0500

    LP#1551084: Start new Makefile target for 'ubuntu-xenial'
    
    For Ubuntu 16.04, let's start a new Makefile target for 'ubuntu-xenial'
    
    For major changes, the packaged version of PostgreSQL that ships with
    Ubuntu 16.04 is PostgreSQL 9.5.
    
    Also, during the configure step, the build process looks for libpcre3-dev,
    so we add that as an additional prerequisite now.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 1b7a60d..f6144a3 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -5,7 +5,7 @@
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
 # Currently supports Debian (jessie, wheezy), Ubuntu (12.04), 
-# Ubuntu (14.04) and Fedora (16 and 17).
+# Ubuntu (14.04), Ubuntu (16.04), and Fedora (16 and 17).
 #
 # Installs Perl prereqs, libdbi, libdbi-drivers, and libyaz
 #
@@ -18,6 +18,8 @@
 # 	- or -
 # 	make -f Makefile.install ubuntu-trusty
 # 	- or -
+# 	make -f Makefile.install ubuntu-xenial
+# 	- or -
 # 	make -f Makefile.install fedora
 #
 # ---------------------------------------------------------------------
@@ -63,6 +65,8 @@ debian-jessie:
 	@make -f $(DIR)/Makefile.debian-jessie
 debian-wheezy:
 	@make -f $(DIR)/Makefile.debian-wheezy
+ubuntu-xenial:
+	@make -f $(DIR)/Makefile.ubuntu-xenial
 ubuntu-trusty:
 	@make -f $(DIR)/Makefile.ubuntu-trusty
 ubuntu-precise:
@@ -74,6 +78,8 @@ postgres-server-debian-jessie:
 	@make -f $(DIR)/Makefile.debian-jessie install_postgres_server
 postgres-server-debian-wheezy:
 	@make -f $(DIR)/Makefile.debian-wheezy install_postgres_server
+postgres-server-ubuntu-xenial:
+	@make -f $(DIR)/Makefile.ubuntu-xenial install_postgres_server
 postgres-server-ubuntu-trusty:
 	@make -f $(DIR)/Makefile.ubuntu-trusty install_postgres_server
 postgres-server-ubuntu-precise:
@@ -81,6 +87,8 @@ postgres-server-ubuntu-precise:
 postgres-server-fedora:
 	@make -f $(DIR)/Makefile.fedora install_postgres_server
 
+ubuntu-xenial-developer:
+	@make -f $(DIR)/Makefile.xenial-trusty install_developer
 ubuntu-trusty-developer:
 	@make -f $(DIR)/Makefile.ubuntu-trusty install_developer
 debian-jessie-developer:
@@ -90,6 +98,8 @@ ubuntu-precise-developer:
 debian-wheezy-developer:
 	@make -f $(DIR)/Makefile.debian-wheezy install_developer
 
+ubuntu-xenial-packager:
+	@make -f $(DIR)/Makefile.ubuntu-xenial install_packager
 ubuntu-trusty-packager:
 	@make -f $(DIR)/Makefile.ubuntu-trusty install_packager
 debian-jessie-packager:
diff --git a/Open-ILS/src/extras/install/Makefile.ubuntu-xenial b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
new file mode 100644
index 0000000..726fdbb
--- /dev/null
+++ b/Open-ILS/src/extras/install/Makefile.ubuntu-xenial
@@ -0,0 +1,156 @@
+# install files for Ubuntu Xenial
+
+DIR = $(dir $(lastword $(MAKEFILE_LIST)))
+
+export DEB_PGSQL_COMMON_MODS = \
+	gcc \
+	libbusiness-isbn-perl \
+	libjson-xs-perl \
+	liblibrary-callnumber-lc-perl \
+	libmarc-record-perl \
+	libmarc-xml-perl \
+	librose-uri-perl \
+	libuuid-tiny-perl \
+	libxml-libxml-perl \
+	libxml-libxslt-perl
+
+export DEBS = \
+	$(DEB_PGSQL_COMMON_MODS) \
+	apache2-dev\
+	aspell\
+	aspell-en\
+	libbusiness-creditcard-perl\
+	libbusiness-isbn-data-perl\
+	libbusiness-issn-perl\
+	libbusiness-onlinepayment-authorizenet-perl\
+	libbusiness-onlinepayment-payflowpro-perl\
+	libbusiness-onlinepayment-perl\
+	libdate-manip-perl\
+	libdatetime-format-builder-perl\
+	libdatetime-format-iso8601-perl\
+	libdatetime-format-mail-perl\
+	libdatetime-perl\
+	libdatetime-set-perl\
+	libdatetime-timezone-perl\
+	libdbd-pg-perl\
+	libdbd-pgsql\
+	libdbi-dev\
+	libdbi1\
+	libemail-simple-perl\
+	libexcel-writer-xlsx-perl\
+	libgd-graph3d-perl\
+	liblocale-maketext-lexicon-perl\
+	liblog-log4perl-perl\
+	libmarc-charset-perl \
+	libncurses5-dev\
+	libnet-ip-perl\
+	libnet-ldap-perl \
+	libnet-server-perl\
+	libnet-ssh2-perl\
+	libnet-z3950-simple2zoom-perl\
+	libnet-z3950-simpleserver-perl\
+	libnet-z3950-zoom-perl \
+	libnspr4-dev\
+	libole-storage-lite-perl\
+	libparent-perl\
+	libpq5\
+	libpq-dev\
+	libpcre3-dev\
+	librpc-xml-perl\
+	libsru-perl\
+	libssh2-1-dev\
+	libtemplate-plugin-posix-perl\
+	libtest-warn-perl\
+	libtest-output-perl\
+	libtext-aspell-perl\
+	libtext-csv-perl\
+	libuniversal-require-perl\
+	libunix-syslog-perl\
+	libyaz-dev\
+	postgresql-client-9.5\
+	libsoap-lite-perl\
+	libbz2-dev\
+	libparse-recdescent-perl\
+	yaz
+
+export DEB_APACHE_MODS = \
+    expires\
+    include\
+    proxy\
+    proxy_http\
+    rewrite\
+    cgi
+
+export DEB_APACHE_DISMODS = \
+    deflate
+
+export CPAN_MODULES = \
+	Business::OnlinePayment::PayPal \
+	Email::Send
+
+export CPAN_MODULES_FORCE = \
+	Business::Stripe \
+	Class::DBI::Frozen::301
+
+PGSQL_SERVER_DEBS_95 = \
+	$(DEB_PGSQL_COMMON_MODS) \
+	postgresql-9.5 \
+	postgresql-contrib-9.5 \
+	postgresql-plperl-9.5 \
+	postgresql-server-dev-9.5
+
+# 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 = \
+	automake \
+	autoconf \
+	libtool \
+	nodejs-legacy \
+	npm
+
+PACKAGER_DEBS = \
+	libtemplate-perl \
+	liblocale-maketext-lexicon-perl \
+	asciidoc \
+	source-highlight \
+	translate-toolkit \
+	python-dev \
+	python-levenshtein \
+	python-polib \
+	python-setuptools \
+	python-simplejson \
+	python-lxml \
+	zip \
+	unzip \
+	bzr \
+	nsis
+
+all:
+	make -f $(DIR)/Makefile.debian install_debs
+	make -f $(DIR)/Makefile.common install_cpan
+	make -f $(DIR)/Makefile.common install_cpan_force
+	make -f $(DIR)/Makefile.debian debian_sys_config
+
+install_postgres_server:
+	make -f $(DIR)/Makefile.debian DEBS="$(PGSQL_SERVER_DEBS_95)"
+
+# 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: install_developer
+	make -f $(DIR)/Makefile.debian DEBS="$(PACKAGER_DEBS)"
+
+clean:
+	make -f $(DIR)/Makefile.common clean
+	make -f $(DIR)/Makefile.debian clean
+
+# vim:noet:sw=4:ts=4:

commit 233e14df23361ef2e14e086be57d584ecb3eaca4
Author: Ben Shum <ben at evergreener.net>
Date:   Mon Feb 29 01:14:38 2016 -0500

    LP#1551084: Symlink for 000.english.pg95.fts-config.sql
    
    We need this so that the eg_db_config script can make the Evergreen
    database with PostgreSQL 9.5 systems.
    
    Signed-off-by: Ben Shum <ben at evergreener.net>
    Signed-off-by: Jason Stephenson <jason at sigio.com>

diff --git a/Open-ILS/src/sql/Pg/000.english.pg95.fts-config.sql b/Open-ILS/src/sql/Pg/000.english.pg95.fts-config.sql
new file mode 120000
index 0000000..0b24fd9
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/000.english.pg95.fts-config.sql
@@ -0,0 +1 @@
+000.english.pg91.fts-config.sql
\ No newline at end of file

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install               |   12 ++++++++++-
 ...kefile.debian-jessie => Makefile.ubuntu-xenial} |   21 +++++++++----------
 ...-config.sql => 000.english.pg95.fts-config.sql} |    0
 docs/installation/server_installation.txt          |   21 ++++++++++---------
 docs/installation/server_upgrade.txt               |    3 +-
 5 files changed, 34 insertions(+), 23 deletions(-)
 copy Open-ILS/src/extras/install/{Makefile.debian-jessie => Makefile.ubuntu-xenial} (91%)
 copy Open-ILS/src/sql/Pg/{000.english.pg92.fts-config.sql => 000.english.pg95.fts-config.sql} (100%)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list