projects / evergreen / pines.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b2d5e7b)
Bumping version numbers, adding Upgrade Script and Changelog
authorblake <blake@mobiusconsortium.org>
Thu, 27 Jul 2017 21:11:32 +0000 (16:11 -0500)
committerChris Sharp <csharp@georgialibraries.org>
Fri, 18 Aug 2017 12:16:05 +0000 (08:16 -0400)
Signed-off-by: blake <blake@mobiusconsortium.org>
Open-ILS/src/perlmods/lib/OpenILS/Application.pm patch | blob | history
Open-ILS/src/sql/Pg/002.schema.config.sql patch | blob | history
Open-ILS/src/sql/Pg/version-upgrade/2.12.3-2.12.4-upgrade-db.sql [new file with mode: 0644] patch | blob
Open-ILS/xul/staff_client/chrome/content/main/about.html patch | blob | history
Open-ILS/xul/staff_client/defaults/preferences/prefs.js patch | blob | history
README patch | blob | history
configure.ac patch | blob | history
docs/installation/server_upgrade.adoc patch | blob | history

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm
index 6cf6150..23d70ba 100644 (file)
--- 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 "2-12-2";
+    return "2-12-4";
 }
 
 __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 55ac0a3..191b525 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1040', :eg_version); --gmcharlt/berick
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.2', :eg_version);
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.4', :eg_version);
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.12.3-2.12.4-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.12.3-2.12.4-upgrade-db.sql
new file mode 100644 (file)
index 0000000..83d427e
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.12.3-2.12.4-upgrade-db.sql
@@ -0,0 +1,5 @@
+--Upgrade Script for 2.12.3 to 2.12.4
+\set eg_version '''2.12.4'''
+BEGIN;
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.12.4', :eg_version);
+COMMIT;
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 f2ac48f..1ac40ed 100644 (file)
--- 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 @@
 <html><head><script></script></head><body onload="var x = document.getElementById('version'); var version ='/xul/server/'.split(/\//)[2]; if (version == 'server') { version = 'versionless debug build'; } x.appendChild(document.createTextNode(version));">
 <h1 style="text-decoration: underline">Evergreen</h1>
 <p>Target Server ID: <span id="version"></span></p>
-<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_2</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_4</p>
 <h2>What is Evergreen?</h2>
 <blockquote>
 <p>
diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js
index e702515..b5d7da1 100644 (file)
--- 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_2_12_2");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_2_12_4");
 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 2a22e67..aa68807 100644 (file)
--- a/README
+++ b/README
@@ -228,7 +228,7 @@ Installation instructions
 +
 [source, bash]
 ------------------------------------------------------------------------------
-make STAFF_CLIENT_STAMP_ID=rel_2_12_2 install
+make STAFF_CLIENT_STAMP_ID=rel_2_12_4 install
 ------------------------------------------------------------------------------
 +
 2. The server portion of the staff client expects `http://hostname/xul/server`
diff --git a/configure.ac b/configure.ac
index f36572c..60ace60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,8 +20,8 @@
 
 export PATH=${PATH}:/usr/sbin
 AC_PREREQ(2.61)
-AC_INIT(Open-ILS, 2.12.2, open-ils-dev@list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [2.12.2])
+AC_INIT(Open-ILS, 2.12.4, open-ils-dev@list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [2.12.4])
 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 99fa7a8..28071cd 100644 (file)
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -8,7 +8,7 @@ Software Prerequisites
 
   * **PostgreSQL**: Version 9.4 is recommended.
     The minimum supported version is 9.3.
-  * **Linux**: Evergreen 2.12.2 has been tested on Debian Jessie (8.0),
+  * **Linux**: Evergreen 2.12.4 has been tested on 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
@@ -44,12 +44,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 2.12.2:
+. As the *opensrf* user, download and extract Evergreen 2.12.4:
 +
 [source, bash]
 -----------------------------------------------
-wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.12.2.tar.gz
-tar xzf Evergreen-ILS-2.12.2.tar.gz
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-2.12.4.tar.gz
+tar xzf Evergreen-ILS-2.12.4.tar.gz
 -----------------------------------------------
 +
 [NOTE]
@@ -59,7 +59,7 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
 +
 [source, bash]
 ---------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.2
