fixed some NGMail framework build issue

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1111 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index fa4a1ae3abcfc3fef5a6cefd2da548af35becdea..842a98b46f12ef6672e0dd9bb7861c332a6e5055 100644 (file)
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added missing linking path to NGMail (required
+         on OSX) (v4.5.201)
+
 2005-09-15  Helge Hess  <helge.hess@skyrix.com>
 
        * started WOxTalElemBuilder (v4.5.200)

diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble
index 94de68f238380f55ae1562180cf28653528ed7fc..631196816e8cc459a9bf10fe8b47a9cb00af2d36 100644 (file)
--- 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 84559a9d6e82f93724e4183a5644b9c9d027bba4..af29e83fd64e01c5e5bcc3836f6d3ab418083268 100644 (file)
--- 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 16c96dd239485d81452f7ce9e715a8210605d3d4..9a8640a1d522ad20d643492faef1efad97c9ebc8 100644 (file)
--- 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 f179d04aaa2972c6c5ceb170eee519e07022ab49..877abb239b4867e28a0d951912a5227c0155b04c 100644 (file)
--- a/sope-appserver/NGXmlRpc/ChangeLog
+++ b/sope-appserver/NGXmlRpc/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added dependency to NGMail (v4.5.13)
+
 2005-08-11  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 151780d17d23e3fcbe2ba3fdabe7ed8843ab717b..a45cebd8a9d141ef41a2f0d597b7ea1a813fad82 100644 (file)
--- 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 8124804373d676be64906a721553e0ae765a21a2..36c1074d67afe2bdaebb02aee0b2a2160f8b9d89 100644 (file)
--- 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 2f089c10172a11ce03736b6a8427491ee8a7d474..f2e52128bc589e718d8ccc1ad53741cdb7ff70aa 100644 (file)
--- a/sope-appserver/SoOFS/ChangeLog
+++ b/sope-appserver/SoOFS/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added dependency to NGMail (v4.5.19)
+
 2005-08-06  Helge Hess  <helge.hess@opengroupware.org>
 
        * OFSResourceManager.m, OFSFolderDataSource.m, OFSPropertyListObject.m:

diff --git a/sope-appserver/SoOFS/GNUmakefile.preamble b/sope-appserver/SoOFS/GNUmakefile.preamble
index f2c930b814eeba0bea0e4c8db540c4adb0e4eff8..5f36537b61bd2d02601d76f9a58de45c9cbf3b08 100644 (file)
--- 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 c5124e5be73d79dfb4c67752a53780a8cd7f4073..c2e3c03ef1b849dafac0567640504991588785f6 100644 (file)
--- 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 21b9674c8075384f76471f1dd90552bfc4d51e34..7df4832f51a545c67754d60e0b2f37c64a059f2d 100644 (file)
--- a/sope-appserver/WEExtensions/ChangeLog
+++ b/sope-appserver/WEExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added dependency to NGMail (v4.5.83)
+
 2005-09-09  Helge Hess  <helge.hess@skyrix.com>
 
        * WETableMatrixLabel.m: avoid an edge condition when the position

diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble
index 06bbda2a79c47f483143945a1964b13938c71859..083f82041e2a71d8de497e29e5ab9d7d4c770a42 100644 (file)
--- 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 392a00ce61cc32026dd8a35b3a6b37c11c37ec25..93adc04ee36b57fc6bdbe8b0a21f58d310f7faa5 100644 (file)
--- 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 fb30ed4bc9c362fef7eadb58bf48627c7a5dc708..f29ae1be2efeff4bbe76ff135f8791e4036d172c 100644 (file)
--- a/sope-appserver/WOExtensions/ChangeLog
+++ b/sope-appserver/WOExtensions/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added dependency to NGMail (v4.5.29)
+
 2005-08-25  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 877e4b466b505d7f3a0fa71bf85573bdbd1ff7c1..4ce3badc68ba905175a4ea970ba3f2cd94faed72 100644 (file)
--- 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 f1cf512dc7e77c748d39431ce5175c28406b7c17..6e9d7166447806aa8fc32f50284c854e2dd19397 100644 (file)
--- 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 576d5d2d7739a265b82750c451ffe457f5524de6..b2856c253445499a6f98296e8987bf5a503bced3 100644 (file)
--- a/sopex/SOPEX/ChangeLog
+++ b/sopex/SOPEX/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added linking path/dependency to NGMail
+         (v2.0.5)
+
 2005-08-17  Helge Hess  <helge.hess@opengroupware.org>
 
        * GNUmakefile.preamble: fixed install-dir (/Library/Frameworks)

diff --git a/sopex/SOPEX/GNUmakefile.preamble b/sopex/SOPEX/GNUmakefile.preamble
index 874f80fe7dadb004ca19133c80982b094c6e4d2f..f808935a7966f25022262832f6ceed559882c491 100644 (file)
--- 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 5bba1bdfea288c812401598cdd039715ae7d280e..1b35913ea4ce048632239734f3b57baae69b889d 100644 (file)
--- 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 bf4982d4ee40d5c074d698f5306391e36764de4b..d9bcdefc20c39049b270fef966a91a1611e4530b 100644 (file)
--- a/xmlrpc_call/ChangeLog
+++ b/xmlrpc_call/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-18  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: added dependency to NGMail
+
 2005-08-27  Helge Hess  <helge.hess@opengroupware.org>
 
        * added an own common.h file, use PCH

diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble
index c656d10603ef6951a6f3e8fb965e95214a3b78ff..2fb24c1d8694fda193f6855786481374fb135ed6 100644 (file)
--- 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     \