* GSWExtensions.framework/Makefile.preamble: Correct

ADDITIONAL_INCLUDE_DIRS and ADDITIONAL_LIB_DIRS.
        * Testing/DynamicElements/Makefile.preamble: Ditto.
        * GSWExtensionsGSW.framework/Makefile.preamble: Ditto. Also
        remove comments.
        * GSWeb.framework/Makefile.preamble.in:  Ditto. Also correct
        ADDITIONAL_CPPFLAGS

        * Testing/DynamicElements/GNUmakefile: Remove unused
	variables.
        * GSWeb.framework/GNUmakefile: Ditto.

        * GSWExtensions.framework/Makefile.postamble: Removed unused
        targets 'regenerate' and 'copy-dist'.
        * GSWExtensionsGSW.framework/Makefile.postamble: Ditto.
        * Testing/DynamicElements/Makefile.postamble: Ditto.
        * GSWeb.framework/Makefile.postamble: Ditto.  Add rule for
        GNUSTEP_TARGET_DIR dependent 'config.h'.

        * Testing/DynamicElements/Resources/Info-DynamicElements.plist:
        Correct spelling.

        * Testing/DynamicElements/DynamicElements.m: Replace #import
        with #include.
        * Testing/DynamicElements/DynamicElements_main.m: Ditto.
        * Testing/DynamicElements/Main.h: Ditto.
        * Testing/DynamicElements/Main.m: Ditto.
        * Examples/hello/Hello.m: Ditto.
        * Examples/hello/HelloPage.h: Ditto.
        * Examples/hello/HelloPage.m: Ditto.
        * Examples/hello/Hello_main.m: Ditto.
        * Examples/hello/Main.h: Ditto.
        * Examples/hello/Main.m: Ditto.
        * Examples/hello/Resources/Info-Hello.plist: Reformatted.

        * GSWeb.framework/GSWDebug.h/m (GSWLogAssertGoodFn): Adjust
        prototype to use id instead of NSObject * and dereference via
        class_pointer instead of isa.
        ([NSObject isa]): Remove obsolete category.

        * GSWeb.framework/GSWPageDefLexer.h: Use "GSWeb.h" instead of
        <GSWeb/GSWeb.h> for include.
        * GSWeb.framework/GSWPageDefLexer.m: Ditto.
        * GSWeb.framework/GSWPageDefParser.h: Ditto.
        * GSWeb.framework/GSWPageDefParser.m: Ditto.
        * GSWeb.framework/GSWPageDefParserTokenTypes.h: Ditto.
        * GSWeb.framework/PageDef.g: Ditto.
        * GSWeb.framework/html.g: Ditto.
        * GSWeb.framework/htmltag.g: Ditto.

        * GSWeb.framework/GSWWOCompatibility.m: Remove file.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18338 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-01-08 16:23:47 +00:00
parent a9efd13f5d
commit 87ecde1a46
34 changed files with 123 additions and 353 deletions

View file

