projects / evergreen / pines.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a392051)
Bumping version numbers and adding Changelog
authorDan Wells <dbw2@calvin.edu>
Wed, 27 Sep 2017 20:06:42 +0000 (16:06 -0400)
committerChris Sharp <csharp@georgialibraries.org>
Thu, 28 Sep 2017 17:43:15 +0000 (13:43 -0400)
Signed-off-by: Dan Wells <dbw2@calvin.edu>
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/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 7a8d3e2..378a1e8 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 "3-0-beta2";
+    return "3-0-rc";
 }
 
 __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 9fb81da..1cc3729 100644 (file)
--- 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 ('1077', :eg_version); -- csharp/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.0.rc', :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 8ec3352..9964641 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_3_0_beta2</p>
+<p>http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_rc</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 5a8af6e..305500e 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_3_0_beta2");
+pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_0_rc");
 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 9f77a16..dfee608 100644 (file)
--- a/README
+++ b/README
@@ -218,7 +218,7 @@ Installation instructions
 +
 [source, bash]
 ------------------------------------------------------------------------------
-make STAFF_CLIENT_STAMP_ID=rel_3_0_beta2 install
+make STAFF_CLIENT_STAMP_ID=rel_3_0_rc install
 ------------------------------------------------------------------------------
 +
 2. The server portion of the staff client expects `http://hostname/xul/server`
diff --git a/configure.ac b/configure.ac
index d0b8e23..f70785b 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, 3.0.beta2, open-ils-dev@list.georgialibraries.org)
-AM_INIT_AUTOMAKE([OpenILS], [3.0.beta2])
+AC_INIT(Open-ILS, 3.0.rc, open-ils-dev@list.georgialibraries.org)
+AM_INIT_AUTOMAKE([OpenILS], [3.0.rc])
 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 a87fbb8..386c9f4 100644 (file)
--- a/docs/installation/server_upgrade.adoc
+++ b/docs/installation/server_upgrade.adoc
@@ -6,9 +6,8 @@ All of the steps in this chapter are to be completed from the command line.
 Software Prerequisites
 ~~~~~~~~~~~~~~~~~~~~~~
 
-  * **PostgreSQL**: Version 9.4 is recommended.
-    The minimum supported version is 9.3.
-  * **Linux**: Evergreen 2.12.0 has been tested on Debian Stretch,
+  * **PostgreSQL**: The minimum supported version is 9.4.
+  * **Linux**: Evergreen 3.0.rc 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
@@ -44,12 +43,21 @@ 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].
+<<<<<<< HEAD
 . As the *opensrf* user, download and extract Evergreen 3.0.beta2:
 +
 [source, bash]
 -----------------------------------------------
 wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.0.beta2.tar.gz
 tar xzf Evergreen-ILS-3.0.beta2.tar.gz
+=======
+. As the *opensrf* user, download and extract Evergreen 3.0.rc:
++
+[source, bash]
+-----------------------------------------------
+wget https://evergreen-ils.org/downloads/Evergreen-ILS-3.0.rc.tar.gz
+tar xzf Evergreen-ILS-3.0.rc.tar.gz
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 -----------------------------------------------
 +
 [NOTE]
@@ -59,7 +67,11 @@ For the latest edition of Evergreen, check the https://evergreen-ils.org/egdownl
 +
 [source, bash]
 ---------------------------------------------
+<<<<<<< HEAD
 cd /home/opensrf/Evergreen-ILS-3.0.beta2
+=======
+cd /home/opensrf/Evergreen-ILS-3.0.rc
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ---------------------------------------------
 +
 On the next command, replace `[distribution]` with one of these values for your
@@ -83,7 +95,11 @@ make -f Open-ILS/src/extras/Makefile.install [distribution]
 +
 [source, bash]
 ------------------------------------------------------------
+<<<<<<< HEAD
 cd /home/opensrf/Evergreen-ILS-3.0.beta2
+=======
+cd /home/opensrf/Evergreen-ILS-3.0.rc
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 PATH=/openils/bin:$PATH ./configure --prefix=/openils --sysconfdir=/openils/conf
 make
 ------------------------------------------------------------
@@ -94,8 +110,13 @@ These instructions assume that you have also installed OpenSRF under /openils/.
 +
 [source, bash]
 ------------------------------------------------------------
+<<<<<<< HEAD
 cd /home/opensrf/Evergreen-ILS-3.0.beta2
 make STAFF_CLIENT_STAMP_ID=rel_3_0_beta2 install
+=======
+cd /home/opensrf/Evergreen-ILS-3.0.rc
+make STAFF_CLIENT_STAMP_ID=rel_3_0_rc install
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ------------------------------------------------------------
 +
 . As the *root* user, change all files to be owned by the opensrf user and group:
@@ -111,7 +132,11 @@ chown -R opensrf:opensrf /openils
 -----------------------------------------------------------
 cd /openils/var/web/xul/
 rm server
+<<<<<<< HEAD
 ln -sf rel_3_0_beta2/server server
+=======
+ln -sf rel_3_0_rc/server server
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ----------------------------------------------------------
 +
 . As the *opensrf* user, update opensrf_core.xml and opensrf.xml by copying the
@@ -131,7 +156,11 @@ Copying these configuration files will remove any customizations you have made t
 +
 [source, bash]
 -------------------------------------------------------------------------
+<<<<<<< HEAD
 cd /home/opensrf/Evergreen-ILS-3.0.beta2
+=======
+cd /home/opensrf/Evergreen-ILS-3.0.rc
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 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 +184,33 @@ The diff command can be used to show the differences between the distribution ve
 +
 [source, bash]
 ----------------------------------------------------------
+<<<<<<< HEAD
 cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+=======
+cp /home/opensrf/Evergreen-ILS-3.0.rc/Open-ILS/examples/apache/eg_startup /etc/apache2/eg_startup
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ----------------------------------------------------------
 +
 .. Update /etc/apache2/eg_vhost.conf by copying the example from Open-ILS/examples/apache/eg_vhost.conf.
 +
 [source, bash]
 ----------------------------------------------------------
+<<<<<<< HEAD
 cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+=======
+cp /home/opensrf/Evergreen-ILS-3.0.rc/Open-ILS/examples/apache/eg_vhost.conf /etc/apache2/eg_vhost.conf
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ----------------------------------------------------------
 +
 .. Update /etc/apache2/sites-available/eg.conf by copying the example from Open-ILS/examples/apache/eg.conf.
 +
 [source, bash]
 ----------------------------------------------------------
+<<<<<<< HEAD
 cp /home/opensrf/Evergreen-ILS-3.0.beta2/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+=======
+cp /home/opensrf/Evergreen-ILS-3.0.rc/Open-ILS/examples/apache/eg.conf /etc/apache2/sites-available/eg.conf
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ----------------------------------------------------------
 
 Upgrade the Evergreen database schema
@@ -268,8 +309,13 @@ as a user with the ability to connect to the database server.
 
 [source, bash]
 ----------------------------------------------------------
+<<<<<<< HEAD
 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
+=======
+cd /home/opensrf/Evergreen-ILS-3.0.rc/Open-ILS/src/sql/Pg
+psql -U evergreen -h localhost -f version-upgrade/2.12.6-3.0.rc-upgrade-db.sql evergreen
+>>>>>>> 8502059... Bumping version numbers and adding Changelog
 ----------------------------------------------------------
 
 [TIP]
Evergreen working repo (PINES)