+cd /home/opensrf/Evergreen-ILS-2.12.4
 ---------------------------------------------
 +
 On the next command, replace `[distribution]` with one of these values for your
@@ -83,7 +83,7 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
 +
 [source, bash]
 ------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.2
+cd /home/opensrf/Evergreen-ILS-2.12.4
 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
 make
 ------------------------------------------------------------
@@ -111,7 +111,7 @@ chown -R opensrf:opensrf /openils
 -----------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
-ln -sf rel_2_12_1/server server
+ln -sf rel_2_12_4/server server
 ----------------------------------------------------------
 +
 . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -131,7 +131,7 @@ Copying these configuration files will remove any customizations you have made t
 +
 [source, bash]
 -------------------------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.2
+cd /home/opensrf/Evergreen-ILS-2.12.4
 perl Open-ILS/src/support-scripts/eg_db_config --update-config --service all \
 --create-offline --database evergreen --host localhost --user evergreen --password evergreen
 -------------------------------------------------------------------------
@@ -155,21 +155,21 @@ The diff command can be used to show the differences between the distribution ve
 +
 [source, bash]
 ----------------------------------------------------------
-cp /home/opensrf/Evergreen-ILS-2.12.2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+cp /home/opensrf/Evergreen-ILS-2.12.4/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-2.12.2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+cp /home/opensrf/Evergreen-ILS-2.12.4/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-2.12.2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+cp /home/opensrf/Evergreen-ILS-2.12.4/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
 ----------------------------------------------------------
 
 Upgrade the Evergreen database schema
@@ -228,13 +228,15 @@ would run the following upgrade scripts:
 - 2.11.3-2.12.0-upgrade-db.sql (this is a major version upgrade)
 - 2.12.0-2.12.1-upgrade-db.sql
 - 2.12.1-2.12.2-upgrade-db.sql
+- 2.12.2-2.12.3-upgrade-db.sql
+- 2.12.3-2.12.4-upgrade-db.sql
 
 Note that you do *not* want to run additional 2.5 scripts to upgrade to the
 newest version of 2.5, since currently there is no automated way to upgrade
 from 2.5.4+ to 2.6. Only upgrade as far as necessary to reach the major
 version upgrade script (in this example, as far as 2.5.3).
 
-To upgrade across multiple major versions (e.g. from 2.3.0 to 2.12.2), use
+To upgrade across multiple major versions (e.g. from 2.3.0 to 2.12.4), use
 the same logic to utilize the provided major version upgrade scripts. For
 example:
 
@@ -256,7 +258,7 @@ example:
 - 2.10.7-2.11.0-upgrade-db.sql
 - (run all incremental scripts from 2.11.0 to 2.11.3)
 - 2.11.3-2.12.0-upgrade-db.sql
-- (run all incremental scripts from 2.12.0 to 2.12.2)
+- (run all incremental scripts from 2.12.0 to 2.12.4)
 
 =============
 
@@ -271,10 +273,12 @@ as a user with the ability to connect to the database server.
 
 [source, bash]
 ----------------------------------------------------------
-cd /home/opensrf/Evergreen-ILS-2.12.2/Open-ILS/src/sql/Pg
+cd /home/opensrf/Evergreen-ILS-2.12.4/Open-ILS/src/sql/Pg
 psql -U evergreen -h localhost -f version-upgrade/2.11.3-2.12.0-upgrade-db.sql evergreen
 psql -U evergreen -h localhost -f version-upgrade/2.12.0-2.12.1-upgrade-db.sql evergreen
 psql -U evergreen -h localhost -f version-upgrade/2.12.1-2.12.2-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/2.12.2-2.12.3-upgrade-db.sql evergreen
+psql -U evergreen -h localhost -f version-upgrade/2.12.3-2.12.4-upgrade-db.sql evergreen
 ----------------------------------------------------------
 
 [TIP]
@@ -355,6 +359,6 @@ from the Evergreen community.
 Review Release Notes
 ~~~~~~~~~~~~~~~~~~~~
 
-Review the <<_evergreen_2_12_1_release_notes,2.12 release notes>> for other tasks
+Review the <<_evergreen_2_12_4_release_notes,2.12 release notes>> for other tasks
 that need to be done after upgrading.  If you have upgraded over several 
 major versions, you will need to review the release notes for each version also.
Evergreen working repo (PINES)