From ca416198bfd9e8281502bbf66ee8d5a86e5d5ec7 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 31 Jul 2005 19:11:07 +0000 Subject: [PATCH] fixed some gcc 4.0 warnings improved makefile added Xcode project git-svn-id: http://svn.opengroupware.org/SOPE/trunk@950 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/mod_ngobjweb/ChangeLog | 8 + sope-appserver/mod_ngobjweb/GNUmakefile | 6 + .../mod_ngobjweb/NGBufferedDescriptor.c | 4 +- .../mod_ngobjweb.xcodeproj/project.pbxproj | 266 ++++++++++++++++++ 4 files changed, 282 insertions(+), 2 deletions(-) create mode 100644 sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj diff --git a/sope-appserver/mod_ngobjweb/ChangeLog b/sope-appserver/mod_ngobjweb/ChangeLog index 65224387..da4ab1a8 100644 --- a/sope-appserver/mod_ngobjweb/ChangeLog +++ b/sope-appserver/mod_ngobjweb/ChangeLog @@ -1,3 +1,11 @@ +2005-07-31 Helge Hess + + * added an Xcode 2.1 project for building the adaptor + + * GNUmakefile: added a distclean and an install-usr-libexec target + + * NGBufferedDescriptor.c: fixed some gcc 4.0 warnings + 2005-04-15 Helge Hess * handler.c: deliver Apache SSL environment as HTTP headers, either diff --git a/sope-appserver/mod_ngobjweb/GNUmakefile b/sope-appserver/mod_ngobjweb/GNUmakefile index 9ee5de52..c9fafeec 100644 --- a/sope-appserver/mod_ngobjweb/GNUmakefile +++ b/sope-appserver/mod_ngobjweb/GNUmakefile @@ -77,11 +77,17 @@ all :: $(product) clean :: rm -f *.o $(product) *.so *~ +distclean :: clean + + apache-dir : $(MKDIRS) $(GNUSTEP_INSTALLATION_DIR) install :: apache-dir all $(INSTALL_PROGRAM) $(product) $(GNUSTEP_INSTALLATION_DIR) +install-usr-libexec :: all + $(INSTALL_PROGRAM) $(product) /usr/libexec/httpd/ + $(product) : $(OFILES) $(LD) $(LDFLAGS) -o $@ $(OFILES) $(EXTRA_LDFLAGS) diff --git a/sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c b/sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c index 6f54cf36..2b15cf56 100644 --- a/sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c +++ b/sope-appserver/mod_ngobjweb/NGBufferedDescriptor.c @@ -309,13 +309,13 @@ char NGBufferedDescriptor_writeHttpHeader(NGBufferedDescriptor *self, { register unsigned int len; - if (!NGBufferedDescriptor_safeWrite(self, _key, strlen(_key))) + if (!NGBufferedDescriptor_safeWrite(self, _key, strlen((char *)_key))) return 0; if (!NGBufferedDescriptor_safeWrite(self, ": ", 2)) return 0; - len = strlen(_value); + len = strlen((char *)_value); /* Required for deliverying certificates, we encode \n and \r as %10 and %13 diff --git a/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj b/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj new file mode 100644 index 00000000..50a8ef3c --- /dev/null +++ b/sope-appserver/mod_ngobjweb/mod_ngobjweb.xcodeproj/project.pbxproj @@ -0,0 +1,266 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 42; + objects = { + +/* Begin PBXFileReference section */ + E822B876089D54600041E72D /* 500mod_ngobjweb.info */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 500mod_ngobjweb.info; sourceTree = ""; }; + E822B877089D54600041E72D /* apversion.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = apversion.sh; sourceTree = ""; }; + E822B878089D54600041E72D /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ChangeLog; sourceTree = ""; }; + E822B879089D54600041E72D /* CHANGES */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGES; sourceTree = ""; }; + E822B87A089D54600041E72D /* common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; + E822B87B089D54600041E72D /* config.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config.c; sourceTree = ""; }; + E822B87C089D54600041E72D /* COPYRIGHT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = COPYRIGHT; sourceTree = ""; }; + E822B87D089D54600041E72D /* globals.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = globals.c; sourceTree = ""; }; + E822B87E089D54600041E72D /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = ""; }; + E822B87F089D54600041E72D /* handler.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = handler.c; sourceTree = ""; }; + E822B880089D54600041E72D /* httpd.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = httpd.conf; sourceTree = ""; }; + E822B881089D54600041E72D /* NGBufferedDescriptor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = NGBufferedDescriptor.c; sourceTree = ""; }; + E822B882089D54600041E72D /* NGBufferedDescriptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NGBufferedDescriptor.h; sourceTree = ""; }; + E822B883089D54600041E72D /* ngobjweb_module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ngobjweb_module.c; sourceTree = ""; }; + E822B884089D54600041E72D /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = ""; }; + E822B885089D54600041E72D /* scanhttp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scanhttp.c; sourceTree = ""; }; + E822B886089D54600041E72D /* skyrix.conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = skyrix.conf; sourceTree = ""; }; + E822B887089D54600041E72D /* sns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sns.c; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + E822B86B089D544D0041E72D = { + isa = PBXGroup; + children = ( + E822B884089D54600041E72D /* README */, + E822B878089D54600041E72D /* ChangeLog */, + E822B879089D54600041E72D /* CHANGES */, + E822B87C089D54600041E72D /* COPYRIGHT */, + E822B87E089D54600041E72D /* GNUmakefile */, + E822B876089D54600041E72D /* 500mod_ngobjweb.info */, + E822B877089D54600041E72D /* apversion.sh */, + E822B888089D54720041E72D /* src */, + E822B889089D549F0041E72D /* config */, + ); + sourceTree = ""; + }; + E822B888089D54720041E72D /* src */ = { + isa = PBXGroup; + children = ( + E822B87A089D54600041E72D /* common.h */, + E822B87F089D54600041E72D /* handler.c */, + E822B87B089D54600041E72D /* config.c */, + E822B87D089D54600041E72D /* globals.c */, + E822B881089D54600041E72D /* NGBufferedDescriptor.c */, + E822B882089D54600041E72D /* NGBufferedDescriptor.h */, + E822B883089D54600041E72D /* ngobjweb_module.c */, + E822B885089D54600041E72D /* scanhttp.c */, + E822B887089D54600041E72D /* sns.c */, + ); + name = src; + sourceTree = ""; + }; + E822B889089D549F0041E72D /* config */ = { + isa = PBXGroup; + children = ( + E822B880089D54600041E72D /* httpd.conf */, + E822B886089D54600041E72D /* skyrix.conf */, + ); + name = config; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + E822B88A089D55B60041E72D /* mod_ngobjweb */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = E822B88B089D55C00041E72D /* Build configuration list for PBXLegacyTarget "mod_ngobjweb" */; + buildPhases = ( + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = mod_ngobjweb; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + buildToolPath = /usr/bin/make; + dependencies = ( + ); + name = mod_ngobjweb; + passBuildSettingsInEnvironment = 1; + productName = mod_ngobjweb; + }; + E822B8DF089D56F70041E72D /* install */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "install-usr-libexec"; + buildConfigurationList = E822B8E0089D57210041E72D /* Build configuration list for PBXLegacyTarget "install" */; + buildPhases = ( + ); + buildSettings = { + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = install; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + buildToolPath = /usr/bin/make; + buildWorkingDirectory = ""; + dependencies = ( + ); + name = install; + passBuildSettingsInEnvironment = 1; + productName = install; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXProject section */ + E822B86D089D544D0041E72D /* Project object */ = { + isa = PBXProject; + buildConfigurationList = E822B86E089D544D0041E72D /* Build configuration list for PBXProject "mod_ngobjweb" */; + buildStyles = ( + ); + hasScannedForEncodings = 0; + mainGroup = E822B86B089D544D0041E72D; + projectDirPath = ""; + targets = ( + E822B88A089D55B60041E72D /* mod_ngobjweb */, + E822B8DF089D56F70041E72D /* install */, + ); + }; +/* End PBXProject section */ + +/* Begin XCBuildConfiguration section */ + E822B86F089D544D0041E72D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + }; + name = Debug; + }; + E822B870089D544D0041E72D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + }; + name = Release; + }; + E822B88C089D55C00041E72D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = mod_ngobjweb; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Debug; + }; + E822B88D089D55C00041E72D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = mod_ngobjweb; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Release; + }; + E822B8E1089D57210041E72D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = install; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Debug; + }; + E822B8E2089D57210041E72D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + OPTIMIZATION_CFLAGS = ""; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + OTHER_REZFLAGS = ""; + PRODUCT_NAME = install; + SECTORDER_FLAGS = ""; + WARNING_CFLAGS = ( + "-Wmost", + "-Wno-four-char-constants", + "-Wno-unknown-pragmas", + ); + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + E822B86E089D544D0041E72D /* Build configuration list for PBXProject "mod_ngobjweb" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E822B86F089D544D0041E72D /* Debug */, + E822B870089D544D0041E72D /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + E822B88B089D55C00041E72D /* Build configuration list for PBXLegacyTarget "mod_ngobjweb" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E822B88C089D55C00041E72D /* Debug */, + E822B88D089D55C00041E72D /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; + E822B8E0089D57210041E72D /* Build configuration list for PBXLegacyTarget "install" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + E822B8E1089D57210041E72D /* Debug */, + E822B8E2089D57210041E72D /* Release */, + ); + defaultConfigurationIsVisible = 0; + }; +/* End XCConfigurationList section */ + }; + rootObject = E822B86D089D544D0041E72D /* Project object */; +} -- 2.39.5