gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

2002-12-06 Manuel Guesdon <mguesdon@orange-concept.com>

Browse source 
* GSWeb/GSWTemplateParserXML.[mh]
    		o move references to libxml into .m file
			(David Ayers <d.ayers@inode.at> patch)
    		o change parser error message to output lines before columns
			(David Ayers <d.ayers@inode.at> patch)
	* GSWeb.framework/Makefile.preamble.in:
    		o let gnustep-make figure out whether to link against debug libs or not.
			(David Ayers <d.ayers@inode.at> patch)
	* Makefile.preamble:
	    	o remove usage of INSTALL_ROOT_DIR as this isn't used consistently
			(David Ayers <d.ayers@inode.at> patch)


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@15262 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Manuel Guesdon 2002-12-06 15:58:22 +00:00
parent 8d00c1ef20
commit c8cb92d6fa
5 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2002-12-06 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb/GSWTemplateParserXML.[mh]
o move references to libxml into .m file
(David Ayers <d.ayers@inode.at> patch)
o change parser error message to output lines before columns
(David Ayers <d.ayers@inode.at> patch)
* GSWeb.framework/Makefile.preamble.in:
o let gnustep-make figure out whether to link against debug libs or not.
(David Ayers <d.ayers@inode.at> patch)
* Makefile.preamble:
o remove usage of INSTALL_ROOT_DIR as this isn't used consistently
(David Ayers <d.ayers@inode.at> patch)
2002-12-06 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWExtensions.framework/Makefile.preamble:
o added -I/usr/include/libxml2 in ADDITIONAL_INCLUDE_DIRS

6
GSWeb.framework/GSWTemplateParserXML.h
View file

@ -33,10 +33,6 @@
#define _GSWTemplateParserXML_h__
#include "GSWTemplateParser.h"
#include <libxml/parser.h>
#include <libxml/parserInternals.h>
#include <libxml/SAX.h>
#include <libxml/HTMLparser.h>
#include <Foundation/GSXML.h>
@ -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;

18
GSWeb.framework/GSWTemplateParserXML.m
View file

@ -30,9 +30,12 @@
</license>
**/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
#include "GSWTemplateParserXML.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 NSLock* GSXMLParserLock=nil;
static NSMutableDictionary* DTDCache=nil;
static NSMutableDictionary* DTDFilePathCache=nil;
@interface GSWTemplateParserSAXHandler (Private)
-(xmlParserInputPtr)resolveEntity:(NSString*)publicIdEntity
systemID:(NSString*)systemIdEntity;
@end
//====================================================================
@implementation GSWTemplateParserSAXHandler
@ -558,10 +566,10 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI
&& ![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 @@ xmlParserInputPtr GSWTemplateParserSAXHandler_ExternalLoader(const char *systemI
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];
};

6
GSWeb.framework/Makefile.preamble.in
View file

@ -63,11 +63,7 @@ ADDITIONAL_CFLAGS = -DUSE_BUILTIN
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_DEPENP_UPON += @AUX_LIBS@
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib

14
Makefile.postamble
View file

@ -1,5 +1,6 @@
# Makefile.postamble - GSWeb: Makefile.postamble
# Copyright (C) 1999 Free Software Foundation, Inc.
# -*-makefile-*-
# Makefile.postamble - GSWeb: Makefile.postamble
# Copyright (C) 1999-2002 Free Software Foundation, Inc.
#
# Written by: Manuel Guesdon <mguesdon@orange-concept.com>
# Date: Jul 1999
@ -45,13 +46,14 @@ gsdocs:
# 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 +63,7 @@ before-install:: $(INSTALL_ROOT_DIR)$(GNUSTEP_MAKEFILES)/Auxiliary
# 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::