work on osx frameworks

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

diff --git a/maintenance/rm-sope-on-osxlib.sh b/maintenance/rm-sope-on-osxlib.sh
index af0c8a2dbd14a42bca20c6f0f80d46bebcada965..59173641082adc98e9ffc67603994b0ac8988ac6 100755 (executable)
--- a/maintenance/rm-sope-on-osxlib.sh
+++ b/maintenance/rm-sope-on-osxlib.sh
@@ -17,6 +17,8 @@ GDLContentStore.framework
 
 NGLdap.framework
 NGMime.framework
+NGMail.framework
+NGImap4.framework
 NGiCal.framework
 
 NGObjWeb.framework
@@ -42,7 +44,7 @@ for i in $FW; do
       rm -rf "${FWPREFIX}/${i}"
       echo ".. done."
     else
-      echo "not installed: %{i}"
+      echo "not installed: ${i}"
     fi
   fi
 done

diff --git a/sope-appserver/README-OSX.txt b/sope-appserver/README-OSX.txt
index b87a7cbf86bceddbf3d8075a1765409b74d66052..7768fd2077eef1330a7ebfad7838d5d3991ca711 100644 (file)
--- a/sope-appserver/README-OSX.txt
+++ b/sope-appserver/README-OSX.txt
@@ -146,13 +146,13 @@ sope-appserver: 0xC3000000 - 0xC5FFFFFF
 0xC3200000 NGJavaScript [REMOVED]
 0xC3400000 NGHttp              [not available in gstep-make]
 0xC3700000 WebDAV              [not available in gstep-make]
-0xC3A00000 SoOFS               [not available in gstep-make]
+0xC3A00000 SoOFS
 0xC3D00000 NGXmlRpc
 0xC4000000 WEExtensions
 0xC4300000 WOExtensions
-0xC4600000 NGObjDOM
+0xC4600000 NGObjDOM    [REMOVED]
 0xC4900000 NGObjWeb
-0xC5AF0000 SoObjects [NEW]
+0xC5AF0000 SoObjects   [NEW]
 0xC5B00000 WOXML
 0xC5E00000 WEPrototype
 0xC5FF0000 SOPE

diff --git a/sope-core/ChangeLog b/sope-core/ChangeLog
index 04605d2a4066f1acbc3d64bc194ddb65460bac23..3483bb1f490fc574488da2cea9f7691a168a3d9c 100644 (file)
--- a/sope-core/ChangeLog
+++ b/sope-core/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * added sope-core umbrella framework
+
 2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
 
        * all makefiles: added flags to build only frameworks on MacOSX

diff --git a/sope-core/GNUmakefile b/sope-core/GNUmakefile
index 1f0416a77d5688c281f076869dd31cd29ca23be9..7f1da912d0e5fa133d0ef72556b31b57f9309505 100644 (file)
--- a/sope-core/GNUmakefile
+++ b/sope-core/GNUmakefile
@@ -16,4 +16,14 @@ ifeq ($(findstring darwin8, $(GNUSTEP_TARGET_OS)), darwin8)
 SUBPROJECTS += EOCoreData
 endif
 
+
+ifeq ($(frameworks),yes)
+include umbrella.make
+endif
+
+# project makefiles
+
 include $(GNUSTEP_MAKEFILES)/aggregate.make
+ifeq ($(frameworks),yes)
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif

diff --git a/sope-core/README-OSX.txt b/sope-core/README-OSX.txt
index 1e3eb2b704ae5b902bb838a33ded611aa6354f1c..32e148feb093b5a86ee064ae7ca4b79deeded36a 100644 (file)
--- a/sope-core/README-OSX.txt
+++ b/sope-core/README-OSX.txt
@@ -1,5 +1,3 @@
-# $Id$
-
 Building Notes
 ==============
 
@@ -76,19 +74,25 @@ see the "Direct Dependencies" of all "Wrapper Contents" targets in all SOPE
 related projects. At the time of this writing the complete list for SOPE
 consisted of the following:
 
-SxXML
+sope-xml
   SaxObjC.framework
   DOM.framework
   XmlRpc.framework
 
-SxCore
+sope-core
   EOControl.framework
   NGExtensions.framework
   NGStreams.framework