@ -1,3 +1,56 @@
2004-01-07 David Ayers <d.ayers@inode.at>
* GSWExtensions.framework/Makefile.preamble: Correct
ADDITIONAL_INCLUDE_DIRS and ADDITIONAL_LIB_DIRS.
* Testing/DynamicElements/Makefile.preamble: Ditto.
* GSWExtensionsGSW.framework/Makefile.preamble: Ditto. Also
remove comments.
* GSWeb.framework/Makefile.preamble.in: Ditto. Also correct
ADDITIONAL_CPPFLAGS
* Testing/DynamicElements/GNUmakefile: Remove unused variables.
* GSWeb.framework/GNUmakefile: Ditto.
* GSWExtensions.framework/Makefile.postamble: Removed unused
targets 'regenerate' and 'copy-dist'.
* GSWExtensionsGSW.framework/Makefile.postamble: Ditto.
* Testing/DynamicElements/Makefile.postamble: Ditto.
* GSWeb.framework/Makefile.postamble: Ditto. Add rule for
GNUSTEP_TARGET_DIR dependent 'config.h'.
* Testing/DynamicElements/Resources/Info-DynamicElements.plist:
Correct spelling.
* Testing/DynamicElements/DynamicElements.m: Replace #import
with #include.
* Testing/DynamicElements/DynamicElements_main.m: Ditto.
* Testing/DynamicElements/Main.h: Ditto.
* Testing/DynamicElements/Main.m: Ditto.
* Examples/hello/Hello.m: Ditto.
* Examples/hello/HelloPage.h: Ditto.
* Examples/hello/HelloPage.m: Ditto.
* Examples/hello/Hello_main.m: Ditto.
* Examples/hello/Main.h: Ditto.
* Examples/hello/Main.m: Ditto.
* Examples/hello/Resources/Info-Hello.plist: Reformatted.
* GSWeb.framework/GSWDebug.h/m (GSWLogAssertGoodFn): Adjust
prototype to use id instead of NSObject * and dereference via
class_pointer instead of isa.
([NSObject isa]): Remove obsolete category.
* GSWeb.framework/GSWPageDefLexer.h: Use "GSWeb.h" instead of
<GSWeb/GSWeb.h> for include.
* GSWeb.framework/GSWPageDefLexer.m: Ditto.
* GSWeb.framework/GSWPageDefParser.h: Ditto.
* GSWeb.framework/GSWPageDefParser.m: Ditto.
* GSWeb.framework/GSWPageDefParserTokenTypes.h: Ditto.
* GSWeb.framework/PageDef.g: Ditto.
* GSWeb.framework/html.g: Ditto.
* GSWeb.framework/htmltag.g: Ditto.
* GSWeb.framework/GSWWOCompatibility.m: Remove file.
2004-01-02 David Wetzel <dave@turbocat.de>
* GSWeb.framework: GSWString.m
do a stringValue on numbers to avoid an exception later.

View file

@ -2,7 +2,7 @@
#include <gnsutep/base/GNUstep.h>
#endif
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
#include "Hello.h"
@implementation Hello

View file

