fixed install location of SOPEX

added a script to maintenance
added an umbrella to sope-xml

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

diff --git a/maintenance/ChangeLog b/maintenance/ChangeLog
index 6897a175c172886dbe304a458b4a2d77ad3b0f96..361176a669ee2094c3864ee3d4d4533fa79cc00e 100644 (file)
--- a/maintenance/ChangeLog
+++ b/maintenance/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * added rm-sope-on-osxlib.sh to delete all SOPE frameworks from
+         /Library/Frameworks on OSX
+
 2005-08-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * znek-fix-xcode-projects.sh: added EOCoreData

diff --git a/maintenance/rm-sope-on-osxlib.sh b/maintenance/rm-sope-on-osxlib.sh
new file mode 100755 (executable)
index 0000000..af0c8a2
--- /dev/null
+++ b/maintenance/rm-sope-on-osxlib.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+FWPREFIX="/Library/Frameworks"
+
+FW="
+SaxObjC.framework
+DOM.framework
+XmlRpc.framework
+
+EOControl.framework
+EOCoreData.framework
+NGExtensions.framework
+NGStreams.framework
+
+GDLAccess.framework
+GDLContentStore.framework
+
+NGLdap.framework
+NGMime.framework
+NGiCal.framework
+
+NGObjWeb.framework
+NGXmlRpc.framework
+WEExtensions.framework
+WOExtensions.framework
+WOXML.framework
+SoOFS.framework
+
+sope-xml.framework
+sope-core.framework
+sope-mime.framework
+sope-appserver.framework
+sope-ical.framework
+sope-ldap.framework
+sope-gdl1.framework
+"
+
+for i in $FW; do
+  if test "x$i" != "x"; then
+    if test -d "${FWPREFIX}/${i}"; then
+      echo -n "deleting $i .."
+      rm -rf "${FWPREFIX}/${i}"
+      echo ".. done."
+    else
+      echo "not installed: %{i}"
+    fi
+  fi
+done

diff --git a/sope-xml/GNUmakefile b/sope-xml/GNUmakefile
index 8d1aa82fc0cd377afd11668e66a88b820c1f6380..a8b58be58b8b005c2f8781fd6d195d5e5dd0a690 100644 (file)
--- a/sope-xml/GNUmakefile
+++ b/sope-xml/GNUmakefile
@@ -18,4 +18,14 @@ ifeq ($(HAS_LIBRARY_xml2),yes)
 SUBPROJECTS += libxmlSAXDriver
 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-xml/README-OSX.txt b/sope-xml/README-OSX.txt
index aae985fb517a43234741a1a5c08c1c565006fe93..3da098ce6cb73916e7720d154839704b90c7fe1b 100644 (file)
--- a/sope-xml/README-OSX.txt
+++ b/sope-xml/README-OSX.txt
@@ -73,7 +73,7 @@ see the "Direct Dependencies" of all "Wrapper Contents" targets in all SOPE
 related projects. At the time of this writing the complete list for SxXML
 consisted of the following:
 
-SxXML
+sope-xml.framework
   SaxObjC.framework
   DOM.framework
   XmlRpc.framework
@@ -112,11 +112,10 @@ Any questions and feedback regarding our use of this range should go to
 Marcus Müller <znek@mulle-kybernetik.com>.
 
 
-SxXML: 0xC0000000 - 0xC0FFFFFF
-==============================
+sope-xml: 0xC0000000 - 0xC0FFFFFF
+=================================
 
 0xC0000000 SaxObjC
 0xC0200000 DOM
 0xC0400000 XmlRpc
-0xC0FF0000 SxXML
-                   
\ No newline at end of file
+0xC0FF0000 sope-xml

diff --git a/sope-xml/SaxObjC/GNUmakefile.preamble b/sope-xml/SaxObjC/GNUmakefile.preamble
index eebe434b15c8d017fa2c2a11e2e70dd0aee94906..846c317ba5f8190cd1dec0dea8818d7d0b357716 100644 (file)
--- a/sope-xml/SaxObjC/GNUmakefile.preamble
+++ b/sope-xml/SaxObjC/GNUmakefile.preamble
@@ -29,11 +29,13 @@ xmln_INCLUDE_DIRS += -I..
 xmln_LIB_DIRS     += -L./$(GNUSTEP_OBJ_DIR)
 xmln_TOOL_LIBS    += -lSaxObjC
 
+
 # Apple
 
 ifeq ($(FOUNDATION_LIB),apple)
 libSaxObjC_PREBIND_ADDR="0xC0000000"
 libSaxObjC_LDFLAGS += -seg1addr $(libSaxObjC_PREBIND_ADDR)
+SaxObjC_LDFLAGS    += -seg1addr $(libSaxObjC_PREBIND_ADDR)
 endif
 
 ifeq ($(FOUNDATION_LIB),nx)

diff --git a/sope-xml/umbrella.make b/sope-xml/umbrella.make
new file mode 100644 (file)
index 0000000..a281ba7
--- /dev/null
+++ b/sope-xml/umbrella.make
@@ -0,0 +1,35 @@
+# build umbrella framework for this subproject
+
+ifeq ($(frameworks),yes)
+
+FRAMEWORK_NAME = sope-xml
+
+sope-xml_C_FILES = dummy.c
+
+sope-xml_UMBRELLA_FRAMEWORKS = \
+       SaxObjC \
+       DOM     \
+       XmlRpc
+
+sope-xml_PREBIND_ADDR = 0xC0FF0000
+sope-xml_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 \
+       -seg1addr $($(FRAMEWORK_NAME)_PREBIND_ADDR)
+
+
+# library/framework search pathes
+
+DEP_DIRS += SaxObjC DOM XmlRpc
+
+ADDITIONAL_LIB_DIRS += \
+       $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
+
+endif

diff --git a/sopex/SOPEX/ChangeLog b/sopex/SOPEX/ChangeLog
index 40679768f7e67453dd2375d77d8183959ed74de5..576d5d2d7739a265b82750c451ffe457f5524de6 100644 (file)
--- a/sopex/SOPEX/ChangeLog
+++ b/sopex/SOPEX/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble: fixed install-dir (/Library/Frameworks)
+         (v2.0.4)
+
 2005-08-16  Helge Hess  <helge.hess@opengroupware.org>
 
        * v2.0.3

diff --git a/sopex/SOPEX/GNUmakefile.preamble b/sopex/SOPEX/GNUmakefile.preamble
index 874f80fe7dadb004ca19133c80982b094c6e4d2f..5e1f4ee8bb915898bd7c1bce5d1e8a16d1b331b9 100644 (file)
--- a/sopex/SOPEX/GNUmakefile.preamble
+++ b/sopex/SOPEX/GNUmakefile.preamble
@@ -2,6 +2,8 @@
 
 SOPE_ROOT=../..
 
+SOPEX_INSTALL_DIR = /Library/Frameworks/
+
 SOPEX_LIBRARIES_DEPEND_UPON += \
        -framework WebKit       \
        -framework AppKit       \

diff --git a/sopex/SOPEX/Version b/sopex/SOPEX/Version
index 4ebde3212f6a348e73a9b070eb2f0f4bb24b385a..5bba1bdfea288c812401598cdd039715ae7d280e 100644 (file)
--- a/sopex/SOPEX/Version
+++ b/sopex/SOPEX/Version
@@ -7,7 +7,7 @@
 
 MAJOR_VERSION=2
 MINOR_VERSION=0
-SUBMINOR_VERSION=3
+SUBMINOR_VERSION=4
 
 # v2.0.0 requires NGObjWeb v4.5.95
 # v1.0.7 requires NGObjWeb v4.2.341