[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. bab7ddd4c26739177eb202678b91a09a38d87c20
Evergreen Git
git at git.evergreen-ils.org
Tue Jul 9 20:00:46 EDT 2013
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_4 has been updated
via bab7ddd4c26739177eb202678b91a09a38d87c20 (commit)
via c9ef08c29a9348fdeb4f565dc9e3d98c45c6b0fa (commit)
from 7a5ac53af5f5c151fcee4a0c3405493d022533d6 (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 bab7ddd4c26739177eb202678b91a09a38d87c20
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Jul 9 16:53:29 2013 -0400
Correct Linux staff client build instructions
There were a few things going on here; 2.3 introduced linux32-client and
linux64-client targets, so the old linux-client Make target no longer
worked.
Also, Wine isn't generally how many of us would recommend running staff
clients when there's a perfectly good native client likely to better
support printing, etc.
Also, rather than pointing at evergreen-ils.org for downloads, which
won't work in many situations (and which prevents the use of the
auto-update mechanism), use the "updates" target to point at the locally
downloadable clients. Eventually we'll properly document the use of
auto-updates, but for now this is hopefully a step in the right
direction.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/docs/installation/staff_client_installation.txt b/docs/installation/staff_client_installation.txt
index 5eb6052..a59bc29 100644
--- a/docs/installation/staff_client_installation.txt
+++ b/docs/installation/staff_client_installation.txt
@@ -42,67 +42,54 @@ image::media/staff_client_installation_3.png[]
When you login to Evergreen from the workstation for the first time, you will
also need to <<register_workstation,register your workstation>>.
-Installing on Linux
+Installing on Linux
~~~~~~~~~~~~~~~~~~~
-Installation instructions for Linux.
-
-
indexterm:[staff client, installation, Linux]
-
-Using Wine and the Windows client
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-
-indexterm:[staff client, installation, Wine]
-
-One of th easiest ways to run a staff client on a Linux machine is to use the
-Windows client with Wine.
-
-. Install http://www.winehq.org/download/[Wine] on your Linux machine.
-. Download the staff client from http://www.open-ils.org/downloads.php.
-. Right click on the downloaded file and open with _Wine Windows
-Program Loader_.
-. Follow the same instructions as you would for
-<<installing_staff_client_on_Windows, installing the staff client on windows>>.
-
-Building and Deploying an Evergreen Staff Client on Linux
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-indexterm:[staff client, building, Linux]
-
-. From the Evergreen *server*, Navigate to the staff_client directory:
+. On the Evergreen *server*, navigate to the `staff_client` directory inside
+ the Evergreen source:
+
[source, bash]
---------
-cd /home/opensrf/Evergreen-ILS-2.3.3/Open-ILS/xul/staff_client
---------
-+
-. _Make_ a linux staff client
-+
+--------
+cd /path/to/Evergreen/Open-ILS/xul/staff_client
+--------
++
+. As the *root* user, build release versions of staff clients for both
+ 32-bit and 64-bit Linux systems:
++
[source, bash]
---------
-make linux-client
--------
-+
-This will generate a staff client tarball called
-_evergreen_staff_client.tar.bz2_
-+
-. FTP or SCP the tarball to your staff client
-machine.
-. From your staff client machine, create a folder with the name of
-your staff client and version.
-. Extract the tar files into that folder
-. Within the folder, click on the _evergreen_ file to start the program.
-+
+make rigrelease rebuild linux32-updates-client linux64-updates-client
+--------
++
+This builds and copies two staff client tarballs for Linux to the `updates`
+directory on the Web server.
++
+. As the *root* user, reset the ownership of the Evergreen install directory
+ to the *opensrf* user. For example, if your install directory is `/openils`:
++
+[source, bash]
+--------
+chown -R opensrf:opensrf /openils
+--------
++
+. On your staff client workstation, download the 32-bit or 64-bit version of
+ the staff client from your Web server at
+ http://hostname/updates/manualupdate.html (where _hostname_ represents the
+ hostname of your Web server).
+. On your staff client workstation, create a directory with the name of your
+ staff client and version.
+. Extract the tar files into that directory.
+. Within the directory, click on the `evergreen` file to start the program.
++
Or, you can run the program from a terminal (command line). For example, if the
-evergreen files were extracted to a directory called evergreen_client_2.3.3 in
-your home directory, you can run it with:
-+
+staff client files were extracted to a directory called `evergreen_client` in
+your home directory, you can run it with:
++
[source, bash]
--------
-~/evergreen_client_2.3.3/evergreen
+~/evergreen_client/evergreen
--------
Registering a Workstation
commit c9ef08c29a9348fdeb4f565dc9e3d98c45c6b0fa
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Jul 9 19:43:17 2013 -0400
Build 64-bit Linux client updates when asked
A copy/paste error led to a request for linux64-updates-client to
generate 32-bit clients instead of the requested 64-bit clients.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/xul/staff_client/external/make_updates.sh b/Open-ILS/xul/staff_client/external/make_updates.sh
index d708e91..36fa1fe 100755
--- a/Open-ILS/xul/staff_client/external/make_updates.sh
+++ b/Open-ILS/xul/staff_client/external/make_updates.sh
@@ -64,7 +64,7 @@ case "$2" in
;;
linux64-updates*)
echo "Building Linux (64 bit) Updates only"
- LINUX32_UPDATES=1
+ LINUX64_UPDATES=1
;;
extension-updates*)
echo "Building Extension Updates only"
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/xul/staff_client/external/make_updates.sh | 2 +-
docs/installation/staff_client_installation.txt | 87 ++++++++-----------
2 files changed, 38 insertions(+), 51 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list