[open-ils-commits] [GIT] Evergreen ILS branch rel_2_5 updated. 650e70e337adf410535d274488ad352c486e752a

[Evergreen Git]

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, rel_2_5 has been updated
       via  650e70e337adf410535d274488ad352c486e752a (commit)
      from  33fe69e9336d70fed77c244aabf94ffc208a1553 (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 650e70e337adf410535d274488ad352c486e752a
Author: Elliot V <evoris at slcconline.edu>
Date:   Thu Mar 6 23:43:00 2014 -0600

    LP#1077811 Inconsistent INSTALL Instructions
    
    The preamble to the installation instructions, intended for
    developers, is a bit unclear. The instructions describe actions
    that should take place at two different points in the installation.
    
    This commit moves the instructions to download and install the Dojo
    Toolkit until after the opensrf Linux user already owns the
    /openils directory. It also adds the appropriate note for non-devs
    to skip this section.
    
    Signed-off-by: Elliot V <evoris at slcconline.edu>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>

diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt
index c46b044..2533f96 100644
--- a/docs/installation/server_installation.txt
+++ b/docs/installation/server_installation.txt
@@ -57,19 +57,6 @@ source directory to generate the configure script and Makefiles:
 autoreconf -i
 ------------------------------------------------------------------------------
 
-After running `make install`, developers also need to install the Dojo Toolkit
-set of JavaScript libraries. The appropriate version of Dojo is included
-in Evergreen release tarballs. Developers should install the Dojo 1.3.3
-version of Dojo by issuing the following commands as the *opensrf* Linux
-account:
-
-[source, bash]
-------------------------------------------------------------------------------
-wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
-tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
-cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
-------------------------------------------------------------------------------
-
 Installing prerequisites
 ------------------------
 
@@ -194,6 +181,27 @@ change the ownership on the files:
 chown -R opensrf:opensrf /openils
 ------------------------------------------------------------------------------
 
+Additional Instructions for Developers
+--------------------------------------
+
+[NOTE]
+Skip this section if you are using an official release tarball downloaded
+from http://evergreen-ils.org/downloads
+
+Developers working directly with the source code from the Git repository,
+rather than an official release tarball, need to install the Dojo Toolkit
+set of JavaScript libraries. The appropriate version of Dojo is included in
+Evergreen release tarballs. Developers should install the Dojo 1.3.3 version
+of Dojo by issuing the following commands as the *opensrf* Linux account:
+
+[source, bash]
+------------------------------------------------------------------------------
+wget http://download.dojotoolkit.org/release-1.3.3/dojo-release-1.3.3.tar.gz
+tar -C /openils/var/web/js -xzf dojo-release-1.3.3.tar.gz
+cp -r /openils/var/web/js/dojo-release-1.3.3/* /openils/var/web/js/dojo/.
+------------------------------------------------------------------------------
+
+
 Configure the Apache Web server
 -------------------------------
 

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

Summary of changes:
 docs/installation/server_installation.txt |   34 +++++++++++++++++-----------
 1 files changed, 21 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Evergreen ILS