+
+sope-mime
   NGMime.framework
+  NGMail.framework
   NGImap4.framework
+
+sope-ldap
   NGLdap.framework
-  NGMail.framework
+
+sope-ical
   NGiCal.framework
 
 
@@ -127,7 +131,7 @@ Marcus M
 
 
 sope-core: 0xC1000000 - 0xC2FFFFFF
-===============================
+==================================
 
 0xC1000000 EOControl
 0xC1200000 NGExtensions

diff --git a/sope-core/umbrella.make b/sope-core/umbrella.make
new file mode 100644 (file)
index 0000000..cfbd5f8
--- /dev/null
+++ b/sope-core/umbrella.make
@@ -0,0 +1,42 @@
+# build umbrella framework for this subproject
+
+ifeq ($(frameworks),yes)
+
+FRAMEWORK_NAME = sope-core
+
+sope-core_C_FILES = dummy.c
+
+sope-core_UMBRELLA_FRAMEWORKS = \
+       SaxObjC DOM     \
+       EOControl       \
+       EOCoreData      \
+       NGExtensions    \
+       NGStreams       \
+
+sope-core_PREBIND_ADDR = 0xC0FF0000
+sope-core_INSTALL_DIR  = /Library/Frameworks/
+
+
+# generic (consolidate in gstep-make)
+$(FRAMEWORK_NAME)_LDFLAGS += \
+       $(foreach fwname,$($(FRAMEWORK_NAME)_UMBRELLA_FRAMEWORKS),\
+          -framework $(fwname)) \
+       $(foreach fwname,$($(FRAMEWORK_NAME)_UMBRELLA_FRAMEWORKS),\
+          -sub_umbrella $(fwname)) \
+       -headerpad_max_install_names
+
+ifneq ($($(FRAMEWORK_NAME)_PREBIND_ADDR),)
+$(FRAMEWORK_NAME)_LDFLAGS += -seg1addr $($(FRAMEWORK_NAME)_PREBIND_ADDR)
+endif
+
+
+# library/framework search pathes
+
+DEP_DIRS += \
+       EOControl EOCoreData NGExtensions NGStreams \
+       ../sope-xml/SaxObjC ../sope-xml/DOM
+
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+
+endif

diff --git a/sope-mime/ChangeLog b/sope-mime/ChangeLog
index 3b524172b84285d05131470b4a08941694dcc6ab..af0d407d87ddd66f8916465a2b30a151437c89c7 100644 (file)
--- a/sope-mime/ChangeLog
+++ b/sope-mime/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * build NGImap4 and NGMail frameworks (v4.5.233)
+
 2005-08-10  Helge Hess  <helge.hess@opengroupware.org>
 
        * added OSX framework support (v4.5.232)

diff --git a/sope-mime/GNUmakefile b/sope-mime/GNUmakefile
index 327e76c1fca803a8fe43034126280e41832d9899..48c792b677533a93a725688455589f3ad048bbd1 100644 (file)
--- a/sope-mime/GNUmakefile
+++ b/sope-mime/GNUmakefile
@@ -17,7 +17,12 @@ libNGMime_HEADER_FILES_INSTALL_DIR = /NGMime
 libNGMime_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 libNGMime_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
+ifneq ($(frameworks),yes)
 libNGMime_SUBPROJECTS = NGMime NGMail NGImap4
+else
+libNGMime_SUBPROJECTS = NGMime
+SUBPROJECTS = NGMail NGImap4
+endif
 
 
 # framework support
@@ -34,6 +39,7 @@ ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
+include $(GNUSTEP_MAKEFILES)/aggregate.make
 endif
 -include GNUmakefile.postamble
 -include fhs.make

diff --git a/sope-mime/GNUmakefile.preamble b/sope-mime/GNUmakefile.preamble
index b3247d8d03d406938193e0eaa5e4c77c84508509..5a0160868b496d70259429f224edd75e692c435f 100644 (file)
--- a/sope-mime/GNUmakefile.preamble
+++ b/sope-mime/GNUmakefile.preamble
@@ -1,5 +1,7 @@
 # compilation settings
 
+SOPE_ROOT=..
+
 ifeq ($(FOUNDATION_LIB),apple)
 NGMime_INSTALL_DIR = /Library/Frameworks/
 endif
