From 87ecde1a46280e8d0d91618b03d38c8dfbed1001 Mon Sep 17 00:00:00 2001 From: David Ayers Date: Thu, 8 Jan 2004 16:23:47 +0000 Subject: [PATCH] * 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 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 --- ChangeLog | 53 ++++ Examples/hello/Hello.m | 2 +- Examples/hello/HelloPage.h | 2 +- Examples/hello/HelloPage.m | 2 +- Examples/hello/Hello_main.m | 2 +- Examples/hello/Main.h | 2 +- Examples/hello/Main.m | 6 +- Examples/hello/Resources/Info-Hello.plist | 28 +- GSWExtensions.framework/Makefile.postamble | 4 - GSWExtensions.framework/Makefile.preamble | 10 +- GSWExtensionsGSW.framework/Makefile.postamble | 3 - GSWExtensionsGSW.framework/Makefile.preamble | 14 +- GSWeb.framework/GNUmakefile | 2 - GSWeb.framework/GSWDebug.h | 2 +- GSWeb.framework/GSWDebug.m | 19 +- GSWeb.framework/GSWPageDefLexer.h | 2 +- GSWeb.framework/GSWPageDefLexer.m | 2 +- GSWeb.framework/GSWPageDefParser.h | 2 +- GSWeb.framework/GSWPageDefParser.m | 2 +- GSWeb.framework/GSWPageDefParserTokenTypes.h | 2 +- GSWeb.framework/GSWWOCompatibility.m | 266 ------------------ GSWeb.framework/Makefile.postamble | 9 +- GSWeb.framework/Makefile.preamble.in | 7 +- GSWeb.framework/PageDef.g | 2 +- GSWeb.framework/html.g | 2 +- GSWeb.framework/htmltag.g | 2 +- Testing/DynamicElements/DynamicElements.m | 2 +- .../DynamicElements/DynamicElements_main.m | 2 +- Testing/DynamicElements/GNUmakefile | 6 - Testing/DynamicElements/Main.h | 2 +- Testing/DynamicElements/Main.m | 2 +- Testing/DynamicElements/Makefile.postamble | 3 - Testing/DynamicElements/Makefile.preamble | 2 +- .../Resources/Info-DynamicElements.plist | 8 +- 34 files changed, 123 insertions(+), 353 deletions(-) delete mode 100644 GSWeb.framework/GSWWOCompatibility.m diff --git a/ChangeLog b/ChangeLog index 76541c2..3d25a90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,56 @@ +2004-01-07 David Ayers + + * 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 + 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 * GSWeb.framework: GSWString.m do a stringValue on numbers to avoid an exception later. diff --git a/Examples/hello/Hello.m b/Examples/hello/Hello.m index b66dda2..3065480 100644 --- a/Examples/hello/Hello.m +++ b/Examples/hello/Hello.m @@ -2,7 +2,7 @@ #include #endif -#import +#include #include "Hello.h" @implementation Hello diff --git a/Examples/hello/HelloPage.h b/Examples/hello/HelloPage.h index d96bb75..a4ab170 100644 --- a/Examples/hello/HelloPage.h +++ b/Examples/hello/HelloPage.h @@ -10,7 +10,7 @@ */ -#import +#include @interface HelloPage:GSWComponent { diff --git a/Examples/hello/HelloPage.m b/Examples/hello/HelloPage.m index 3fe335f..335a690 100644 --- a/Examples/hello/HelloPage.m +++ b/Examples/hello/HelloPage.m @@ -13,7 +13,7 @@ #include #endif -#import "HelloPage.h" +#include "HelloPage.h" @implementation HelloPage diff --git a/Examples/hello/Hello_main.m b/Examples/hello/Hello_main.m index baa8ce0..645528e 100644 --- a/Examples/hello/Hello_main.m +++ b/Examples/hello/Hello_main.m @@ -2,7 +2,7 @@ #include #endif -#import +#include int main(int argc, const char *argv[]) { diff --git a/Examples/hello/Main.h b/Examples/hello/Main.h index d9f626e..2d4cb3d 100644 --- a/Examples/hello/Main.h +++ b/Examples/hello/Main.h @@ -9,7 +9,7 @@ * page. */ -#import +#include @interface Main:GSWComponent { diff --git a/Examples/hello/Main.m b/Examples/hello/Main.m index 3548b74..6c84e10 100644 --- a/Examples/hello/Main.m +++ b/Examples/hello/Main.m @@ -13,9 +13,9 @@ #include #endif -#import "Main.h" -#import "Hello.h" -#import "HelloPage.h" +#include "Main.h" +#include "Hello.h" +#include "HelloPage.h" @implementation Main diff --git a/Examples/hello/Resources/Info-Hello.plist b/Examples/hello/Resources/Info-Hello.plist index 9431f6a..938107d 100644 --- a/Examples/hello/Resources/Info-Hello.plist +++ b/Examples/hello/Resources/Info-Hello.plist @@ -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; +}; diff --git a/GSWExtensions.framework/Makefile.postamble b/GSWExtensions.framework/Makefile.postamble index c2a4ac7..05f6df1 100644 --- a/GSWExtensions.framework/Makefile.postamble +++ b/GSWExtensions.framework/Makefile.postamble @@ -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); diff --git a/GSWExtensions.framework/Makefile.preamble b/GSWExtensions.framework/Makefile.preamble index f5c98bc..23e242c 100644 --- a/GSWExtensions.framework/Makefile.preamble +++ b/GSWExtensions.framework/Makefile.preamble @@ -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 diff --git a/GSWExtensionsGSW.framework/Makefile.postamble b/GSWExtensionsGSW.framework/Makefile.postamble index e2a1323..9184a81 100644 --- a/GSWExtensionsGSW.framework/Makefile.postamble +++ b/GSWExtensionsGSW.framework/Makefile.postamble @@ -80,6 +80,3 @@ gsdocs: # Things to do after checking # after-check:: -regenerate: - -copy-dist: $(DIST_FILES) diff --git a/GSWExtensionsGSW.framework/Makefile.preamble b/GSWExtensionsGSW.framework/Makefile.preamble index 05e434c..40955e6 100644 --- a/GSWExtensionsGSW.framework/Makefile.preamble +++ b/GSWExtensionsGSW.framework/Makefile.preamble @@ -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 diff --git a/GSWeb.framework/GNUmakefile b/GSWeb.framework/GNUmakefile index 6702370..8427af1 100644 --- a/GSWeb.framework/GNUmakefile +++ b/GSWeb.framework/GNUmakefile @@ -32,8 +32,6 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ../config.mak -srcdir = . - # The framework to be compiled # Options diff --git a/GSWeb.framework/GSWDebug.h b/GSWeb.framework/GSWDebug.h index 968116d..a8724c2 100644 --- a/GSWeb.framework/GSWDebug.h +++ b/GSWeb.framework/GSWDebug.h @@ -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 diff --git a/GSWeb.framework/GSWDebug.m b/GSWeb.framework/GSWDebug.m index 6f43a15..bb41b53 100644 --- a/GSWeb.framework/GSWDebug.m +++ b/GSWeb.framework/GSWDebug.m @@ -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 diff --git a/GSWeb.framework/GSWPageDefLexer.h b/GSWeb.framework/GSWPageDefLexer.h index 728c3e3..be4608d 100644 --- a/GSWeb.framework/GSWPageDefLexer.h +++ b/GSWeb.framework/GSWPageDefLexer.h @@ -11,7 +11,7 @@ */ -#include +#include "GSWeb.h" #include "gsantlr/ANTLRCommon.h" diff --git a/GSWeb.framework/GSWPageDefLexer.m b/GSWeb.framework/GSWPageDefLexer.m index 4df0a8a..e28a4c2 100644 --- a/GSWeb.framework/GSWPageDefLexer.m +++ b/GSWeb.framework/GSWPageDefLexer.m @@ -8,7 +8,7 @@ */ -#include +#include "GSWeb.h" #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRException.h" diff --git a/GSWeb.framework/GSWPageDefParser.h b/GSWeb.framework/GSWPageDefParser.h index 0b2b505..a6e23ec 100644 --- a/GSWeb.framework/GSWPageDefParser.h +++ b/GSWeb.framework/GSWPageDefParser.h @@ -11,7 +11,7 @@ */ -#include +#include "GSWeb.h" #include "gsantlr/ANTLRCommon.h" #include "gsantlr/ANTLRTokenizer.h" diff --git a/GSWeb.framework/GSWPageDefParser.m b/GSWeb.framework/GSWPageDefParser.m index b17a344..7975b1d 100644 --- a/GSWeb.framework/GSWPageDefParser.m +++ b/GSWeb.framework/GSWPageDefParser.m @@ -8,7 +8,7 @@ */ -#include +#include "GSWeb.h" #include "gsantlr/ANTLRCommon.h" #include "GSWPageDefParser.h" diff --git a/GSWeb.framework/GSWPageDefParserTokenTypes.h b/GSWeb.framework/GSWPageDefParserTokenTypes.h index 6fb024e..e644180 100644 --- a/GSWeb.framework/GSWPageDefParserTokenTypes.h +++ b/GSWeb.framework/GSWPageDefParserTokenTypes.h @@ -11,7 +11,7 @@ */ -#include +#include "GSWeb.h" enum GSWPageDefParserTokenTypes { GSWPageDefParserTokenType_EOF_ = 1, diff --git a/GSWeb.framework/GSWWOCompatibility.m b/GSWeb.framework/GSWWOCompatibility.m deleted file mode 100644 index ca73e54..0000000 --- a/GSWeb.framework/GSWWOCompatibility.m +++ /dev/null @@ -1,266 +0,0 @@ -/** GSWWOCompatibility.m - GSWeb: GSWWOCompatibility - - Copyright (C) 2000-2002 Free Software Foundation, Inc. - - Written by: Manuel Guesdon - Date: Dec 2000 - - $Revision$ - $Date$ - - This file is part of the GNUstep Web Library. - - - 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. - -**/ - -#include "config.h" - -RCS_ID($Id$") - -#include -#include - -#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 - - diff --git a/GSWeb.framework/Makefile.postamble b/GSWeb.framework/Makefile.postamble index 4e22dd8..1486db9 100644 --- a/GSWeb.framework/Makefile.postamble +++ b/GSWeb.framework/Makefile.postamble @@ -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 : diff --git a/GSWeb.framework/Makefile.preamble.in b/GSWeb.framework/Makefile.preamble.in index c00c411..725c90b 100644 --- a/GSWeb.framework/Makefile.preamble.in +++ b/GSWeb.framework/Makefile.preamble.in @@ -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 diff --git a/GSWeb.framework/PageDef.g b/GSWeb.framework/PageDef.g index cb030ff..daa2f4e 100644 --- a/GSWeb.framework/PageDef.g +++ b/GSWeb.framework/PageDef.g @@ -1,7 +1,7 @@ /* */ header { -#include +#include "GSWeb.h" } options { diff --git a/GSWeb.framework/html.g b/GSWeb.framework/html.g index 74a5203..37d8c65 100644 --- a/GSWeb.framework/html.g +++ b/GSWeb.framework/html.g @@ -47,7 +47,7 @@ */ header { -#include +#include "GSWeb.h" } options { diff --git a/GSWeb.framework/htmltag.g b/GSWeb.framework/htmltag.g index 900aa6e..cbd5a0c 100644 --- a/GSWeb.framework/htmltag.g +++ b/GSWeb.framework/htmltag.g @@ -1,7 +1,7 @@ /* */ header { -#include +#include "GSWeb.h" } options { diff --git a/Testing/DynamicElements/DynamicElements.m b/Testing/DynamicElements/DynamicElements.m index 638f512..a436f8d 100644 --- a/Testing/DynamicElements/DynamicElements.m +++ b/Testing/DynamicElements/DynamicElements.m @@ -1,4 +1,4 @@ -#import +#include #include "DynamicElements.h" @implementation DynamicElements diff --git a/Testing/DynamicElements/DynamicElements_main.m b/Testing/DynamicElements/DynamicElements_main.m index 42be8b3..1f51800 100644 --- a/Testing/DynamicElements/DynamicElements_main.m +++ b/Testing/DynamicElements/DynamicElements_main.m @@ -1,4 +1,4 @@ -#import +#include int main(int argc, const char *argv[]) { diff --git a/Testing/DynamicElements/GNUmakefile b/Testing/DynamicElements/GNUmakefile index 1657193..0abf5a9 100644 --- a/Testing/DynamicElements/GNUmakefile +++ b/Testing/DynamicElements/GNUmakefile @@ -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 diff --git a/Testing/DynamicElements/Main.h b/Testing/DynamicElements/Main.h index e8178ab..9d0093b 100644 --- a/Testing/DynamicElements/Main.h +++ b/Testing/DynamicElements/Main.h @@ -10,7 +10,7 @@ */ -#import +#include @interface Main: GSWComponent { diff --git a/Testing/DynamicElements/Main.m b/Testing/DynamicElements/Main.m index 22c6d1b..07358ae 100644 --- a/Testing/DynamicElements/Main.m +++ b/Testing/DynamicElements/Main.m @@ -9,7 +9,7 @@ * page. */ -#import "Main.h" +#include "Main.h" @implementation Main diff --git a/Testing/DynamicElements/Makefile.postamble b/Testing/DynamicElements/Makefile.postamble index a97bf5b..462625d 100644 --- a/Testing/DynamicElements/Makefile.postamble +++ b/Testing/DynamicElements/Makefile.postamble @@ -66,6 +66,3 @@ # Things to do after checking # after-check:: -regenerate: - -copy-dist: $(DIST_FILES) diff --git a/Testing/DynamicElements/Makefile.preamble b/Testing/DynamicElements/Makefile.preamble index ef7ebc0..408d074 100644 --- a/Testing/DynamicElements/Makefile.preamble +++ b/Testing/DynamicElements/Makefile.preamble @@ -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 = diff --git a/Testing/DynamicElements/Resources/Info-DynamicElements.plist b/Testing/DynamicElements/Resources/Info-DynamicElements.plist index a633578..ddb8e7c 100644 --- a/Testing/DynamicElements/Resources/Info-DynamicElements.plist +++ b/Testing/DynamicElements/Resources/Info-DynamicElements.plist @@ -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";