Update README and prereq installer for Evergreen trunk:

  * Favour PostgreSQL 8.4
  * Add ISN contrib
  * Update Dojo to 1.3.3
  * Add Ubuntu Lucid as a target
  * Remove Gentoo support (until we have a volunteer)
  * Remove Ubuntu Karmic support (can add back in at release time if warranted)

git-svn-id: svn://svn.open-ils.org/ILS/trunk@17031 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index caaddf6..7a4da60 100644 (file)
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -3,8 +3,8 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (etch/lenny), Ubuntu (hardy/karmic), and Gentoo.
-# Working towards support of CentOS 5 / RHEL 5 / Fedora 13.
+# Currently supports Debian (etch/lenny), Ubuntu (hardy/lucid), and Fedora (13).
+# Working towards support of CentOS 5 / RHEL 5.
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
 #
 # usage:
@@ -14,37 +14,24 @@
 #      - or -
 #      make -f Makefile.install ubuntu-hardy
 #      - or -
-#      make -f Makefile.install ubuntu-karmic
+#      make -f Makefile.install ubuntu-lucid
 #      - or -
 #      make -f Makefile.install fedora-13
 #      - or -
 #      make -f Makefile.install centos
 #      - or -
 #      make -f Makefile.install rhel
-#      - or -
-#      make -f Makefile.install gentoo
 #
 # Notes:
 #
 #      This makefile has been tested much more with Debian and Ubuntu than
-#      Fedora, CentOS, Gentoo, or RHEL.
-#
-#      Gentoo (especially amd64) requires a good bit of masked package
-#      mangling for some packages.  These are not documented here because
-#      they will continue to evolve
+#      Fedora, CentOS, or RHEL.
 #
 # ---------------------------------------------------------------------
  
 # Make any assumptions about the shell being used explicit
 SHELL=/bin/bash 
 
-# XXX
-# Gentoo needs explicit versions on many of these packages
-# to simulate a "blessed" set of packages
-#
-# Also, I (think) Gentoo has a javascript::spidermonkey package that does
-# not require fetching the sources externally ... needs testing/updating in here
-
 LIBJS=js-1.7.0
 LIBJS_PERL=JavaScript-SpiderMonkey-0.20
 LIBJS_URL=ftp://ftp.mozilla.org/pub/mozilla.org/js/$(LIBJS).tar.gz
@@ -235,26 +222,6 @@ PGSQL_SERVER_DEBS_84 = \
        postgresql-plperl-8.4 \
        postgresql-server-dev-8.4
 
-GENTOOS = \
-    yaz\
-    aspell-en\
-    dev-db/libpq\
-    dev-db/postgresql\
-    dev-perl/Email-Send\
-    dev-perl/DateTime\
-    dev-perl/DateTime-TimeZone\
-    dev-perl/DBD-Pg\
-    dev-perl/GD-Graph3d\
-    dev-perl/Text-Aspell\
-    dev-perl/Template-Toolkit\
-    dev-perl/Text-CSV_XS\
-    dev-perl/Spreadsheet-WriteExcel
-
-GENTOO_PERL = \
-    MARC::Record \
-    Net::Z3950::ZOOM \
-    Text::CSV
-
 DEB_APACHE_MODS = \
     expires\
     include\
@@ -303,12 +270,10 @@ etch: install_pgsql_client_debs_81 install_yaz install_cpan_marc install_extra_e
 lenny: install_pgsql_client_debs_83 install_extra_debs
 generic_debian:  install_debs install debian_sys_config install_cpan_safe
 
-gentoo: install_gentoos install_gentoo_perl install
-
 ubuntu-hardy: hardy generic_ubuntu
-ubuntu-karmic: karmic generic_ubuntu
+ubuntu-lucid: lucid generic_ubuntu
 hardy: install_pgsql_client_debs_82 install_yaz install_cpan_marc install_extra_encode
-karmic: install_pgsql_client_debs_84 install_extra_debs
+lucid: install_pgsql_client_debs_84 install_extra_debs
 generic_ubuntu: install_debs install debian_sys_config install_cpan_safe
 
 # - COMMON TARGETS ---------------------------------------------------------
@@ -428,15 +393,6 @@ install_extra_encode:
        $(APT_TOOL) install $(EXTRA_ENCODE)
 
 # ------------------------------------------------------------------
