+2004-08-29 Helge Hess <helge.hess@opengroupware.org>
+
+ * added hack to install the project in FHS locations - the library,
+ its headers, the tools and the resources will be installed in
+ FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+ (v4.3.48)
+
2004-08-29 Marcus Mueller <znek@mulle-kybernetik.com>
* EOControl.xcode: various fixes for project settings
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
include ../common.make
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble
+-include fhs.make
-# $Id$
+# $Id: GNUmakefile.preamble 4 2004-08-20 17:04:31Z helge $
libEOControl_INCLUDE_DIRS += -I..
ADDITIONAL_CPPFLAGS += -Wall
+ADDITIONAL_LIB_DIRS += -L/usr/local/lib -L/usr/lib
+
# libFoundation, gstep-base
ifeq ($(FOUNDATION_LIB),fd)
-# $Id$
+# $Id: Version 4 2004-08-20 17:04:31Z helge $
-SUBMINOR_VERSION:=47
+SUBMINOR_VERSION:=48
--- /dev/null
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+ $(MKDIRS) $(FHS_INCLUDE_DIR)$(libEOControl_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+ @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+ mv $(GNUSTEP_HEADERS)$(libEOControl_HEADER_FILES_INSTALL_DIR)/*.h \
+ $(FHS_INCLUDE_DIR)$(libEOControl_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs ::
+ @echo "moving libs to $(FHS_LIB_DIR) .."
+ mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif
+2004-08-29 Helge Hess <helge.hess@opengroupware.org>
+
+ * v4.3.109
+
+ * NGBundleManager.m: look for bundles in GNUSTEP_PATHPREFIX_LIST and
+ GNUSTEP_PATHLIST
+
+ * added hack to install the project in FHS locations - the library,
+ its headers, the tools and the resources will be installed in
+ FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+
2004-08-29 Marcus Mueller <znek@mulle-kybernetik.com>
* NGExtensions.xcode: various fixes for project settings
#
# GNUmakefile
#
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
include ../common.make
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble
-
-autodoc :
- autodoc $(AUTODOC_FLAGS) -dest ../Documentation/NGExtensions/ -proj .
+-include fhs.make
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
-// $Id$
+// $Id: NGBundleManager.m 4 2004-08-20 17:04:31Z helge $
#include "NGBundleManager.h"
#include "common.h"
paths = [[pi environment] objectForKey:@"NGBundlePath"];
if (paths) {
#if defined(__MINGW32__)
- paths = [paths componentsSeparatedByString:@";"];
+ paths = [paths componentsSeparatedByString:@";"];
#else
- paths = [paths componentsSeparatedByString:@":"];
+ paths = [paths componentsSeparatedByString:@":"];
#endif
}
if (paths) [self->bundleSearchPaths addObjectsFromArray:paths];
// TODO: whats that supposed to do?
// TODO: replace with proper path locator function!
NSDictionary *env;
- NSString *p;
-
+ NSString *p;
+ unsigned i, count;
+ id tmp;
+
env = [[NSProcessInfo processInfo] environment];
- p = [[[env objectForKey:@"GNUSTEP_USER_ROOT"]
- stringByAppendingPathComponent:@"Library"]
- stringByAppendingPathComponent:@"Bundles"];
- if (p) [self->bundleSearchPaths addObject:p];
- p = [[[env objectForKey:@"GNUSTEP_LOCAL_ROOT"]
- stringByAppendingPathComponent:@"Library"]
- stringByAppendingPathComponent:@"Bundles"];
- if (p) [self->bundleSearchPaths addObject:p];
- p = [[[env objectForKey:@"GNUSTEP_NETWORK_ROOT"]
- stringByAppendingPathComponent:@"Library"]
- stringByAppendingPathComponent:@"Bundles"];
- if (p) [self->bundleSearchPaths addObject:p];
- p = [[[env objectForKey:@"GNUSTEP_SYSTEM_ROOT"]
- stringByAppendingPathComponent:@"Library"]
- stringByAppendingPathComponent:@"Bundles"];
- if (p) [self->bundleSearchPaths addObject:p];
+
+ if ((tmp = [env objectForKey:@"GNUSTEP_PATHPREFIX_LIST"]) == nil)
+ tmp = [env objectForKey:@"GNUSTEP_PATHLIST"];
+ tmp = [tmp componentsSeparatedByString:@":"];
+
+ for (i = 0; i < count; i++) {
+ p = [tmp objectAtIndex:i];
+ p = [p stringByAppendingPathComponent:@"Library"];
+ p = [p stringByAppendingPathComponent:@"Bundles"];
+ if ([self->bundleSearchPaths containsObject:p]) continue;
+
+ [self->bundleSearchPaths addObject:p];
+ }
#endif
}
# $Id$
-SUBMINOR_VERSION:=108
+SUBMINOR_VERSION:=109
# v4.2.72 requires libEOControl v4.2.39
--- /dev/null
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+ $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGExtensions_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+ @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+ mv $(GNUSTEP_HEADERS)$(libNGExtensions_HEADER_FILES_INSTALL_DIR)/*.h \
+ $(FHS_INCLUDE_DIR)$(libNGExtensions_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs ::
+ @echo "moving libs to $(FHS_LIB_DIR) .."
+ mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif
+2004-08-29 Helge Hess <helge.hess@opengroupware.org>
+
+ * added hack to install the project in FHS locations - the library,
+ its headers, the tools and the resources will be installed in
+ FHS_INSTALL_ROOT if specified (eg make FHS_INSTALL_ROOT=/usr/local)
+ (v4.3.44)
+
2004-08-29 Marcus Mueller <znek@mulle-kybernetik.com>
* NGStreams.xcode: various fixes for project settings
#
# GNUmakefile
#
-# $Id$
+# $Id: GNUmakefile 4 2004-08-20 17:04:31Z helge $
include ../common.make
include ./Version
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble
+-include fhs.make
# $Id: Version 4 2004-08-20 17:04:31Z helge $
-SUBMINOR_VERSION:=43
+SUBMINOR_VERSION:=44
--- /dev/null
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-header-dirs ::
+ $(MKDIRS) $(FHS_INCLUDE_DIR)$(libNGStreams_HEADER_FILES_INSTALL_DIR)
+
+move-headers-to-fhs :: fhs-header-dirs
+ @echo "moving headers to $(FHS_INCLUDE_DIR) .."
+ mv $(GNUSTEP_HEADERS)$(libNGStreams_HEADER_FILES_INSTALL_DIR)/*.h \
+ $(FHS_INCLUDE_DIR)$(libNGStreams_HEADER_FILES_INSTALL_DIR)/
+
+NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+
+move-libs-to-fhs ::
+ @echo "moving libs to $(FHS_LIB_DIR) .."
+ mv $(NONFHS_LIBDIR)/$(NONFHS_LIBNAME)* $(FHS_LIB_DIR)/
+
+move-to-fhs :: move-headers-to-fhs move-libs-to-fhs
+
+after-install :: move-to-fhs
+
+endif
+2004-08-29 Helge Hess <helge.hess@opengroupware.org>
+
+ * moved test_qpdecode to NGMime/samples
+
+ * added hack to install the tools in FHS locations - the executables
+ will be installed in FHS_INSTALL_ROOT if specified (eg make
+ FHS_INSTALL_ROOT=/usr/local)
+
2004-08-20 Helge Hess <helge.hess@opengroupware.org>
* moved samples to sope-mime, sope-ldap, sope-ical
-# $Id$
+# $Id: GNUmakefile 9 2004-08-20 18:40:42Z helge $
include $(GNUSTEP_MAKEFILES)/common.make
fmdls \
testdirenum \
bmlookup \
- test_qpdecode \
eoqual \
testsock \
httpu_notify \
fmdls_OBJC_FILES = fmdls.m
bmlookup_OBJC_FILES = bmlookup.m
testdirenum_OBJC_FILES = testdirenum.m
-test_qpdecode_OBJC_FILES = test_qpdecode.m
eoqual_OBJC_FILES = eoqual.m EOQualTool.m
testsock_OBJC_FILES = testsock.m
parserule_OBJC_FILES = parserule.m
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
+-include fhs.make
-# $Id$
+# $Id: GNUmakefile.preamble 9 2004-08-20 18:40:42Z helge $
ADDITIONAL_INCLUDE_DIRS += \
-I.. \
-L../EOControl/$(GNUSTEP_OBJ_DIR) \
-L../NGExtensions/$(GNUSTEP_OBJ_DIR) \
-L../NGStreams/$(GNUSTEP_OBJ_DIR) \
+ -L/usr/local/lib -L/usr/lib
ADDITIONAL_TOOL_LIBS += \
-lNGStreams -lNGExtensions -lEOControl \
--- /dev/null
+# postprocessing
+
+# FHS support (this is a hack and is going to be done by gstep-make!)
+
+ifneq ($(FHS_INSTALL_ROOT),)
+
+FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/
+FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/
+FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/
+
+fhs-bin-dirs ::
+ $(MKDIRS) $(FHS_BIN_DIR)
+
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+move-tools-to-fhs :: fhs-bin-dirs
+ @echo "moving tools from $(NONFHS_BINDIR) to $(FHS_BIN_DIR) .."
+ for i in $(TOOL_NAME); do \
+ mv "$(NONFHS_BINDIR)/$${i}" $(FHS_BIN_DIR); \
+ done
+
+move-to-fhs :: move-tools-to-fhs
+
+after-install :: move-to-fhs
+
+endif
+++ /dev/null
-/*
- Copyright (C) 2000-2003 SKYRIX Software AG
-
- This file is part of OGo
-
- OGo is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- OGo 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 Lesser General Public
- License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with OGo; see the file COPYING. If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-*/
-// $Id$
-
-/*
- check whether the quoted printable MIME decoding works ...
-*/
-
-#include "common.h"
-
-static void test(void) {
- static unsigned char *fields[] = {
- "attachment; filename=\"Mappe langerp=?iso-8859-15?q?=FC=E4=F6=20Name=F6=F6=F6=201234456=2Exls?=\"",
- "Umlaute: =?iso-8859-15?q?=FC=E4=F6?=",
- "keine Umlaute: =?iso-8859-15?q?keine Umlaute?=",
- "=?iso-8859-15?q?keine Umlaute?=",
- "=?iso-8859-15?q?=FC=E4=F6?=",
- "",
- "hello world !",
- "??doit??",
- NULL
- };
- unsigned char *field;
- int i;
-
- for (i = 0; (field = fields[i]); i++) {
- NSData *fieldData;
- id result;
-
- NSLog(@"decoding field: '%s'", field);
- fieldData = [NSData dataWithBytes:field length:strlen(field)];
- NSLog(@" length: %i", [fieldData length]);
-
- result = [fieldData decodeQuotedPrintableValueOfMIMEHeaderField:
- @"content-disposition"];
-
- if (result == nil) {
- NSLog(@" got no result for field data %@ !!!", fieldData);
- }
- else if ([result isKindOfClass:[NSData class]]) {
- NSLog(@" got a data, length %i: %@", [result length], result);
- }
- else if ([result isKindOfClass:[NSString class]]) {
- NSLog(@" got a string, length %i: '%@'", [result length], result);
- }
- else {
- NSLog(@" got an unexpected object, class %@: %@",
- NSStringFromClass([result class]), result);
- }
- }
-}
-
-int main(int argc, char **argv, char **env) {
- NSAutoreleasePool *pool;
-
- pool = [NSAutoreleasePool new];
-
-#if LIB_FOUNDATION_LIBRARY
- [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
-#endif
-
- test();
-
- [pool release];
- exit(0);
- /* static linking */
- [NGExtensions class];
- return 0;
-}
projects / sope / commitdiff