From 1843abc50fddc178e33b1b5bf229f5c418519b86 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Thu, 21 Sep 2017 14:37:08 -0400 Subject: [PATCH] Bumping version numbers and adding Changelog Signed-off-by: Dan Wells --- Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 1 + .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- README | 50 +++++++++++++--------- configure.ac | 4 +- docs/installation/server_upgrade.adoc | 30 ++++++------- 7 files changed, 51 insertions(+), 40 deletions(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 15bbf905ae..7a8d3e2faa 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "3-0-beta1"; + return "3-0-beta2"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index ff85e0e72b..ecfc494482 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -93,6 +93,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1076', :eg_version); -- miker/gmcharlt +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.0.beta2', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index ab9f36e2da..8ec3352c62 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_beta

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_beta2

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index b1f55df8e2..5a8af6ed94 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_beta"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_beta2"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/README b/README index b999a4e6aa..9f77a16cf4 100644 --- a/README +++ b/README @@ -54,21 +54,20 @@ autoreconf -i Installing prerequisites ------------------------ - * **PostgreSQL**: Version 9.4 is recommended. - The minimum supported version is 9.3. - * **Linux**: Evergreen 3.0 has been tested on Debian Jessie (8.0), - Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), + * **PostgreSQL**: The minimum supported version is 9.4. + * **Linux**: Evergreen has been tested on Debian Stretch (9), + Debian Jessie (8), Debian Wheezy (7), Ubuntu Xenial Xerus (16.04), and Ubuntu Trusty Tahr (14.04). 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 or Ubuntu websites. - * **OpenSRF**: The minimum supported version of OpenSRF is 2.5.1. + * **OpenSRF**: The minimum supported version of OpenSRF is 3.0.0. Evergreen has a number of prerequisite packages that must be installed before you can successfully configure, compile, and install Evergreen. -1. Begin by installing the most recent version of OpenSRF (2.5.1 or later). +1. Begin by installing the most recent version of OpenSRF (3.0.0 or later). You can download OpenSRF releases from http://evergreen-ils.org/opensrf-downloads/ 2. On some distributions, it is necessary to install PostgreSQL 9.4+ from external repositories. @@ -77,12 +76,12 @@ before you can successfully configure, compile, and install Evergreen. PostgreSQL, so steps are taken to automatically utilize the PostgreSQL community's apt sources. (For complete details, see: https://wiki.postgresql.org/wiki/Apt) - * Debian (Jessie) and Ubuntu (Xenial) comes with PostgreSQL 9.4+, + * Debian (Jessie/Stretch) and Ubuntu (Xenial) comes with PostgreSQL 9.4+, so no additional steps are required. + 3. Issue the following commands as the *root* Linux account to install prerequisites using the `Makefile.install` prerequisite installer, - substituting `debian-jessie`, `debian-wheezy`, + substituting `debian-stretch`, `debian-jessie`, `debian-wheezy`, `ubuntu-xenial`, or `ubuntu-trusty` for below: + [source, bash] @@ -94,8 +93,8 @@ make -f Open-ILS/src/extras/Makefile.install issuing the following commands as the *root* Linux account: + [NOTE] -You should skip this step if installing on Ubuntu Trusty, Ubuntu Xenial or Debian Jessie. The Ubuntu -and Debian Jessie targets use libdbd-pgsql from packages. +You should skip this step if installing on Ubuntu Trusty/Xenial or Debian Jessie/Stretch. The Ubuntu +and Debian Jessie/Stretch targets use libdbd-pgsql from packages. + .Debian Wheezy [source, bash] @@ -135,8 +134,8 @@ make -f Open-ILS/src/extras/Makefile.install -translator make -f Open-ILS/src/extras/Makefile.install -packager ------------------------------------------------------------------------------ -Optional: Extra steps for web staff client ------------------------------------------- +Extra steps for web staff client +-------------------------------- [NOTE] Skip this entire section if you are using an official release tarball downloaded @@ -219,7 +218,7 @@ Installation instructions + [source, bash] ------------------------------------------------------------------------------ -make STAFF_CLIENT_STAMP_ID=rel_3_0_beta1 install +make STAFF_CLIENT_STAMP_ID=rel_3_0_beta2 install ------------------------------------------------------------------------------ + 2. The server portion of the staff client expects `http://hostname/xul/server` @@ -246,6 +245,16 @@ change the ownership on the files: chown -R opensrf:opensrf /openils ------------------------------------------------------------------------------ +Run ldconfig +------------ + +On Debian Stretch, run the following command as the root user: + +[source, bash] +------------------------------------------------------------------------------ +ldconfig +------------------------------------------------------------------------------ + Additional Instructions for Developers -------------------------------------- @@ -287,7 +296,7 @@ mkdir /etc/apache2/ssl cd /etc/apache2/ssl ------------------------------------------------------------------------------ + -.Ubuntu Trusty, Ubuntu Xenial, and Debian Jessie +.Ubuntu Trusty/Xenial and Debian Jessie/Stretch [source,bash] ------------------------------------------------------------------------------------ cp Open-ILS/examples/apache_24/eg_24.conf /etc/apache2/sites-available/eg.conf @@ -345,7 +354,7 @@ place. ------------------------------------------------------------------------------ + -.Ubuntu Trusty, Ubuntu Xenial, Debian Jessie (`/etc/apache2/mods-available/mpm_prefork.conf`) +.Ubuntu Trusty/Xenial, Debian Jessie/Stretch (`/etc/apache2/mods-available/mpm_prefork.conf`) [source,bash] ------------------------------------------------------------------------------ @@ -357,7 +366,7 @@ place. ------------------------------------------------------------------------------ + -. (Ubuntu Trusty, Ubuntu Xenial, Debian Jessie) As the *root* user, +. (Ubuntu Trusty/Xenial, Debian Jessie/Stretch) As the *root* user, enable the mpm_prefork module: + [source,bash] @@ -374,7 +383,7 @@ a2dissite default # OPTIONAL: disable the default site (the "It Works" page) a2ensite eg.conf ------------------------------------------------------------------------------ + -(Ubuntu Trusty, Ubuntu Xenial, Debian Jessie): +(Ubuntu Trusty/Xenial, Debian Jessie/Stretch): + [source,bash] ------------------------------------------------------------------------------ @@ -438,8 +447,8 @@ To enable the default set of hooks, issue the following command as the cp -b /openils/conf/action_trigger_filters.json.example /openils/conf/action_trigger_filters.json ------------------------------------------------------------------------------ -For more information about configuring and using action triggers, see -<<_notifications_action_triggers,Notifications / Action Triggers>>. +For more information about configuring and running action triggers, see +<<_processing_action_triggers,Notifications / Action Triggers>>. Creating the Evergreen database ------------------------------- @@ -463,6 +472,7 @@ command below based on your operating system. [source, bash] ------------------------------------------------------------------------------ +make -f Open-ILS/src/extras/Makefile.install postgres-server-debian-stretch 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-trusty @@ -472,7 +482,7 @@ make -f Open-ILS/src/extras/Makefile.install postgres-server-ubuntu-xenial For a standalone PostgreSQL server, install the following Perl modules for your distribution as the *root* Linux account: -.(Debian Wheezy, Ubuntu Trusty, and Ubuntu Xenial) +.(Debian and Ubuntu) No extra modules required for these distributions. You need to create a PostgreSQL superuser to create and access the database. diff --git a/configure.ac b/configure.ac index d9260d3db7..d0b8e23b69 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, 3.0.beta1, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [3.0.beta1]) +AC_INIT(Open-ILS, 3.0.beta2, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [3.0.beta2]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_SUBDIRS([Open-ILS/xul/staff_client/external/libmar]) diff --git a/docs/installation/server_upgrade.adoc b/docs/installation/server_upgrade.adoc index 3245bd5339..0b752561e3 100644 --- a/docs/installation/server_upgrade.adoc +++ b/docs/installation/server_upgrade.adoc @@ -7,7 +7,7 @@ Software Prerequisites ~~~~~~~~~~~~~~~~~~~~~~ * **PostgreSQL**: The minimum supported version is 9.4. - * **Linux**: Evergreen 2.12.0 has been tested on Debian Stretch (9.0), + * **Linux**: Evergreen 3.0.beta2 has been tested on Debian Stretch (9.0), Debian Jessie (8.0), Debian Wheezy (7.0), Ubuntu Xenial Xerus (16.04), and Ubuntu Trusty Tahr (14.04). If you are running an older version of these distributions, you may want @@ -43,12 +43,12 @@ osrf_control --localhost --stop-all .. Back up the /openils directory. . Upgrade OpenSRF. Download and install the latest version of OpenSRF from the https://evergreen-ils.org/opensrf-downloads/[OpenSRF download page]. -. As the *opensrf* user, download and extract Evergreen 3.0.beta1: +. As the *opensrf* user, download and extract Evergreen 3.0.beta2: + [source, bash] ----------------------------------------------- -wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.0.beta1.tar.gz -tar xzf Evergreen-ILS-3.0.beta1.tar.gz +wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.0.beta2.tar.gz +tar xzf Evergreen-ILS-3.0.beta2.tar.gz ----------------------------------------------- + [NOTE] @@ -58,7 +58,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl + [source, bash] --------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.0.beta1 +cd /home/opensrf/Evergreen-ILS-3.0.beta2 --------------------------------------------- + On the next command, replace `[distribution]` with one of these values for your @@ -82,7 +82,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution] + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.0.beta1 +cd /home/opensrf/Evergreen-ILS-3.0.beta2 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf make ------------------------------------------------------------ @@ -93,8 +93,8 @@ These instructions assume that you have also installed OpenSRF under /openils/. + [source, bash] ------------------------------------------------------------ -cd /home/opensrf/Evergreen-ILS-3.0.beta1 -make STAFF_CLIENT_STAMP_ID=rel_3_0_beta1 install +cd /home/opensrf/Evergreen-ILS-3.0.beta2 +make STAFF_CLIENT_STAMP_ID=rel_3_0_beta2 install ------------------------------------------------------------ + . As the *root* user, change all files to be owned by the opensrf user and group: @@ -110,7 +110,7 @@ chown -R opensrf:opensrf /openils ----------------------------------------------------------- cd /openils/var/web/xul/ rm server -ln -sf rel_3_0_beta1/server server +ln -sf rel_3_0_beta2/server server ---------------------------------------------------------- + . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the @@ -130,7 +130,7 @@ Copying these configuration files will remove any customizations you have made t + [source, bash] ------------------------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.0.beta1 +cd /home/opensrf/Evergreen-ILS-3.0.beta2 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \ --create-offline --database evergreen --host localhost --user evergreen --password evergreen ------------------------------------------------------------------------- @@ -154,21 +154,21 @@ The diff command can be used to show the differences between the distribution ve + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.0.beta1/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup +cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup ---------------------------------------------------------- + .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.0.beta1/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf +cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf ---------------------------------------------------------- + .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf. + [source, bash] ---------------------------------------------------------- -cp /home/opensrf/Evergreen-ILS-3.0.beta1/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf +cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf ---------------------------------------------------------- Upgrade the Evergreen database schema @@ -267,8 +267,8 @@ as a user with the ability to connect to the database server. [source, bash] ---------------------------------------------------------- -cd /home/opensrf/Evergreen-ILS-3.0.beta1/Open-ILS/src/sql/Pg -psql -U evergreen -h localhost -f version-upgrade/2.12.5-3.0.beta1-upgrade-db.sql evergreen +cd /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/src/sql/Pg +psql -U evergreen -h localhost -f version-upgrade/2.12.5-3.0.beta2-upgrade-db.sql evergreen ---------------------------------------------------------- [TIP] -- 2.11.0