[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH/RFC] gsweb Patches I
|
From: |
David Ayers |
|
Subject: |
[PATCH/RFC] gsweb Patches I |
|
Date: |
Thu, 05 Dec 2002 18:12:06 +0100 |
|
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.2) Gecko/20021126 |
Hello everyone,
here are some patches that are actually unrelated to the GSW/WO names
change but I would like to get them in anyway:
Makefile.preamble:
remove usage of INSTALL_ROOT_DIR as this isn't used consistently
(any vetos?)
GSWeb.framework/Makefile.preamble.in:
let gnustep-make figure out whether to link against debug libs or not.
GSWeb.framework/GSWTemplateParserXML.h/.m
move references to libxml into .m file
change parser error message to output lines before columns
Cheers,
Dave
Index: dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.h
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.h,v
retrieving revision 1.6
diff -u -r1.6 GSWTemplateParserXML.h
--- dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.h 12 Oct 2002
11:14:58 -0000 1.6
+++ dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.h 5 Dec 2002
16:29:40 -0000
@@ -34,10 +34,6 @@
#include "GSWTemplateParser.h"
#include <Foundation/GSXML.h>
-#include <libxml/parser.h>
-#include <libxml/parserInternals.h>
-#include <libxml/SAX.h>
-#include <libxml/HTMLparser.h>
@class GSWTemplateParser;
@@ -58,8 +54,6 @@
+(id)handlerWithTemplateParser:(GSWTemplateParser*)templateParser;
-(id)initWithTemplateParser:(GSWTemplateParser*)templateParser;
-(id)init;
--(xmlParserInputPtr)resolveEntity:(NSString*)publicIdEntity
- systemID:(NSString*)systemIdEntity;
-(void)warning:(NSString*)message
colNumber:(int)colNumber
lineNumber:(int)lineNumber;
Index: dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.m
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.m,v
retrieving revision 1.20
diff -u -r1.20 GSWTemplateParserXML.m
--- dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.m 18 Nov 2002
11:14:55 -0000 1.20
+++ dev-libs/gsweb/GSWeb.framework/GSWTemplateParserXML.m 5 Dec 2002
16:29:41 -0000
@@ -31,8 +31,11 @@
static char rcsId[] = "$Id: GSWTemplateParserXML.m,v 1.20 2002/11/18 11:14:55
mguesdon Exp $";
-#include <GSWeb/GSWeb.h>
+#include "GSWeb.h"
+#include <libxml/parser.h>
+#include <libxml/parserInternals.h>
#include <libxml/SAX.h>
+#include <libxml/HTMLparser.h>
extern xmlParserInputPtr xmlNewStringInputStream(xmlParserCtxtPtr ctxt,
const xmlChar *buffer);
@@ -41,6 +44,11 @@
static NSMutableDictionary* DTDCache=nil;
static NSMutableDictionary* DTDFilePathCache=nil;
address@hidden GSWTemplateParserSAXHandler (Private)
+-(xmlParserInputPtr)resolveEntity:(NSString*)publicIdEntity
+ systemID:(NSString*)systemIdEntity;
address@hidden
+
//====================================================================
@implementation GSWTemplateParserSAXHandler
@@ -558,10 +566,10 @@
&& ![testMessage isEqualToString:@"htmlparsestarttag: misplaced <head>
tag"]
&& ![testMessage isEqualToString:@"unexpected end tag : head"])
{
- [[GSWApplication application] logErrorWithFormat:@"%@ Error (col %d,line
%d): %@",
+ [[GSWApplication application] logErrorWithFormat:@"%@ Error (line %d,col
%d): %@",
[_templateParser logPrefix],
- colNumber,
lineNumber,
+ colNumber,
message];
};
};
@@ -571,10 +579,10 @@
colNumber:(int)colNumber
lineNumber:(int)lineNumber
{
- [[GSWApplication application] logErrorWithFormat:@"%@ Fatal Error (col
%d,line %d): %@",
+ [[GSWApplication application] logErrorWithFormat:@"%@ Fatal Error (line
%d,col %d): %@",
[_templateParser logPrefix],
- colNumber,
lineNumber,
+ colNumber,
message];
};
Index: dev-libs/gsweb/GSWeb.framework/Makefile.preamble.in
===================================================================
RCS file:
/cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWeb.framework/Makefile.preamble.in,v
retrieving revision 1.2
diff -u -r1.2 Makefile.preamble.in
--- dev-libs/gsweb/GSWeb.framework/Makefile.preamble.in 27 Nov 2002 20:25:22
-0000 1.2
+++ dev-libs/gsweb/GSWeb.framework/Makefile.preamble.in 5 Dec 2002 16:50:28
-0000
@@ -63,11 +63,7 @@
ADDITIONAL_INCLUDE_DIRS = -I. -I../.. @XML_CFLAGS@
# Additional LDFLAGS to pass to the linker
-ifeq ($(debug), yes)
- LIBRARIES_DEPENP_UPON += @AUX_LIBS@
-else
- LIBRARIES_DEPEND_UPON += @AUX_LIBS@
-endif
+LIBRARIES_DEPEND_UPON += @AUX_LIBS@
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib
Index: dev-libs/gsweb/Makefile.postamble
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/Makefile.postamble,v
retrieving revision 1.5
diff -u -r1.5 Makefile.postamble
--- dev-libs/gsweb/Makefile.postamble 2 Dec 2002 19:00:36 -0000 1.5
+++ dev-libs/gsweb/Makefile.postamble 5 Dec 2002 15:31:12 -0000
@@ -1,4 +1,5 @@
-# Makefile.postamble - GSWeb: Makefile.postamble
+# -*-makefile-*-
+# Makefile.postamble - GSWeb: Makefile.postamble
# Copyright (C) 1999 Free Software Foundation, Inc.
#
# Written by: Manuel Guesdon <address@hidden>
@@ -45,13 +46,13 @@
# The following rule is important mainly for packaging, because in that case
# you install into a fake system tree, and the directory is not there.
#
-$(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary:
- $(MKDIRS) $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
+$(GNUSTEP_MAKEFILES)/Auxiliary:
+ $(MKINSTALLDIRS) $@
# Things to do before installing
-before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
+before-install:: $(GNUSTEP_MAKEFILES)/Auxiliary
$(INSTALL_DATA) gsweb.make \
- $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
+ $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
# Things to do after installing
#after-install::
@@ -61,7 +62,7 @@
# Things to do after uninstalling
after-uninstall::
- rm -f $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
+ rm -f $(GNUSTEP_MAKEFILES)/Auxiliary/gsweb.make
# Things to do before cleaning
# before-clean::
- [PATCH/RFC] gsweb Patches I,
David Ayers <=