From 060ab348a269c5741bada5223b728ff6d0cb7eb3 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 24 Aug 2004 12:59:46 +0000 Subject: [PATCH] lookup libxmlSAXDriver bundles in Library/SaxDrivers/4.3/ git-svn-id: http://svn.opengroupware.org/SOPE/trunk@50 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- .../NGObjWeb/Templates/WOxElemBuilder.m | 1 - .../NGObjWeb/Templates/WOxTemplateBuilder.m | 1 + sope-ical/iCalSaxDriver/ChangeLog | 6 ++++- sope-ical/iCalSaxDriver/GNUmakefile | 2 +- sope-ical/iCalSaxDriver/Version | 2 +- sope-xml/STXSaxDriver/ChangeLog | 4 ++++ sope-xml/STXSaxDriver/GNUmakefile | 2 +- sope-xml/STXSaxDriver/Version | 2 +- sope-xml/SaxObjC/ChangeLog | 5 +++++ sope-xml/SaxObjC/SaxXMLReaderFactory.m | 4 +++- sope-xml/SaxObjC/Version | 2 +- sope-xml/libxmlSAXDriver/ChangeLog | 4 ++++ sope-xml/libxmlSAXDriver/GNUmakefile | 2 +- sope-xml/libxmlSAXDriver/Version | 2 +- .../libxmlSAXDriver/libxmlHTMLSAXDriver.m | 22 +++++++++++++++---- sope-xml/pyxSAXDriver/ChangeLog | 4 ++++ sope-xml/pyxSAXDriver/GNUmakefile | 2 +- 17 files changed, 52 insertions(+), 15 deletions(-) diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m index 3a18bfe4..108c9159 100644 --- a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m +++ b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #include #include diff --git a/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m index 63737760..b86d0d0a 100644 --- a/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m +++ b/sope-appserver/NGObjWeb/Templates/WOxTemplateBuilder.m @@ -162,6 +162,7 @@ static Class DateClass = Nil; if (defClasses == nil) defClasses = [[ud arrayForKey:@"WOxBuilderClasses"] copy]; +#warning TODO: remove that for SOPE 4.4! (use a fix bundle location) infos = [[NGBundleManager defaultBundleManager] providedResourcesOfType:@"WOxElemBuilder"]; if ([infos count] > 0) { diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog index f33c5753..caba1533 100644 --- a/sope-ical/iCalSaxDriver/ChangeLog +++ b/sope-ical/iCalSaxDriver/ChangeLog @@ -1,6 +1,10 @@ +2004-08-24 Helge Hess + + * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.11) + 2004-08-20 Helge Hess - * fixed for SOPE 3.3 directory layout (v4.3.10) + * fixed for SOPE 4.3 directory layout (v4.3.10) * moved from sope-xml to sope-ical (v4.3.9) diff --git a/sope-ical/iCalSaxDriver/GNUmakefile b/sope-ical/iCalSaxDriver/GNUmakefile index 048f8936..03a32ac6 100644 --- a/sope-ical/iCalSaxDriver/GNUmakefile +++ b/sope-ical/iCalSaxDriver/GNUmakefile @@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = iCalSaxDriver BUNDLE_EXTENSION = .sax -BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/ iCalSaxDriver_OBJC_FILES = \ ICalSaxParser.m \ diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version index 317960a7..c351558f 100644 --- a/sope-ical/iCalSaxDriver/Version +++ b/sope-ical/iCalSaxDriver/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=10 +SUBMINOR_VERSION:=11 diff --git a/sope-xml/STXSaxDriver/ChangeLog b/sope-xml/STXSaxDriver/ChangeLog index 8fc2a365..41b8f250 100644 --- a/sope-xml/STXSaxDriver/ChangeLog +++ b/sope-xml/STXSaxDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Helge Hess + + * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v1.0.7) + 2004-05-05 Marcus Mueller * GNUmakefile.preamble, GNUmakefile.postamble: added support for diff --git a/sope-xml/STXSaxDriver/GNUmakefile b/sope-xml/STXSaxDriver/GNUmakefile index ec3b553d..47f6c696 100644 --- a/sope-xml/STXSaxDriver/GNUmakefile +++ b/sope-xml/STXSaxDriver/GNUmakefile @@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = STXSaxDriver BUNDLE_EXTENSION = .sax -BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/ STXSaxDriver_OBJC_FILES += \ STXSaxDriver.m \ diff --git a/sope-xml/STXSaxDriver/Version b/sope-xml/STXSaxDriver/Version index 95c761ee..72918f18 100644 --- a/sope-xml/STXSaxDriver/Version +++ b/sope-xml/STXSaxDriver/Version @@ -2,4 +2,4 @@ MAJOR_VERSION=1 MINOR_VERSION=0 -SUBMINOR_VERSION:=6 +SUBMINOR_VERSION:=7 diff --git a/sope-xml/SaxObjC/ChangeLog b/sope-xml/SaxObjC/ChangeLog index 6a88d7ee..8dcca011 100644 --- a/sope-xml/SaxObjC/ChangeLog +++ b/sope-xml/SaxObjC/ChangeLog @@ -1,3 +1,8 @@ +2004-08-24 Helge Hess + + * SaxXMLReaderFactory.m: lookup SAX drivers in Library/SaxDrivers/4.3 + (v4.3.39) + 2004-08-20 Helge Hess * moved to SOPE 4.3 (v4.3.38) diff --git a/sope-xml/SaxObjC/SaxXMLReaderFactory.m b/sope-xml/SaxObjC/SaxXMLReaderFactory.m index 90dd7b68..8a92e16f 100644 --- a/sope-xml/SaxObjC/SaxXMLReaderFactory.m +++ b/sope-xml/SaxObjC/SaxXMLReaderFactory.m @@ -87,6 +87,7 @@ static id factory = nil; e = [tmp objectEnumerator]; while ((tmp = [e nextObject])) { tmp = [tmp stringByAppendingPathComponent:@"SaxDrivers"]; + tmp = [tmp stringByAppendingPathComponent:@"4.3"]; if (![ma containsObject:tmp]) [ma addObject:tmp]; } @@ -95,6 +96,7 @@ static id factory = nil; { NSBundle *fwBundle; + /* no need to add 4.3 here, right? */ fwBundle = [NSBundle bundleForClass:[self class]]; [ma addObject:[[fwBundle resourcePath] stringByAppendingPathComponent:@"SaxDrivers"]]; @@ -111,7 +113,7 @@ static id factory = nil; e = [tmp objectEnumerator]; while ((tmp = [e nextObject])) { - tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers"]; + tmp = [tmp stringByAppendingPathComponent:@"Library/SaxDrivers/4.3"]; if (![ma containsObject:tmp]) [ma addObject:tmp]; } diff --git a/sope-xml/SaxObjC/Version b/sope-xml/SaxObjC/Version index ab8bf848..760afe2d 100644 --- a/sope-xml/SaxObjC/Version +++ b/sope-xml/SaxObjC/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=38 +SUBMINOR_VERSION:=39 diff --git a/sope-xml/libxmlSAXDriver/ChangeLog b/sope-xml/libxmlSAXDriver/ChangeLog index c5871ad6..3800bf91 100644 --- a/sope-xml/libxmlSAXDriver/ChangeLog +++ b/sope-xml/libxmlSAXDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Helge Hess + + * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ (v4.3.14) + 2004-05-07 Helge Hess * libxmlHTMLSAXDriver.m: do not report unclosed entity references diff --git a/sope-xml/libxmlSAXDriver/GNUmakefile b/sope-xml/libxmlSAXDriver/GNUmakefile index a9101630..29416302 100644 --- a/sope-xml/libxmlSAXDriver/GNUmakefile +++ b/sope-xml/libxmlSAXDriver/GNUmakefile @@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = libxmlSAXDriver BUNDLE_EXTENSION = .sax -BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers +BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SaxDrivers/4.3/ libxmlSAXDriver_OBJC_FILES = \ libxmlSAXDriver.m \ diff --git a/sope-xml/libxmlSAXDriver/Version b/sope-xml/libxmlSAXDriver/Version index 92c8fa08..cc039aca 100644 --- a/sope-xml/libxmlSAXDriver/Version +++ b/sope-xml/libxmlSAXDriver/Version @@ -1,3 +1,3 @@ # $Id$ -SUBMINOR_VERSION:=13 +SUBMINOR_VERSION:=14 diff --git a/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m b/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m index c4799b42..6e049f69 100644 --- a/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m +++ b/sope-xml/libxmlSAXDriver/libxmlHTMLSAXDriver.m @@ -18,7 +18,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ +// $Id: libxmlHTMLSAXDriver.m,v 1.5 2004/05/07 16:31:22 helge Exp $ #import "libxmlHTMLSAXDriver.h" #import "libxmlSAXLocator.h" @@ -58,6 +58,10 @@ static Class NSStringClass = Nil; static const unsigned char *tagInvalidMsg = "tag %s invalid"; static const unsigned char *unclosedEntityInvalidMsg = "htmlParseEntityRef: expecting ';'"; +#if 0 +static const unsigned char *unexpectedNobrCloseMsg = + "Unexpected end tag : %s"; +#endif static inline NSString *xmlCharsToString(const xmlChar *_s) { NSString *s; @@ -711,9 +715,19 @@ static void error(void *udata, const char *msg, ...) { va_list args; SaxParseException *e; - if (!reportInvalidTags && msg != NULL && toupper(msg[0]) == 'T') { - if (strncasecmp(tagInvalidMsg, msg, strlen(tagInvalidMsg)) == 0) - return; + if (!reportInvalidTags && msg != NULL) { + if (toupper(msg[0]) == 'T') { + if (strncasecmp(tagInvalidMsg, msg, strlen(tagInvalidMsg)) == 0) + return; + } +#if 0 + else if (toupper(msg[0]) == 'U') { + if (strncasecmp(unexpectedNobrCloseMsg, msg, + strlen(unexpectedNobrCloseMsg)) == 0) + return; + printf("MSG: '%s'\n", msg); + } +#endif } if (!reportUnclosedEntities && msg != NULL && toupper(msg[0]) == 'H') { if (strncasecmp(unclosedEntityInvalidMsg, msg, diff --git a/sope-xml/pyxSAXDriver/ChangeLog b/sope-xml/pyxSAXDriver/ChangeLog index 79dc1158..98320cf4 100644 --- a/sope-xml/pyxSAXDriver/ChangeLog +++ b/sope-xml/pyxSAXDriver/ChangeLog @@ -1,3 +1,7 @@ +2004-08-24 Helge Hess + + * GNUmakefile: install SAX driver in Library/SaxDrivers/4.3/ + 2004-05-05 Marcus Mueller * GNUmakefile: added support for building with diff --git a/sope-xml/pyxSAXDriver/GNUmakefile b/sope-xml/pyxSAXDriver/GNUmakefile index 856c240a..3bf8ee1c 100644 --- a/sope-xml/pyxSAXDriver/GNUmakefile +++ b/sope-xml/pyxSAXDriver/GNUmakefile @@ -4,7 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make BUNDLE_NAME = pyxSAXDriver BUNDLE_EXTENSION = .sax -BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/Bundles +BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SaxDrivers/4.3/ pyxSAXDriver_OBJC_FILES = pyxSAXDriver.m -- 2.39.5