@ -10,7 +10,7 @@
*/
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
@interface HelloPage:GSWComponent
{

View file

@ -13,7 +13,7 @@
#include <gnsutep/base/GNUstep.h>
#endif
#import "HelloPage.h"
#include "HelloPage.h"
@implementation HelloPage

View file

@ -2,7 +2,7 @@
#include <gnsutep/base/GNUstep.h>
#endif
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
int main(int argc, const char *argv[])
{

View file

@ -9,7 +9,7 @@
* page.
*/
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
@interface Main:GSWComponent
{

View file

@ -13,9 +13,9 @@
#include <gnsutep/base/GNUstep.h>
#endif
#import "Main.h"
#import "Hello.h"
#import "HelloPage.h"
#include "Main.h"
#include "Hello.h"
#include "HelloPage.h"
@implementation Main

View file

@ -1,14 +1,14 @@
defaults = {
GSWAdaptor = GSWDefaultAdaptor;
GSWDebugSetConfigFilePath = "/etc/gsweb/Hello.logstate";
GSWHost = "localhost";
GSWPort = 9001;
GSWApplicationBaseURL = "/GSW";
GSWFrameworksBaseURL = "/GSW/frameworks";
GSWLoadFrameworks = (
"GSWExtensionsGSW",
"GSWExtensions"
);
GSWMonitorAppConfFilePath = "/etc/httpd/conf/GSWebMonitor.conf";
GSWSessionTimeOut = 1200;
};
defaults = {
GSWAdaptor = GSWDefaultAdaptor;
GSWDebugSetConfigFilePath = "/etc/gsweb/Hello.logstate";
GSWHost = "localhost";
GSWPort = 9001;
GSWApplicationBaseURL = "/GSW";
GSWFrameworksBaseURL = "/GSW/frameworks";
GSWLoadFrameworks = (
"GSWExtensionsGSW",
"GSWExtensions"
);
GSWMonitorAppConfFilePath = "/etc/httpd/conf/GSWebMonitor.conf";
GSWSessionTimeOut = 1200;
};

View file

@ -81,10 +81,6 @@ gsdocs:
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)
ifneq ($(gswnames),gsw)
install-WO-headers :
$(MKDIRS) $(GNUSTEP_HEADERS)/$(GSWExtensions_wo_HEADER_FILES_INSTALL_DIR);

View file

@ -59,7 +59,9 @@ endif
ADDITIONAL_CFLAGS =
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I.. -I../.. -I../GSWeb.framework/derived_src
ADDITIONAL_INCLUDE_DIRS = \
-I../GSWeb.framework/$(GNUSTEP_TARGET_DIR) \
-I../GSWeb.framework/derived_src
# Additional LDFLAGS to pass to the linker
ifeq ($(debug), yes)
@ -74,7 +76,11 @@ GSWExtensions_wo_ADDITIONAL_LDFLAGS = GSWeb_wo
#-lgnustep-xraw
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS =
GSWExtentions_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
GSWExtentions_wo_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb_wo
#
# Flags dealing with installing and uninstalling

View file

@ -80,6 +80,3 @@ gsdocs:
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)

View file

@ -59,7 +59,9 @@ endif
ADDITIONAL_CFLAGS =
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I$(GNUSTEP_SYSTEM_ROOT)/db -I../ -I../.. -I../GSWeb.framework/derived_src
ADDITIONAL_INCLUDE_DIRS += \
-I../GSWeb.framework/$(GNUSTEP_TARGET_DIR) \
-I../GSWeb.framework/derived_src
# Additional LDFLAGS to pass to the linker
ifeq ($(debug), yes)
@ -71,11 +73,13 @@ endif
GSWExtensionsGSW_ADDITIONAL_LDFLAGS = -lGSWeb
GSWExtensionsGSW_wo_ADDITIONAL_LDFLAGS = -lGSWeb_wo
#-lgnustep-xraw
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS = -L../src/$(GNUSTEP_OBJ_DIR) -L$(GNUSTEP_SYSTEM_ROOT)/lib -L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)
#-L../GSWExtensions.framework/$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS =
GSWExtensionsGSW_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
GSWExtensionsGSW_wo_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb_wo
#
# Flags dealing with installing and uninstalling

View file

@ -32,8 +32,6 @@ include $(GNUSTEP_MAKEFILES)/common.make
include ../Version
include ../config.mak
srcdir = .
# The framework to be compiled
# Options

View file

@ -30,7 +30,7 @@
extern NSString* GSWDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt);
extern void GSWLogC_(CONST char* file,int line,CONST char* string);
extern void GSWLogDumpObjectFn(CONST char* file,int line,id object,int deep);
extern void GSWLogAssertGoodFn(CONST char* file,int line,NSObject* object);
extern void GSWLogAssertGoodFn(CONST char* file,int line,id object);
#endif
#ifdef GSWDEBUG

View file