-# - GENTOO ---------------------------------------------------------
-
-install_gentoos:
-       emerge -n $(GENTOOS)
-
-install_gentoo_perl:
-       for m in $(GENTOO_PERL); do perl -MCPAN -e "install \"$$m\";"; done
-
-# ------------------------------------------------------------------
 
 # FEDORA 13
 install_fedora_13_rpms:

diff --git a/README b/README
index 0243787..988f4b1 100644 (file)
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
-README for Evergreen 1.6
+README for Evergreen trunk
 
 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 (1.1 or later).
+1. Begin by installing the most recent version of OpenSRF (1.4.0 or later).
 You can download OpenSRF releases from
 http://evergreen-ils.org/downloads
 
@@ -15,13 +15,12 @@ installer.
 
 Issue the following commands as the root user to install prerequisites
 using the Makefile.install prerequisite installer, substituting
-"debian-etch", "debian-lenny", "ubuntu-hardy",
-"ubuntu-intrepid", "ubuntu-karmic", "centos", "rhel", or "gentoo"
-for <osname> below:
+"debian-etch", "debian-lenny", "fedora-13", "ubuntu-hardy", "ubuntu-lucid",
+"centos", or "rhel" for <osname> below:
 
 make -f Open-ILS/src/extras/Makefile.install <osname>
 
-Note: "centos", "rhel", and "gentoo" are less tested than the debian
+Note: "centos" and "rhel" are less tested than the debian, fedora,
 and ubuntu options.  Your patches and suggestions for improvement are
 welcome!
 
@@ -40,7 +39,7 @@ Installation instructions:
 Once you have configured and compiled Evergreen, issue the following
 command as the root user to install Evergreen:
 
-make STAFF_CLIENT_BUILD_ID=rel_1_6_0_0 install
+make STAFF_CLIENT_BUILD_ID=rel_trunk install
 
 This will install Evergreen, including example configuration files in
 /openils/conf/ that you can use as templates for your own configuration files.
@@ -59,9 +58,9 @@ Issue the following commands as the root user to fetch, extract, and copy the
 files into the correct directory, adjusting the version number to match the
 version of the Dojo Toolkit that you downloaded:
 
-wget http://download.dojotoolkit.org/release-1.3.2/dojo-release-1.3.2.tar.gz
-tar -C /openils/var/web/js -xzf dojo-release-1.3.2.tar.gz
-cp -r /openils/var/web/js/dojo-release-1.3.2/* /openils/var/web/js/dojo/.
+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/.
 
 Change ownership of the Evergreen files:
 =======================================
@@ -100,26 +99,28 @@ connection information in opensrf.xml for you.
 Creating the Evergreen database:
 ===============================
 
-PostgreSQL 8.2 or 8.3 will be installed on your system by the Makefile.install
+PostgreSQL 8.3 or 8.4 will be installed on your system by the Makefile.install
 prerequisite installer if packages are available for your distribution, or
-you will have to compile PostgreSQL 8.2 or 8.3 from source and install it (which
-is beyond the scope of this document).
+you will have to compile PostgreSQL 8.3 or 8.4 from source and install it (which
+is beyond the scope of this document). PostgreSQL 8.4 is recommended if you have
+the option.
 
 Once the PostgreSQL database server has been installed, you will need to
 create the database and add the appropriate languages and extensions to
 support Evergreen. Issue the following commands as the "postgres" user to set
 up a database called "evergreen". Note that the location of the PostgreSQL
 "contrib" packages may vary depending on your distribution. In the following
-commands, we assume that you are working with PostgreSQL 8.3 on a Debian-based
+commands, we assume that you are working with PostgreSQL 8.4 on a Debian-based
 system:
 
 createdb -E UNICODE evergreen
 createlang plperl evergreen
 createlang plperlu evergreen
 createlang plpgsql evergreen
-psql -f /usr/share/postgresql/8.3/contrib/tablefunc.sql -d evergreen
-psql -f /usr/share/postgresql/8.3/contrib/tsearch2.sql -d evergreen
-psql -f /usr/share/postgresql/8.3/contrib/pgxml.sql -d evergreen
+psql -f /usr/share/postgresql/8.4/contrib/tablefunc.sql -d evergreen
+psql -f /usr/share/postgresql/8.4/contrib/tsearch2.sql -d evergreen
+psql -f /usr/share/postgresql/8.4/contrib/pgxml.sql -d evergreen
+psql -f /usr/share/postgresql/8.4/contrib/isn.sql -d evergreen
 
 Once you have created the Evergreen database, you need to create a PostgreSQL
 user to access the database. Issue the following command as the "postgres"