From 16474ec4e99963b3fa87ef2d9e13d5dbc9e9ad19 Mon Sep 17 00:00:00 2001 From: Robert Soulliere Date: Fri, 7 Jan 2011 13:35:37 -0500 Subject: [PATCH] Add 2.0 convert to tools. Update uograding 1.6 --- 1.6/admin/Upgrading-Evergreen_1.6.xml | 71 +++++++++------------------ tools/2.0Convert.sh | 31 ++++++++++++ tools/docbookConvert.sh | 19 ++++++- tools/docbtest.sh | 16 ++++++ 4 files changed, 87 insertions(+), 50 deletions(-) create mode 100755 tools/2.0Convert.sh create mode 100755 tools/docbtest.sh diff --git a/1.6/admin/Upgrading-Evergreen_1.6.xml b/1.6/admin/Upgrading-Evergreen_1.6.xml index 3bc0d19c29..6494607a77 100644 --- a/1.6/admin/Upgrading-Evergreen_1.6.xml +++ b/1.6/admin/Upgrading-Evergreen_1.6.xml @@ -2,10 +2,10 @@ - Upgrading Evergreen from 1.4 to 1.6.2 + Upgrading Evergreen to 1.6.1 This Chapter will explain the step-by-step process of upgrading Evergreen - from version 1.4 to 1.6.2, including steps to upgrade OpenSRF. Before + to 1.6.1, including steps to upgrade OpenSRF. Before upgrading, it is important to carefully plan an upgrade strategy to minimize system downtime and service interruptions. All of the steps in this chapter are to be completed from the command line. @@ -20,7 +20,7 @@ su - opensrf. Once you have become a non-root user, to become the root user again simply issue the exit command. In the following instructions, /path/to/OpenSRF/ represents the path to the OpenSRF source directory.
- Stop Evergreen and back up data. + Backing Up Data As root, stop the Apache @@ -47,10 +47,10 @@ As the opensrf user, download and extract the source files for OpenSRF - 1.4: + 1.6: wget http://open-ils.org/downloads/OpenSRF-1.6.2.tar.gz -tar xzf OpenSRF-1.4.0.tar.gz +tar xzf OpenSRF-1.6.2.tar.gz A new directory OpenSRF-1.6.2 is created. For the latest edition of OpenSRF, check the Evergreen download page at @@ -115,7 +115,7 @@ make -f src/extras/Makefile.install [distribution] you want to include support for PythonPython and Java Java, respectively. -cd /home/opensrf/OpenSRF-1.4.0 +cd /home/opensrf/OpenSRF-1.6.2 ./configure --prefix=/openils --sysconfdir=/openils/conf make @@ -157,22 +157,22 @@ srfsh#
-
- Upgrade <application>Evergreen</application> from 1.4 to 1.6.2 +
+ Upgrade <application>Evergreen</application> from 1.4 to 1.6.1 As the opensrf user, download and extract Evergreen 1.6.2.0 -wget http://open-ils.org/downloads/Evergreen-ILS-1.6.2.0.tar.gz -tar xzf Evergreen-ILS-1.6.2.0.tar.gz +wget http://open-ils.org/downloads/Evergreen-ILS-1.6.1.5.tar.gz +tar xzf Evergreen-ILS-1.6.1.5.tar.gz For the latest edition of Evergreen check the Evergreen download page at and adjust upgrading instructions accordingly. As the root user, install the prerequisites: - cd /home/opensrf/Evergreen-ILS-1.6.2.0 + cd /home/opensrf/Evergreen-ILS-1.6.1.5 On the next command, replace with one of these values for your distribution of Debian or Ubuntu: @@ -205,19 +205,19 @@ tar xzf Evergreen-ILS-1.6.2.0.tar.gz As the opensrf user, configure and compile Evergreen: - cd /home/opensrf/Evergreen-ILS-1.6.2.0 + cd /home/opensrf/Evergreen-ILS-1.6.1.5 ./configure --prefix=/openils --sysconfdir=/openils/conf make As the root user, install Evergreen: - make STAFF_CLIENT_BUILD_ID=rel_1_6_2_0 install + make STAFF_CLIENT_BUILD_ID=rel_1_6_1_5 install Change to the Evergreen installation directory: - cd /home/opensrf/Evergreen-ILS-1.6.2.0 + cd /home/opensrf/Evergreen-ILS-1.6.1.5 As the root user, change all files to be owned by the @@ -228,7 +228,7 @@ tar xzf Evergreen-ILS-1.6.2.0.tar.gz As the root user, build live-db-setup.pl for the cgi-bin bootstrapping scripts and offline-config.pl for the offline staff client data uploader: -cd /home/opensrf/Evergreen-ILS-1.6.2.0 +cd /home/opensrf/Evergreen-ILS-1.6.1.5 perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-offline \ --user evergreen --password evergreen --hostname localhost --port 5432 \ --database evergreen @@ -239,7 +239,7 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --create-bootstrap --create-of cd /openils/var/web/xul/ rm server -ln -s rel_1_6_2_0/server +ln -s rel_1_6_1_5/server @@ -258,7 +258,6 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.2-1.6.1.3-upgrade-db.sql evergreen psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.3-1.6.1.4-upgrade-db.sql evergreen psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.4-1.6.1.5-upgrade-db.sql evergreen -psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen @@ -304,13 +303,13 @@ perl Open-ILS/src/support-scripts/eg_db_config.pl --update-config --service all
-
- Upgrade <application>Evergreen</application>from 1.6.0 to 1.6.2 +
+ Upgrade <application>Evergreen</application> from 1.6.0 to 1.6.1 - Follow steps 1-8 of the instructions for upgrading Evergreen from 1.4 + Follow steps 1-8 of the instructions for upgrading Evergreen from 1.4 - + Update the Evergreen database: it is recommended that you back up your Evergreen database in order to restore your data if anything goes wrong. @@ -322,38 +321,14 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.2-1.6.1.3-upgrade-db.sql evergreen psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.3-1.6.1.4-upgrade-db.sql evergreen psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.4-1.6.1.5-upgrade-db.sql evergreen -psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen - Follow steps 10-16 of the instructions for upgrading Evergreen from 1.4 + Follow steps 10-16 of the instructions for upgrading Evergreen from 1.4 - - -
-
- Upgrade <application>Evergreen</application>from 1.6.1 to 1.6.2 - - - Follow steps 1-8 of the instructions for upgrading Evergreen from 1.4 - - - - Update the Evergreen database: - it is recommended that you back up your Evergreen database in order to restore your data if anything goes wrong. - - -psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/1.6.1.1-1.6.2-upgrade-db.sql evergreen - - - - Follow steps 10-16 of the instructions for upgrading Evergreen from 1.4 - - -
@@ -394,7 +369,7 @@ cd /openils/bin
Upgrading PostgreSQL from 8.2 to 8.4 - Evergreen 1.6.2 supports PostgreSQL version 8.4 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6. + Evergreen 1.6.1 supports PostgreSQL version 8.4 and it is recommended that you upgrade PostgreSQL when you upgrade Evergreen to 1.6. The order of the following steps is very important.databasesPostgreSQL @@ -446,5 +421,5 @@ psql -f /usr/share/postgresql/8.4/contrib/pgxml.sql evergreen - +
diff --git a/tools/2.0Convert.sh b/tools/2.0Convert.sh new file mode 100755 index 0000000000..8a8e7d7023 --- /dev/null +++ b/tools/2.0Convert.sh @@ -0,0 +1,31 @@ +#/bin/bash + +#generate 2.0 draft html + xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/2.0/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml-2.0.xsl ~/Evergreen-DocBook/2.0/root.xml + + +#Generate 2.0 PDF via FO + xsltproc --xinclude --output ~/Evergreen-DocBook/2.0/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/2.0/root.xml + +# must run fop from same directory as root.xml +cd ~/Evergreen-DocBook/2.0/ + + ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf + +# remove temporary .fo file +rm pdf/temp.fo + +#generate 1.6 draft html +# xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml + + +#Generate 1.6 PDF via FO +# xsltproc --xinclude --output ~/Evergreen-DocBook/1.6/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/root.xml + +# must run fop from same directory as root.xml +#cd ~/Evergreen-DocBook/1.6/ + +# ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/1.6/draft/pdf/Evergreen_Documentation.pdf + +# remove temporary .fo file +#rm pdf/temp.fo diff --git a/tools/docbookConvert.sh b/tools/docbookConvert.sh index 711c20f328..a871727ee0 100755 --- a/tools/docbookConvert.sh +++ b/tools/docbookConvert.sh @@ -1,10 +1,25 @@ #/bin/bash -#generate draft html +#generate 2.0 draft html + xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/2.0/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml-2.0.xsl ~/Evergreen-DocBook/2.0/root.xml + + +#Generate 2.0 PDF via FO + xsltproc --xinclude --output ~/Evergreen-DocBook/2.0/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/2.0/root.xml + +# must run fop from same directory as root.xml +cd ~/Evergreen-DocBook/2.0/ + + ~/doctools/fop/fop -fo pdf/temp.fo -pdf /openils/var/web/evergreen_documentation/2.0/draft/pdf/Evergreen_Documentation.pdf + +# remove temporary .fo file +rm pdf/temp.fo + +#generate 1.6 draft html xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml -#Generate PDF via FO +#Generate 1.6 PDF via FO xsltproc --xinclude --output ~/Evergreen-DocBook/1.6/pdf/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/root.xml # must run fop from same directory as root.xml diff --git a/tools/docbtest.sh b/tools/docbtest.sh new file mode 100755 index 0000000000..a9fa84d3e6 --- /dev/null +++ b/tools/docbtest.sh @@ -0,0 +1,16 @@ +#/bin/bash + +#generate draft html + # xsltproc --xinclude --stringparam base.dir /openils/var/web/evergreen_documentation/1.6/draft/html/ ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_xhtml.xsl ~/Evergreen-DocBook/1.6/root.xml + + +#Generate PDF via FO + xsltproc --xinclude --output ~/temp.fo ~/Evergreen-DocBook/stylesheets/evergreen_docbook_files/evergreen_fo.xsl ~/Evergreen-DocBook/1.6/test.xml + +# must run fop from same directory as file +cd ~/Evergreen-DocBook/1.6/ + + ~/doctools/fop/fop -fo ~/temp.fo -pdf ~/testfile.pdf + +# remove temporary .fo file +rm pdf/temp.fo -- 2.43.2