Changeset 22484 for main/trunk/greenstone2/build-src/packages

Timestamp:

2010-07-22T18:36:32+12:00 (14 years ago)

Author:

ak19

Message:

README now contains the commit messages for the recent Greenstone customisations to xlhtml packages

File:

• main/trunk/greenstone2/build-src/packages/xlhtml/README.txt (modified) (2 diffs)

main/trunk/greenstone2/build-src/packages/xlhtml/README.txt

@@ +1 @@
+************************************************** 
+README ON THE GREENSTONE MODIFICATIONS TO XLHTML
+**************************************************
+
 This package contains two programs:
 * ppthtml, which converts Microsoft PowerPoint 95 and 97 files
@@ -18 +22 @@
 John McPherson
 NZDL.
+
+
+************************************************** 
+CHANGES FROM 2010 ON
+**************************************************
+
+FILE: packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz 
+(Contains original source code + windows-specific makefiles)
+
+The xlhtml package now provides the code to produce the binaries
+ppthtml and xlhtml to convert from powerpoint to html and excel to
+html.
+
+For a little while we tried a later version of xlhtml (0.5) but went
+back to 0.4.9.0, including the necessary modifications, since it was a
+bit hard to set up v0.5 for compiling on Linux.
+
+
+OTHER AFFECTED FILES INCLUDE:
+- main/trunk/binaries/windows/bin: the xlthml.exe and ppthtml.exe 
+- main/trunk/greenstone2/build-src/win32.mak
+- main/trunk/greenstone2/build-src/packages/configure
+- main/trunk/greenstone2/build-src/packages/Makefile.in and Makefile
+(- main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.5-gs.tar.gz)
+- main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
+
+
+1. http://trac.greenstone.org/browser/main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz?rev=22107
+
+Revision 22107, 301.3 KB (checked in by kjdon, 2 months ago)
+
+Added windows makefiles. Had to comment out a little bit of code in
+xlhtml.c and ppthtml.c that used dir.h - this is no longer
+available. The code was getting the drive letter from the filename,
+then setting the default drive to that letter.
+
+
+2. TEMPORARY SHIFT TO xlhtml 0.5 (required too much effort modifying
+Linux configure and makefiles to get this to readily configure and
+compile from source code, so later we would shift a step back to
+xlhtml.0.4.9.0:
+
+http://trac.greenstone.org/browser/main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.5-gs.tar.gz?rev=22137
+
+Revision 22137, 280.8 KB (checked in by ak19, 2 months ago)
+
+Dr Bainbridge got xlhtml (including ppthtml) compiling on XP
+again. The executables work on Vista, Windows7 and XP.
+
+
+3. http://trac.greenstone.org/browser/main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz?rev=22154
+
+Revision 22154, 301.9 KB  (checked in by ak19, 2 months ago)
+
+1. Undoing commit of xlhtml-0.5 from yesterday and this morning since
+   its Makefiles are entirely different (from 2005 and use automak
+   command and depcomp files regularly). 
+
+2. Replaced this with previously used xlhtml-0.4.9.0, but with all the
+   changes made to xlhtml-0.5 (to get that compiling and running on
+   Windows XP, Vista, Win7) ported into here.
+
+3. This xlhtml-0.4.9.0-gs.tar.gz file has been tested to work on
+   Vista, XP, Win7 (both executables and compilation). And it has also
+   been tested to compile and run on Linux.
+
+
+4. Changeset 22155 for main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz
+Timestamp:21.05.2010 20:22:28 (2 months ago)
+Author:ak19
+Message:
+Have switched back to xlhtml-0.4.9.0-gs.tar.gz since the old version
+compiles on Linux (but it now includes all improvements previously
+made to xlhtml-0.5.-gs.tar.gz, so that 0.4.9.0 now compiles on Win XP,
+Vista and 7, as well as on Linux again.
+
+
+
+***************************************************************
+5. DELETED NEWER VERSION BEFORE GOING BACK TO THE OLD ONE (WITH
+   MODIFICATIONS)
+***************************************************************
+
+a) http://trac.greenstone.org/changeset/22138
+Changeset 22138
+Timestamp:20.05.2010 19:55:53 (2 months ago)
+Message:
+Older version of xlhtml that would compile and work on Windows7, but
+would not work after compiling on XP. Nor did it run on Vista.  
+
+Files: 1 removed
+        * main/trunk/greenstone2/build-src/packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz 
+
+* http://trac.greenstone.org/browser/main/trunk/greenstone2/build-src/packages?rev=22157
+
+
+b) http://trac.greenstone.org/changeset/22146
+
+Changeset 22146
+Timestamp: 21.05.2010 14:10:52 (2 months ago)
+Author: ak19
+
+Message:
+1. In version xlhtml-0.5, there's a Makefile.am which needs depcomp to
+   be generated which is done by making configure call: automake -a
+   -c.
+
+2. In Makefile.in and Makefile, needed to update the references to
+   xlhtml.0.4.9 to refer to xlhtml-0.5 instead, just as was done with
+   configure in the previous commit.
+
+Location: main/trunk/greenstone2/build-src/packages
+Files: 3 modified
+        * Makefile (modified) (1 diff)
+        * Makefile.in (modified) (1 diff)
+        * configure (modified) (1 diff)
+
+
+THEN:
+c) http://trac.greenstone.org/changeset/22154
+Changeset 22154
+Timestamp: 21.05.2010 20:20:11 (2 months ago)
+Author: ak19
+Message: Same message as in (3) above.
+
+Location: main/trunk/greenstone2/build-src
+Files:  * packages/xlhtml/xlhtml-0.4.9.0-gs.tar.gz (added)
+        * win32.mak (modified) (1 diff)
+
+
+d) http://trac.greenstone.org/changeset/22157
+
+Files: 3 modified
+   * Makefile (modified) (1 diff)
+   * Makefile.in (modified) (1 diff)
+   * configure (modified) (1 diff)
+
+Changeset: 22157
+Timestamp: 21.05.2010 20:33:02 (2 months ago)
+Author: ak19
+Message: Same message as in (3) above.
+
+
+e) http://trac.greenstone.org/changeset/22158
+Changeset: 22158
+Timestamp: 21.05.2010 20:37:16 (2 months ago)
+Author: ak19
+Message:
+MODIFIED: main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
+Reverting to use xlhtml-0.4.9.0 which has now got all the changes that were made for xlhtml.0.5 (v.0.5 needs depcomp and uses lots of automak(e) calls to compile files on Linux).
+
+
+
+
+***************************************************************