@@ -11,9 +13,9 @@ ADDITIONAL_CPPFLAGS += -DLIBRARY_MAJOR_VERSION=${MAJOR_VERSION} \
 ADDITIONAL_CPPFLAGS += -Wall
 
 libNGMime_INCLUDE_DIRS += \
-       -I..    \
-       -I../sope-core/NGStreams/       \
-       -I../sope-core/NGExtensions/
+       -I$(SOPE_ROOT)  \
+       -I$(SOPE_ROOT)/sope-core/NGStreams/     \
+       -I$(SOPE_ROOT)/sope-core/NGExtensions/
 
 
 libNGMime_LIBRARIES_DEPEND_UPON += \
@@ -28,9 +30,9 @@ NGMime_LIBRARIES_DEPEND_UPON += \
 # library/framework search pathes
 
 DEP_DIRS = \
-       ../sope-core/EOControl ../sope-core/NGExtensions \
-       ../sope-core/NGStreams \
-       ../sope-xml/DOM ../sope-xml/SaxObjC
+       $(SOPE_ROOT)/sope-core/EOControl $(SOPE_ROOT)/sope-core/NGExtensions \
+       $(SOPE_ROOT)/sope-core/NGStreams \
+       $(SOPE_ROOT)/sope-xml/DOM $(SOPE_ROOT)/sope-xml/SaxObjC
 
 ifneq ($(frameworks),yes)
 ADDITIONAL_LIB_DIRS += \

diff --git a/sope-mime/NGImap4/GNUmakefile b/sope-mime/NGImap4/GNUmakefile
index f534d97a7dec6c0f95a4a3ef0eeb55dfdf461f1b..06aabb4bacce2912b69e6b022de8fb5b491d374d 100644 (file)
--- a/sope-mime/NGImap4/GNUmakefile
+++ b/sope-mime/NGImap4/GNUmakefile
@@ -2,8 +2,13 @@
 
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
+include ../Version
 
+ifneq ($(frameworks),yes)
 SUBPROJECT_NAME = NGImap4
+else
+FRAMEWORK_NAME = NGImap4
+endif
 
 NGImap4_HEADER_FILES_DIR         = .
 NGImap4_HEADER_FILES_INSTALL_DIR = /NGImap4
@@ -58,5 +63,9 @@ NGImap4_OBJC_FILES = \
        NGImap4ConnectionManager.m      \
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/subproject.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble

diff --git a/sope-mime/NGImap4/GNUmakefile.preamble b/sope-mime/NGImap4/GNUmakefile.preamble
index 1c1a2c0719bf55a02cdd4f92b125ca33dfdfbae1..53246c3875d78775a73f67e62739ed4f48b7ac65 100644 (file)
--- a/sope-mime/NGImap4/GNUmakefile.preamble
+++ b/sope-mime/NGImap4/GNUmakefile.preamble
@@ -1,5 +1,34 @@
+# compilation settings
+
+SOPE_ROOT=../..
+
+ifeq ($(FOUNDATION_LIB),apple)
+NGImap4_INSTALL_DIR = /Library/Frameworks/
+endif
+
 NGImap4_INCLUDE_DIRS += \
-       -I.. -I../..                    \
-       -I../../sope-core/NGStreams/    \
-       -I../../sope-core/NGExtensions/ \
-       -I../../sope-core/
+       -I.. -I$(SOPE_ROOT)                     \
+       -I$(SOPE_ROOT)/sope-core/NGStreams/     \
+       -I$(SOPE_ROOT)/sope-core/NGExtensions/  \
+       -I$(SOPE_ROOT)/sope-core/
+
+ifeq ($(frameworks),yes)
+NGImap4_LIBRARIES_DEPEND_UPON += \
+       -framework NGMime -framework NGMail \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework DOM -framework SaxObjC
+endif
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       .. \
+       ../NGMail \
+       $(SOPE_ROOT)/sope-core/EOControl $(SOPE_ROOT)/sope-core/NGExtensions \
+       $(SOPE_ROOT)/sope-core/NGStreams \
+       $(SOPE_ROOT)/sope-xml/DOM $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifeq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif

