From: Thomas Berezansky Date: Mon, 2 Apr 2012 17:55:13 +0000 (-0400) Subject: Tagging version X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1d0a166830343029ab3d182ee15f430f2a8929e1;p=evergreen%2Ftadl.git Tagging version Signed-off-by: Thomas Berezansky --- diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index cd4dbbf9c0..7e36e0e9d4 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -6,7 +6,7 @@ use base qw/OpenSRF::Application/; 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 "HEAD"; + return "2-2"; } __PACKAGE__->register_method( 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 2609bb6b3f..74431923f4 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:

$HeadURL$

http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_2

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 6352b6e04e..97dbf01f77 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","$HeadURL$"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/Evergreen.git?h=refs/heads/rel_2_2"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/Open-ILS/xul/staff_client/windowssetup.nsi b/Open-ILS/xul/staff_client/windowssetup.nsi index 847eedc072..0609db08fa 100644 --- a/Open-ILS/xul/staff_client/windowssetup.nsi +++ b/Open-ILS/xul/staff_client/windowssetup.nsi @@ -3,7 +3,7 @@ ; HM NIS Edit Wizard helper defines ; Old versions of makensis don't like this, moved to Makefile ;!define /file PRODUCT_VERSION "client/VERSION" -!define PRODUCT_TAG "Master" +!define PRODUCT_TAG "2.2" !define PRODUCT_INSTALL_TAG "${PRODUCT_TAG}" !define UI_IMAGESET "beta" ;!define UI_IMAGESET "release" diff --git a/README b/README index c6ea396f73..dc1ecbf551 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -README for Evergreen master -=========================== +README for Evergreen 2.2 +======================== :toc: :numbered: @@ -76,7 +76,7 @@ Installing prerequisites 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.0 or later). +1. Begin by installing the most recent version of OpenSRF (2.1 or later). You can download OpenSRF releases from http://evergreen-ils.org/opensrf.php 2. On many distributions, it is necessary to install PostgreSQL 9 from external repositories. @@ -163,7 +163,7 @@ Installation instructions + [source, bash] ------------------------------------------------------------------------------ -make STAFF_CLIENT_STAMP_ID=rel_name install +make STAFF_CLIENT_STAMP_ID=rel_2_2 install ------------------------------------------------------------------------------ + 2. The server portion of the staff client expects `http://hostname/xul/server` diff --git a/configure.ac b/configure.ac index 1d99e190cb..d599a51622 100644 --- a/configure.ac +++ b/configure.ac @@ -20,8 +20,8 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, trunk, open-ils-dev@list.georgialibraries.org) -AM_INIT_AUTOMAKE([OpenILS], [trunk]) +AC_INIT(Open-ILS, 2.2, open-ils-dev@list.georgialibraries.org) +AM_INIT_AUTOMAKE([OpenILS], [2.2]) AC_REVISION($Revision: 0.1 $) AC_CONFIG_SRCDIR([configure.ac]) AC_PREFIX_DEFAULT([/openils/])