From d1b8b4b2a6982bd82d4c6a644e63b43f7fa26573 Mon Sep 17 00:00:00 2001 From: Elliot V Date: Thu, 6 Mar 2014 23:43:00 -0600 Subject: [PATCH] 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. Signed-off-by: Elliot V --- docs/installation/server_installation.txt | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/docs/installation/server_installation.txt b/docs/installation/server_installation.txt index fed6d84932..a01e1359fd 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,22 @@ change the ownership on the files: chown -R opensrf:opensrf /openils ------------------------------------------------------------------------------ +Additional Instructions for Developers +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +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 ------------------------------- -- 2.11.0