From a2987d1ae925a5e7145fd2aa8827d86c06b12ce9 Mon Sep 17 00:00:00 2001 From: helge Date: Sun, 18 Sep 2005 17:16:07 +0000 Subject: [PATCH] fixed some NGMail framework build issue git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1111 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ sope-appserver/NGObjWeb/GNUmakefile.preamble | 1 + sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m | 2 +- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGXmlRpc/ChangeLog | 4 ++++ sope-appserver/NGXmlRpc/GNUmakefile.preamble | 2 ++ sope-appserver/NGXmlRpc/Version | 2 +- sope-appserver/SoOFS/ChangeLog | 4 ++++ sope-appserver/SoOFS/GNUmakefile.preamble | 8 +++++--- sope-appserver/SoOFS/Version | 2 +- sope-appserver/WEExtensions/ChangeLog | 4 ++++ sope-appserver/WEExtensions/GNUmakefile.preamble | 3 ++- sope-appserver/WEExtensions/Version | 2 +- sope-appserver/WOExtensions/ChangeLog | 4 ++++ sope-appserver/WOExtensions/GNUmakefile.preamble | 3 ++- sope-appserver/WOExtensions/Version | 2 +- sopex/SOPEX/ChangeLog | 5 +++++ sopex/SOPEX/GNUmakefile.preamble | 2 ++ sopex/SOPEX/Version | 2 +- xmlrpc_call/ChangeLog | 4 ++++ xmlrpc_call/GNUmakefile.preamble | 2 ++ 21 files changed, 53 insertions(+), 12 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index fa4a1ae3..842a98b4 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added missing linking path to NGMail (required + on OSX) (v4.5.201) + 2005-09-15 Helge Hess * started WOxTalElemBuilder (v4.5.200) diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 94de68f2..63119681 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -32,6 +32,7 @@ ADDITIONAL_INCLUDE_DIRS += \ # library/framework search pathes DEP_DIRS = \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-mime \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ diff --git a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m index 84559a9d..af29e83f 100644 --- a/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m +++ b/sope-appserver/NGObjWeb/Templates/WOxElemBuilder.m @@ -495,7 +495,7 @@ static WOAssociation *yesAssoc = nil; [self _ensureDefaultAssocMappings]; - if ((c = [self->nsToAssoc objectForKey:_ns]) == nil) + if ((c = [self->nsToAssoc objectForKey:_ns]) == Nil) /* if we have no class mapped for a namespace, we treat it as a value */ c = ValAssoc; diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 16c96dd2..9a8640a1 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=200 +SUBMINOR_VERSION:=201 # v4.5.122 requires libNGExtensions v4.5.153 # v4.5.91 requires libNGExtensions v4.5.134 diff --git a/sope-appserver/NGXmlRpc/ChangeLog b/sope-appserver/NGXmlRpc/ChangeLog index f179d04a..877abb23 100644 --- a/sope-appserver/NGXmlRpc/ChangeLog +++ b/sope-appserver/NGXmlRpc/ChangeLog @@ -1,3 +1,7 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added dependency to NGMail (v4.5.13) + 2005-08-11 Helge Hess * GNUmakefile.preamble: added framework compilation for OSX (v4.5.12) diff --git a/sope-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index 151780d1..a45cebd8 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -27,6 +27,7 @@ libNGXmlRpc_LIBRARIES_DEPEND_UPON += \ NGXmlRpc_LIBRARIES_DEPEND_UPON += \ -framework NGObjWeb \ -framework NGMime \ + -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC @@ -36,6 +37,7 @@ NGXmlRpc_LIBRARIES_DEPEND_UPON += \ DEP_DIRS = \ ../NGObjWeb \ $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ $(SOPE_ROOT)/sope-core/EOControl \ diff --git a/sope-appserver/NGXmlRpc/Version b/sope-appserver/NGXmlRpc/Version index 81248043..36c1074d 100644 --- a/sope-appserver/NGXmlRpc/Version +++ b/sope-appserver/NGXmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=12 +SUBMINOR_VERSION:=13 diff --git a/sope-appserver/SoOFS/ChangeLog b/sope-appserver/SoOFS/ChangeLog index 2f089c10..f2e52128 100644 --- a/sope-appserver/SoOFS/ChangeLog +++ b/sope-appserver/SoOFS/ChangeLog @@ -1,3 +1,7 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added dependency to NGMail (v4.5.19) + 2005-08-06 Helge Hess * OFSResourceManager.m, OFSFolderDataSource.m, OFSPropertyListObject.m: diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble index f2c930b8..5f36537b 100644 --- a/sope-appserver/SoOFS/GNUmakefile.preamble +++ b/sope-appserver/SoOFS/GNUmakefile.preamble @@ -1,6 +1,7 @@ # compilation settings -ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 +# TODO: need to fix COMPILE_FOR_GSTEP_MAKE? +ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol SOPE_ROOT=../.. @@ -40,13 +41,13 @@ else SoOFS_LIBRARIES_DEPEND_UPON += \ -framework NGObjWeb \ - -framework NGMime \ + -framework NGMime -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC $(SOPED_NAME)_TOOL_LIBS += \ -framework SoOFS -framework NGObjWeb \ - -framework NGMime \ + -framework NGMime -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC @@ -58,6 +59,7 @@ endif DEP_DIRS = \ . ../NGObjWeb \ $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ $(SOPE_ROOT)/sope-core/EOControl \ diff --git a/sope-appserver/SoOFS/Version b/sope-appserver/SoOFS/Version index c5124e5b..c2e3c03e 100644 --- a/sope-appserver/SoOFS/Version +++ b/sope-appserver/SoOFS/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=18 +SUBMINOR_VERSION:=19 diff --git a/sope-appserver/WEExtensions/ChangeLog b/sope-appserver/WEExtensions/ChangeLog index 21b9674c..7df4832f 100644 --- a/sope-appserver/WEExtensions/ChangeLog +++ b/sope-appserver/WEExtensions/ChangeLog @@ -1,3 +1,7 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added dependency to NGMail (v4.5.83) + 2005-09-09 Helge Hess * WETableMatrixLabel.m: avoid an edge condition when the position diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble index 06bbda2a..083f8204 100644 --- a/sope-appserver/WEExtensions/GNUmakefile.preamble +++ b/sope-appserver/WEExtensions/GNUmakefile.preamble @@ -36,7 +36,7 @@ libWEExtensions_LIBRARIES_DEPEND_UPON += \ ifeq ($(frameworks),yes) WEExtensions_LIBRARIES_DEPEND_UPON += \ -framework NGObjWeb \ - -framework NGMime \ + -framework NGMime -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC endif @@ -47,6 +47,7 @@ endif DEP_DIRS = \ ../NGObjWeb \ $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ $(SOPE_ROOT)/sope-core/EOControl \ diff --git a/sope-appserver/WEExtensions/Version b/sope-appserver/WEExtensions/Version index 392a00ce..93adc04e 100644 --- a/sope-appserver/WEExtensions/Version +++ b/sope-appserver/WEExtensions/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=82 +SUBMINOR_VERSION:=83 # v4.5.76 requires libNGObjWeb v4.5.176 # v4.5.75 requires libNGObjWeb v4.5.174 diff --git a/sope-appserver/WOExtensions/ChangeLog b/sope-appserver/WOExtensions/ChangeLog index fb30ed4b..f29ae1be 100644 --- a/sope-appserver/WOExtensions/ChangeLog +++ b/sope-appserver/WOExtensions/ChangeLog @@ -1,3 +1,7 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added dependency to NGMail (v4.5.29) + 2005-08-25 Helge Hess * GNUmakefile.preamble: fixed makefile for inline compilation (v4.5.28) diff --git a/sope-appserver/WOExtensions/GNUmakefile.preamble b/sope-appserver/WOExtensions/GNUmakefile.preamble index 877e4b46..4ce3badc 100644 --- a/sope-appserver/WOExtensions/GNUmakefile.preamble +++ b/sope-appserver/WOExtensions/GNUmakefile.preamble @@ -29,7 +29,7 @@ ifeq ($(frameworks),yes) WOExtensions_LIBRARIES_DEPEND_UPON += \ -framework WEExtensions \ -framework NGObjWeb \ - -framework NGMime \ + -framework NGMime -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC endif @@ -42,6 +42,7 @@ DEP_DIRS = \ ../WEExtensions \ ../NGObjWeb \ $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ $(SOPE_ROOT)/sope-core/EOControl \ diff --git a/sope-appserver/WOExtensions/Version b/sope-appserver/WOExtensions/Version index f1cf512d..6e9d7166 100644 --- a/sope-appserver/WOExtensions/Version +++ b/sope-appserver/WOExtensions/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=28 +SUBMINOR_VERSION:=29 # v4.5.23 requires libNGObjWeb v4.5.145 # v4.5.22 requires libNGObjWeb v4.5.106 diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog index 576d5d2d..b2856c25 100644 --- a/sopex/SOPEX/ChangeLog +++ b/sopex/SOPEX/ChangeLog @@ -1,3 +1,8 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added linking path/dependency to NGMail + (v2.0.5) + 2005-08-17 Helge Hess * GNUmakefile.preamble: fixed install-dir (/Library/Frameworks) diff --git a/sopex/SOPEX/GNUmakefile.preamble b/sopex/SOPEX/GNUmakefile.preamble index 874f80fe..f808935a 100644 --- a/sopex/SOPEX/GNUmakefile.preamble +++ b/sopex/SOPEX/GNUmakefile.preamble @@ -7,6 +7,7 @@ SOPEX_LIBRARIES_DEPEND_UPON += \ -framework AppKit \ -framework NGObjWeb \ -framework NGMime \ + -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC @@ -15,6 +16,7 @@ SOPEX_LIBRARIES_DEPEND_UPON += \ DEP_DIRS = \ $(SOPE_ROOT)/sope-appserver/NGObjWeb \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-mime \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version index 5bba1bdf..1b35913e 100644 --- a/sopex/SOPEX/Version +++ b/sopex/SOPEX/Version @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=0 -SUBMINOR_VERSION=4 +SUBMINOR_VERSION=5 # v2.0.0 requires NGObjWeb v4.5.95 # v1.0.7 requires NGObjWeb v4.2.341 diff --git a/xmlrpc_call/ChangeLog b/xmlrpc_call/ChangeLog index bf4982d4..d9bcdefc 100644 --- a/xmlrpc_call/ChangeLog +++ b/xmlrpc_call/ChangeLog @@ -1,3 +1,7 @@ +2005-09-18 Helge Hess + + * GNUmakefile.preamble: added dependency to NGMail + 2005-08-27 Helge Hess * added an own common.h file, use PCH diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble index c656d106..2fb24c1d 100644 --- a/xmlrpc_call/GNUmakefile.preamble +++ b/xmlrpc_call/GNUmakefile.preamble @@ -28,6 +28,7 @@ else xmlrpc_call_TOOL_LIBS += \ -framework NGXmlRpc -framework NGObjWeb \ -framework NGMime \ + -framework NGMail \ -framework NGStreams -framework NGExtensions -framework EOControl \ -framework XmlRpc -framework DOM -framework SaxObjC endif @@ -38,6 +39,7 @@ endif DEP_DIRS = \ $(SOPE_ROOT)/sope-appserver/NGXmlRpc \ $(SOPE_ROOT)/sope-appserver/NGObjWeb \ + $(SOPE_ROOT)/sope-mime/NGMail \ $(SOPE_ROOT)/sope-mime \ $(SOPE_ROOT)/sope-core/NGStreams \ $(SOPE_ROOT)/sope-core/NGExtensions \ -- 2.39.2