@ -40,17 +40,6 @@ RCS_ID("$Id$")
#define USTART NSAutoreleasePool* arp=[NSAutoreleasePool new];
#define USTOP DESTROY(arp);
@interface NSObject (GSISA)
-(Class)isa;
@end
@implementation NSObject (GSISA)
-(Class)isa
{
return self->isa;
};
@end
#ifdef DEBUG
NSString* GSWDebugMethodMsg(id obj, SEL sel, const char *file, int line, NSString *fmt)
{
@ -376,18 +365,18 @@ void GSWLogDumpObjectFn(CONST char* file,int line,id object,int deep)
};
//--------------------------------------------------------------------
void GSWLogAssertGoodFn(CONST char* file,int line,NSObject* object)
void GSWLogAssertGoodFn(CONST char* file,int line,id object)
{
if (object)
{
if ([object isa]==((Class)0xdeadface))
if (object->class_pointer==((Class)0xdeadface))
{
[GSWApp statusDebugWithFormat:@"DEAD FACE: object %p isa=%p in %s at %d\n",
(void*)object,
(void*)[object isa],
(void*)object->class_pointer,
file,
line];
NSCParameterAssert([object isa]==(Class)0xdeadface);
NSCParameterAssert(object->class_pointer==(Class)0xdeadface);
};
}
else

View file

@ -11,7 +11,7 @@
*/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
#include "gsantlr/ANTLRCommon.h"

View file

@ -8,7 +8,7 @@
*/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
#include "gsantlr/ANTLRCommon.h"
#include "gsantlr/ANTLRException.h"

View file

@ -11,7 +11,7 @@
*/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
#include "gsantlr/ANTLRCommon.h"
#include "gsantlr/ANTLRTokenizer.h"

View file

@ -8,7 +8,7 @@
*/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
#include "gsantlr/ANTLRCommon.h"
#include "GSWPageDefParser.h"

View file

@ -11,7 +11,7 @@
*/
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
enum GSWPageDefParserTokenTypes {
GSWPageDefParserTokenType_EOF_ = 1,

View file

@ -1,266 +0,0 @@
/** GSWWOCompatibility.m - <title>GSWeb: GSWWOCompatibility</title>
Copyright (C) 2000-2002 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Dec 2000
$Revision$
$Date$
This file is part of the GNUstep Web Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
</license>
**/
#include "config.h"
RCS_ID($Id$")
#include <GSWeb/GSWeb.h>
#include <GSWeb/GSWWOCompatibility.h>
#if GSWEB_WONAMES
#else
@implementation WOApplication
@end
@implementation WOAdaptor
@end
@implementation WODefaultAdaptor
@end
@implementation WOAssociation
@end
@implementation WOComponent
@end
@implementation WOContext
@end
@implementation WODisplayGroup
@end
@implementation WOElement
@end
@implementation WODynamicElement
@end
@implementation WORequest
@end
@implementation WOResourceManager
@end
@implementation WOResponse
@end
@implementation WOSession
@end
@implementation WOSessionStore
@end
@implementation WOStatisticsStore
@end
@implementation WORequestHandler
@end
@implementation WOComponentDefinition
@end
@implementation WOBundle
@end
@implementation WOMultiKeyDictionary
@end
@implementation WOCookie
@end
@implementation WOElementIDString
@end
@implementation WODirectAction
@end
@implementation WOMailDelivery
@end
@implementation WOComponentRequestHandler
@end
@implementation WOResourceRequestHandler
@end
@implementation WODirectActionRequestHandler
@end
@implementation WODefaultAdaptorThread
@end
@implementation WOKeyValueAssociation
@end
@implementation WOConstantValueAssociation
@end
@implementation WOHTMLStaticElement
@end
@implementation WOHTMLStaticGroup
@end
@implementation WOInput
@end
@implementation WOComponentReference
@end
@implementation WOPageDefElement
@end
@implementation WOSessionTimeOutManager
@end
@implementation WOServerSessionStore
@end
@implementation WODeployedBundle
@end
@implementation WOProjectBundle
@end
@implementation WOSessionTimeOut
@end
@implementation WOTemplateParser
@end
@implementation WODynamicURLString
@end
@implementation WOBindingNameAssociation
@end
@implementation WOURLValuedElementData
@end
@implementation WOHTMLURLValuedElement
@end
@implementation WOStats
@end
@implementation WOTransactionRecord
@end
@implementation WOComponentContent
@end
@implementation WOFileUpload
@end
@implementation WOResourceURL
@end
@implementation WOString
@end
@implementation WORepetition
@end
@implementation WOActiveImage
@end
@implementation WOApplet
@end
@implementation WOBrowser
@end
@implementation WOCheckBox
@end
@implementation WOCheckBoxList
@end
@implementation WOParam
@end
@implementation WOForm
@end
@implementation WOPopUpButton
@end
@implementation WOTextField
@end
@implementation WOSubmitButton
@end
@implementation WOConditional
@end
@implementation WOText
@end
@implementation WOHiddenField
@end
@implementation WOPasswordField
@end
@implementation WOResetButton
@end
@implementation WOFrame
@end
@implementation WOGenericContainer
@end
@implementation WOGenericElement
@end
@implementation WOImage
@end
@implementation WOImageButton
@end
@implementation WORadioButton
@end
@implementation WORadioButtonList
@end
@implementation WOHyperlink
@end
WOApplication *WOApp=nil;
#endif

View file

@ -36,7 +36,7 @@
#
# Things to do before compiling
# before-all::
before-all:: $(GNUSTEP_TARGET_DIR)/config.h
# Things to do after compiling
@ -80,9 +80,10 @@ after-distclean::
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)
$(GNUSTEP_TARGET_DIR)/config.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv ../config.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/config.h
ifneq ($(gswnames),gsw)
install-WO-headers :

View file

@ -35,7 +35,7 @@
#
# Additional flags to pass to the preprocessor
ADDITIONAL_CPPFLAGS = -I..
ADDITIONAL_CPPFLAGS =
# Additional flags to pass to the Objective-C compiler
ifeq ($(GDL2), yes)
@ -61,13 +61,14 @@ endif
ADDITIONAL_CFLAGS = -DUSE_BUILTIN
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I. -I../.. @XML_CFLAGS@
ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) @XML_CFLAGS@
# Additional LDFLAGS to pass to the linker
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
ADDITIONAL_LIB_DIRS =
#
# Flags dealing with installing and uninstalling

View file

@ -1,7 +1,7 @@
/*
*/
header {
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
}
options {

View file

@ -47,7 +47,7 @@
*/
header {
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
}
options {

View file

@ -1,7 +1,7 @@
/*
*/
header {
#include <GSWeb/GSWeb.h>
#include "GSWeb.h"
}
options {

View file

@ -1,4 +1,4 @@
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
#include "DynamicElements.h"
@implementation DynamicElements

View file

@ -1,4 +1,4 @@
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
int main(int argc, const char *argv[])
{

View file

@ -81,12 +81,6 @@ RadioButton1Page.gswc \
RadioButton2Page.gswc \
SRCS = $(GSWAPP_NAME:=.m)
HDRS =
DIST_FILES = $(SRCS) $(HDRS) GNUmakefile Makefile.postamble Makefile.preamble
-include Makefile.preamble
include $(GNUSTEP_MAKEFILES)/gswapp.make

View file

@ -10,7 +10,7 @@
*/
#import <GSWeb/GSWeb.h>
#include <GSWeb/GSWeb.h>
@interface Main: GSWComponent
{

View file

@ -9,7 +9,7 @@
* page.
*/
#import "Main.h"
#include "Main.h"
@implementation Main

View file

@ -66,6 +66,3 @@
# Things to do after checking
# after-check::
regenerate:
copy-dist: $(DIST_FILES)

View file

@ -46,7 +46,7 @@ ADDITIONAL_CFLAGS =
ADDITIONAL_OBJCFLAGS = -DUSE_BUILTIN
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I../..
ADDITIONAL_INCLUDE_DIRS =
# Additional LDFLAGS to pass to the linker
ADDITIONAL_LDFLAGS =

View file

@ -88,7 +88,7 @@
},
{
label = "A Fish";
value = "fisch";
value = "fish";
},
{
label = "A table";
@ -112,7 +112,7 @@
},
{
label = "A Fish";
value = "fisch";
value = "fish";
},
{
label = "A table";
@ -136,7 +136,7 @@
},
{
label = "A Fish";
value = "fisch";
value = "fish";
},
{
label = "A table";
@ -160,7 +160,7 @@
},
{
label = "A Fish";
value = "fisch";
value = "fish";
},
{
label = "A table";