diff --git a/sope-mime/NGMail/GNUmakefile b/sope-mime/NGMail/GNUmakefile
index 1d1cd0411c88f0c1c0eb7d65e105cb2876d71961..46efe4897756a68fc6268fa93f6033bf7a44b455 100644 (file)
--- a/sope-mime/NGMail/GNUmakefile
+++ b/sope-mime/NGMail/GNUmakefile
@@ -5,7 +5,11 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
 
+ifneq ($(frameworks),yes)
 SUBPROJECT_NAME = NGMail
+else
+FRAMEWORK_NAME = NGMail
+endif
 
 NGMail_HEADER_FILES_DIR         = .
 NGMail_HEADER_FILES_INSTALL_DIR = /NGMail
@@ -49,5 +53,9 @@ NGMail_OBJC_FILES = \
        NGMailBase64Encoding.m  \
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/subproject.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 -include GNUmakefile.postamble

diff --git a/sope-mime/NGMail/GNUmakefile.preamble b/sope-mime/NGMail/GNUmakefile.preamble
index b139c43aba85ca957b7abc2341650bee8e6d1409..f573542030f82339418538c48f582ce5f58f3ede 100644 (file)
--- a/sope-mime/NGMail/GNUmakefile.preamble
+++ b/sope-mime/NGMail/GNUmakefile.preamble
@@ -1,5 +1,33 @@
+# compilation settings
+
+SOPE_ROOT=../..
+
+ifeq ($(FOUNDATION_LIB),apple)
+NGMail_INSTALL_DIR = /Library/Frameworks/
+endif
+
 NGMail_INCLUDE_DIRS += \
-       -I.. -I../..                    \
-       -I../../sope-core/NGStreams/    \
-       -I../../sope-core/NGExtensions/ \
-       -I../../sope-core/
+       -I.. -I$(SOPE_ROOT)                     \
+       -I$(SOPE_ROOT)/sope-core/NGStreams/     \
+       -I$(SOPE_ROOT)/sope-core/NGExtensions/  \
+       -I$(SOPE_ROOT)/sope-core/
+
+ifeq ($(frameworks),yes)
+NGMail_LIBRARIES_DEPEND_UPON += \
+       -framework NGMime \
+       -framework NGStreams -framework NGExtensions -framework EOControl \
+       -framework DOM -framework SaxObjC
+endif
+
+# library/framework search pathes
+
+DEP_DIRS = \
+       .. \
+       $(SOPE_ROOT)/sope-core/EOControl $(SOPE_ROOT)/sope-core/NGExtensions \
+       $(SOPE_ROOT)/sope-core/NGStreams \
+       $(SOPE_ROOT)/sope-xml/DOM $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifeq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+endif

diff --git a/sope-mime/Version b/sope-mime/Version
index 2976429770c4763474c95c122602364f427432b4..2a86e764a1158bddd7c92ef6f77df8976da91092 100644 (file)
--- a/sope-mime/Version
+++ b/sope-mime/Version
@@ -2,7 +2,7 @@
 
 MAJOR_VERSION:=4
 MINOR_VERSION:=5
-SUBMINOR_VERSION:=232
+SUBMINOR_VERSION:=233
 
 # v4.5.214 requires libNGExtensions v4.5.146
 # v4.2.149 requires libNGStreams    v4.2.34

diff --git a/xmlrpc_call/GNUmakefile.preamble b/xmlrpc_call/GNUmakefile.preamble
index beea0e757da226a24e3eab529d120e15b97f8c5d..c656d10603ef6951a6f3e8fb965e95214a3b78ff 100644 (file)
--- a/xmlrpc_call/GNUmakefile.preamble
+++ b/xmlrpc_call/GNUmakefile.preamble
@@ -38,7 +38,7 @@ endif
 DEP_DIRS = \
        $(SOPE_ROOT)/sope-appserver/NGXmlRpc    \
        $(SOPE_ROOT)/sope-appserver/NGObjWeb    \
-       $(SOPE_ROOT)/sope-mime/NGMime           \
+       $(SOPE_ROOT)/sope-mime                  \
        $(SOPE_ROOT)/sope-core/NGStreams        \
        $(SOPE_ROOT)/sope-core/NGExtensions     \
        $(SOPE_ROOT)/sope-core/EOControl        \