[sword-svn] r1689 - in trunk: . include src/mgr src/modules/filters
utilities
scribe at crosswire.org
scribe at crosswire.org
Sat Jan 1 05:43:34 MST 2005
Author: scribe
Date: 2005-01-01 05:43:33 -0700 (Sat, 01 Jan 2005)
New Revision: 1689
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/include/Makefile.am
trunk/src/mgr/Makefile.am
trunk/src/modules/filters/osishtmlhref.cpp
trunk/usrinst.sh
trunk/utilities/installmgr.cpp
Log:
Updated automake system and ChangeLog
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/ChangeLog 2005-01-01 12:43:33 UTC (rev 1689)
@@ -1,6 +1,28 @@
API ChangeLog (see the ChangeLog in each 'apps' directory for
app specific changes
+1-Jan-2005 Troy A. Griffitts <scribe at crosswire.org>
+ Extended InstallMgr routines to recurse directories
+ Cleaned up InstallMgr code
+ Created FTPTransport base class used by InstallMgr
+ to allow for any FTP routines to be plugged
+ into InstallMgr by overriding a new
+ createFTPTransport method to return subclass
+ (Joachim's good idea)
+ Moved all CURL and FTPLib code into FTPTransport
+ subclasses CURLFTPTransport and FTPLibFTPTransport
+ classes respectively
+ Moved status reporting methods from InstallMgr to
+ StatusReporter in FTPTransport ftptrans.(h|cpp)
+ Added CopyDir, removeDir, and isDirectory methods
+ to FileMgr
+ Added SWMgr::deleteModule to allow deleting a
+ loaded module from an SWMgr class-- needed
+ before InstallMgr deletes files involved
+ so after destruction of SWModule, all files
+ will be closes (mostly for Windows, but good
+ on any platform).
+
13-Aug-2004 Troy A. Griffitts <scribe at crosswire.org>
Migrated to SVN
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/configure.ac 2005-01-01 12:43:33 UTC (rev 1689)
@@ -287,6 +287,7 @@
AM_CONDITIONAL(INSTALLMGR, test x$with_curl = xyes)
#AM_CONDITIONAL(INTERNALFTPLIB, test x$with_installmgr = xinternal)
#AM_CONDITIONAL(WITHCURL, test x$with_installmgr = xcurl)
+AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes)
#AM_CONDITIONAL(WITHFTPLIB, test x$with_installmgr = xftplib)
AM_CONDITIONAL(CONFDEF, test x$dir_confdef = xyes)
AM_CONDITIONAL(USE_PKGCONF, test x$use_pkgconfig = xyes)
Modified: trunk/include/Makefile.am
===================================================================
--- trunk/include/Makefile.am 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/include/Makefile.am 2005-01-01 12:43:33 UTC (rev 1689)
@@ -4,6 +4,7 @@
pkginclude_HEADERS += $(swincludedir)/GreekChars.h
pkginclude_HEADERS += $(swincludedir)/canon.h
pkginclude_HEADERS += $(swincludedir)/cipherfil.h
+pkginclude_HEADERS += $(swincludedir)/curlftpt.h
pkginclude_HEADERS += $(swincludedir)/defs.h
pkginclude_HEADERS += $(swincludedir)/echomod.h
pkginclude_HEADERS += $(swincludedir)/encfiltmgr.h
@@ -11,6 +12,9 @@
pkginclude_HEADERS += $(swincludedir)/femain.h
pkginclude_HEADERS += $(swincludedir)/filemgr.h
pkginclude_HEADERS += $(swincludedir)/flatapi.h
+pkginclude_HEADERS += $(swincludedir)/ftpparse.h
+pkginclude_HEADERS += $(swincludedir)/ftptrans.h
+pkginclude_HEADERS += $(swincludedir)/ftplibftpt.h
pkginclude_HEADERS += $(swincludedir)/gbffootnotes.h
pkginclude_HEADERS += $(swincludedir)/gbfheadings.h
@@ -28,6 +32,7 @@
pkginclude_HEADERS += $(swincludedir)/hebrewmcim.h
pkginclude_HEADERS += $(swincludedir)/hrefcom.h
+pkginclude_HEADERS += $(swincludedir)/installmgr.h
pkginclude_HEADERS += $(swincludedir)/latin1utf16.h
pkginclude_HEADERS += $(swincludedir)/latin1utf8.h
pkginclude_HEADERS += $(swincludedir)/listkey.h
@@ -148,8 +153,6 @@
pkginclude_HEADERS += $(swincludedir)/zstr.h
pkginclude_HEADERS += $(swincludedir)/ztext.h
pkginclude_HEADERS += $(swincludedir)/zverse.h
-pkginclude_HEADERS += $(swincludedir)/installmgr.h
-pkginclude_HEADERS += $(swincludedir)/ftpparse.h
#if INSTALLMGR
REMOTE_HEAD = $(swincludedir)/swremotemgr.h
Modified: trunk/src/mgr/Makefile.am
===================================================================
--- trunk/src/mgr/Makefile.am 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/src/mgr/Makefile.am 2005-01-01 12:43:33 UTC (rev 1689)
@@ -16,12 +16,19 @@
AM_CPPFLAGS += $(globdef) $(spdefs)
+if WITHCURL
+libsword_la_SOURCES += $(mgrdir)/curlftpt.cpp
+else
+libsword_la_SOURCES += $(mgrdir)/ftplibftpt.cpp
+endif
+
libsword_la_SOURCES += $(mgrdir)/swconfig.cpp
libsword_la_SOURCES += $(mgrdir)/swmgr.cpp
libsword_la_SOURCES += $(mgrdir)/swfiltermgr.cpp
libsword_la_SOURCES += $(mgrdir)/encfiltmgr.cpp
mgrsplits = $(mgrdir)/markupfiltmgr.cpp
libsword_la_SOURCES += $(mgrdir)/filemgr.cpp
+libsword_la_SOURCES += $(mgrdir)/ftptrans.cpp
libsword_la_SOURCES += $(mgrdir)/swlocale.cpp
libsword_la_SOURCES += $(mgrdir)/localemgr.cpp
libsword_la_SOURCES += $(mgrdir)/swcacher.cpp
Modified: trunk/src/modules/filters/osishtmlhref.cpp
===================================================================
--- trunk/src/modules/filters/osishtmlhref.cpp 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/src/modules/filters/osishtmlhref.cpp 2005-01-01 12:43:33 UTC (rev 1689)
@@ -40,16 +40,16 @@
setEscapeStringCaseSensitive(true);
- addEscapeStringSubstitute("amp", "&");
+ addEscapeStringSubstitute("amp", "&");
addEscapeStringSubstitute("apos", "'");
- addEscapeStringSubstitute("lt", "<");
- addEscapeStringSubstitute("gt", ">");
+ addEscapeStringSubstitute("lt", "<");
+ addEscapeStringSubstitute("gt", ">");
addEscapeStringSubstitute("quot", "\"");
setTokenCaseSensitive(true);
- addTokenSubstitute("lg", "<p>"); // line group, seems more logical and beautiful to use <p> for it
- addTokenSubstitute("/lg","</p>");
+ addTokenSubstitute("lg", "<br />");
+ addTokenSubstitute("/lg", "<br />");
}
Modified: trunk/usrinst.sh
===================================================================
--- trunk/usrinst.sh 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/usrinst.sh 2005-01-01 12:43:33 UTC (rev 1689)
@@ -1,12 +1,12 @@
#!/bin/sh
OPTIONS="--prefix=/usr $OPTIONS"
-#OPTIONS="--disable-shared $OPTIONS"
+OPTIONS="--disable-shared $OPTIONS"
OPTIONS="--without-conf $OPTIONS"
OPTIONS="--sysconfdir=/etc $OPTIONS"
#OPTIONS="--with-icu $OPTIONS"
#OPTIONS="--with-vcl $OPTIONS"
-#OPTIONS="--enable-debug $OPTIONS"
+OPTIONS="--enable-debug $OPTIONS"
#OPTIONS="--enable-profile $OPTIONS"
#OPTIONS="--with-lucene $OPTIONS"
#OPTIONS="--enable-tests $OPTIONS"
Modified: trunk/utilities/installmgr.cpp
===================================================================
--- trunk/utilities/installmgr.cpp 2005-01-01 04:42:26 UTC (rev 1688)
+++ trunk/utilities/installmgr.cpp 2005-01-01 12:43:33 UTC (rev 1689)
@@ -95,7 +95,7 @@
}
module = it->second;
installMgr->removeModule(mgr, module->Name());
- cout << "Removed module: [" << module->Name() << "]\n";
+ cout << "Removed module: [" << modName << "]\n";
}
More information about the sword-cvs
mailing list