* INSTALL: Update prerequisits and installation guidelines. * GSWeb.framework/GSWApplication.m: Fix compile with debug=no. * GSWeb.framework/GSWeb.h: Include GNUstep.h if GNUSTEP is not defined for OS X. * GSWExtensions.framework/GSWExtWOCompatibility.h: Ditto. * GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h: Ditto. * Examples/hello/*.m: Ditto.
Commited.
Cheers, David
? config.h ? config.log ? config.mak ? config.status ? gsweb.make ? gsweb.patch ? Examples/hello/Hello.gswa ? Examples/hello/shared_obj ? GSWExtensions.framework/GSWExtensions.framework ? GSWExtensions.framework/GSWExtensions_wo.framework ? GSWExtensions.framework/derived_src ? GSWExtensions.framework/shared_debug_obj ? GSWExtensionsGSW.framework/GSWExtensionsGSW.framework ? GSWExtensionsGSW.framework/GSWExtensionsGSW_wo.framework ? GSWExtensionsGSW.framework/derived_src ? GSWExtensionsGSW.framework/shared_debug_obj ? GSWeb.framework/GSWeb.framework ? GSWeb.framework/GSWeb_wo.framework ? GSWeb.framework/Makefile.preamble ? GSWeb.framework/derived_src ? GSWeb.framework/shared_debug_obj Index: INSTALL =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/INSTALL,v retrieving revision 1.5 diff -u -r1.5 INSTALL --- INSTALL 6 Aug 2002 22:18:09 -0000 1.5 +++ INSTALL 11 Jul 2003 18:30:53 -0000 @@ -21,11 +21,11 @@ Libraries requiered : --------------------- - gsantlr/ GSANTLR (Parser classes,...) - gsgd/ Objective-C/GD Interface - core/ GNUstep core - db/ GNUstep database - extensions/ Extensions + core/ GNUstep core + gdl2/ GNUstep Database Library 2 +(or db/ alternative GNUstep Database Library) + gsantlr/ GSANTLR (Parser classes,...) + gsgd/ Objective-C/GD Interface The GNUStepWeb package: ----------------------- @@ -40,21 +40,20 @@ ------------------ 1) core - -2) extensions - It adds the Header exceptions folders (both in Foundation and extensions) - -3) db -4) gsantlr -5) the 'gd' libraries. You must have a /usr/include/gd.h file. If not take sources on http://www.boutell.com/gd + +2) gdl2 + +3) gsantlr + +4) the 'gd' libraries. You must have a /usr/include/gd.h file. If not take sources on http://www.boutell.com/gd Extract and compile -6) gsgd +5) gsgd -8) GNUstepWeb +6) GNUstepWeb Go in the gsweb folder. make and make install. -9) Apaches modules for GNUstepWeb +7) Apaches modules for GNUstepWeb Still in the gsweb folder there is a GSWAdaptors/Apache folder, go in and make. There no make install. Instead you must copy the mod_gsweb.so module in you Apache libexec directory (something like /usr/apache/libexec). At this point everything is done, still remains the Apache configuration: @@ -68,70 +67,73 @@ Configurating Apache: ===================== - In Apache httpd.conf file, add thoses lines: +In Apache httpd.conf file, add thoses lines: - LoadModule GSWeb_Module libexec/mod_gsweb.so - AddModule mod_gsweb.c + LoadModule GSWeb_Module libexec/mod_gsweb.so + AddModule mod_gsweb.c - And this one to specify the configuration file (for exemple /etc/httpd/conf/gsweb.conf) +And this one to specify the configuration file (for exemple /etc/httpd/conf/gsweb.conf) - GSWeb_ConfigFilePath /etc/httpd/conf/gsweb.conf + GSWeb_ConfigFilePath /etc/httpd/conf/gsweb.conf - If you use virtual hosts (Apache in localhost does not requiered them), add the following lines: +If you use virtual hosts (Apache in localhost does not requiered them), add the following lines: <Location /GSWeb*> SetHandler GSWeb </Location> - Then, create the file configuration file (for exemple /etc/httpd/conf/gsweb.conf) which contains parameters for GNUstepWeb Applications: +Then, create the file configuration file (for exemple /etc/httpd/conf/gsweb.conf) which contains parameters for GNUstepWeb Applications: - The format is(there is an example for values below): +The format is(there is an example for values below): { - canDumpStatus=YES; //YES if server can display status (URL: /GSWeb/status) - GSWExtensionsFrameworkWebServerResources="/GSW/GSWExtensions/WebServerResources"; //URL of GSWExtensions Framework WebServerResources directory + canDumpStatus = YES; + //YES if server can display status (URL: /GSWeb/status) - applications= { - ApplicationName = { - //URL of GSWExtensions Framework WebServerResources directory. It overides Global parameter - GSWExtensionsFrameworkWebServerResources="/GSW/GSWExtensions/WebServerResources"; - - //YES to say that this application can be listed when the adaptor don't find an application - canDump = YES; - - instances = { - InstanceNumber = { - host= IPAdressOfTheComputerOnWhichRunTheApplication; - port= ThePortListenByTheApplication; - parameters= { - transport= socket; - }; - } - }; - }; - }; + GSWExtensionsFrameworkWebServerResources = + "/GSW/GSWExtensions/WebServerResources"; + //URL of GSWExtensions Framework WebServerResources directory + + applications = { + ApplicationName = { + //URL of GSWExtensions Framework WebServerResources directory. + //It overides Global parameter + GSWExtensionsFrameworkWebServerResources = + "/GSW/GSWExtensions/WebServerResources"; + + //YES to say that this application can be listed when the + //adaptor don't find an application + canDump = YES; + + instances = { + InstanceNumber = { + host = IPAdressOfTheComputerOnWhichRunTheApplication; + port = ThePortListenByTheApplication; + parameters = { transport= socket; }; + } + }; + }; + }; } - -exemple values for a localhost use: +Example values for a localhost use: { - canDumpStatus=YES; - GSWExtensionsFrameworkWebServerResources="/GSW/GSWExtensions/WebServerResources"; - applications= { - MyApp = { - canDump = YES; - instances = { - 1 = { - host= 127.0.0.1; - port= 9001; - parameters= { - transport= socket; - }; - } - }; - }; - }; + canDumpStatus = YES; + GSWExtensionsFrameworkWebServerResources = + "/GSW/GSWExtensions/WebServerResources"; + applications = { + MyApp = { + canDump = YES; + instances = { + 1 = { + host = 127.0.0.1; + port = 9001; + parameters = { transport= socket; }; + }; + }; + }; + }; } Index: Examples/hello/Hello.m =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/Examples/hello/Hello.m,v retrieving revision 1.1 diff -u -r1.1 Hello.m --- Examples/hello/Hello.m 11 Dec 2001 14:34:38 -0000 1.1 +++ Examples/hello/Hello.m 11 Jul 2003 18:30:53 -0000 @@ -1,3 +1,7 @@ +#ifndef GNUSTEP +#include <gnsutep/base/GNUstep.h> +#endif + #import <GSWeb/GSWeb.h> #include "Hello.h" Index: Examples/hello/HelloPage.m =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/Examples/hello/HelloPage.m,v retrieving revision 1.2 diff -u -r1.2 HelloPage.m --- Examples/hello/HelloPage.m 18 Nov 2002 11:14:54 -0000 1.2 +++ Examples/hello/HelloPage.m 11 Jul 2003 18:30:53 -0000 @@ -9,6 +9,10 @@ * page. */ +#ifndef GNUSTEP +#include <gnsutep/base/GNUstep.h> +#endif + #import "HelloPage.h" @implementation HelloPage Index: Examples/hello/Hello_main.m =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/Examples/hello/Hello_main.m,v retrieving revision 1.1 diff -u -r1.1 Hello_main.m --- Examples/hello/Hello_main.m 11 Dec 2001 14:34:38 -0000 1.1 +++ Examples/hello/Hello_main.m 11 Jul 2003 18:30:53 -0000 @@ -1,3 +1,7 @@ +#ifndef GNUSTEP +#include <gnsutep/base/GNUstep.h> +#endif + #import <GSWeb/GSWeb.h> int main(int argc, const char *argv[]) Index: Examples/hello/Main.m =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/Examples/hello/Main.m,v retrieving revision 1.2 diff -u -r1.2 Main.m --- Examples/hello/Main.m 18 Nov 2002 11:14:54 -0000 1.2 +++ Examples/hello/Main.m 11 Jul 2003 18:30:53 -0000 @@ -9,6 +9,10 @@ * page. */ +#ifndef GNUSTEP +#include <gnsutep/base/GNUstep.h> +#endif + #import "Main.h" #import "Hello.h" #import "HelloPage.h" Index: GSWExtensions.framework/GSWExtWOCompatibility.h =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWExtensions.framework/GSWExtWOCompatibility.h,v retrieving revision 1.1 diff -u -r1.1 GSWExtWOCompatibility.h --- GSWExtensions.framework/GSWExtWOCompatibility.h 22 Jan 2003 12:24:23 -0000 1.1 +++ GSWExtensions.framework/GSWExtWOCompatibility.h 11 Jul 2003 18:30:53 -0000 @@ -34,6 +34,10 @@ #ifndef _GSWExtWOCompatibility_h__ #define _GSWExtWOCompatibility_h__ +#ifndef GNUSTEP +#include <gnustep/base/GNUstep.h> +#endif + #ifndef GSWEB_WONAMES #include <GSWeb/GSWeb.h> #else Index: GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h,v retrieving revision 1.1 diff -u -r1.1 GSWExtGSWWOCompatibility.h --- GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h 22 Jan 2003 12:24:24 -0000 1.1 +++ GSWExtensionsGSW.framework/GSWExtGSWWOCompatibility.h 11 Jul 2003 18:30:53 -0000 @@ -34,6 +34,10 @@ #ifndef _GSWExtGSWWOCompatibility_h__ #define _GSWExtGSWWOCompatibility_h__ +#ifndef GNUSTEP +#include <gnustep/base/GNUstep.h> +#endif + #ifndef GSWEB_WONAMES #include <GSWeb/GSWeb.h> #else Index: GSWeb.framework/GSWApplication.m =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWeb.framework/GSWApplication.m,v retrieving revision 1.50 diff -u -r1.50 GSWApplication.m --- GSWeb.framework/GSWApplication.m 25 Jun 2003 15:17:29 -0000 1.50 +++ GSWeb.framework/GSWApplication.m 11 Jul 2003 18:30:54 -0000 @@ -1309,13 +1309,22 @@ (isCachedComponent ? "" : "Not ")]; #endif }; +#ifdef DEBUG NSDebugMLLog(@"application",@"%s componentDefinition (%p) for %@ class=%@ %s. search time: %.3f s", (componentDefinition ? "FOUND" : "NOTFOUND"), componentDefinition, aName, (componentDefinition ? [[componentDefinition class] description]: @""), (componentDefinition ? (isCachedComponent ? "(Cached)" : "(Not Cached)") : ""), - [stopDate timeIntervalSinceDate:startDate]); + [stopDate timeIntervalSinceDate:startDate]); +#else + NSDebugMLLog(@"application",@"%s componentDefinition (%p) for %@ class=%@ %s.", + (componentDefinition ? "FOUND" : "NOTFOUND"), + componentDefinition, + aName, + (componentDefinition ? [[componentDefinition class] description]: @""), + (componentDefinition ? (isCachedComponent ? "(Cached)" : "(Not Cached)") : "")); +#endif LOGObjectFnStop(); return componentDefinition; }; Index: GSWeb.framework/GSWeb.h =================================================================== RCS file: /cvsroot/gnustep/gnustep/dev-libs/gsweb/GSWeb.framework/GSWeb.h,v retrieving revision 1.14 diff -u -r1.14 GSWeb.h --- GSWeb.framework/GSWeb.h 24 Mar 2003 07:45:52 -0000 1.14 +++ GSWeb.framework/GSWeb.h 11 Jul 2003 18:30:54 -0000 @@ -40,6 +40,11 @@ #ifdef __FreeBSD__ #include <float.h> #endif + +#ifndef GNUSTEP +#include <gnustep/base/GNUstep.h> +#endif + #include <Foundation/Foundation.h> #include <Foundation/NSObject.h> #include <Foundation/NSValue.h>
_______________________________________________ Bug-gnustep mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-gnustep
