improved files for ZideStore compilation

added fhsbundle.make

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@545 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m b/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m
index 759435579c17e487f75515da9d601bdc674d8163..17012fd33742127efa2467f4f5b863b47d19b857 100644 (file)
--- a/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m
+++ b/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m
@@ -28,7 +28,7 @@
 @end
 
 #include "SOGoICalHTTPHandler.h"
-#include <SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h>
+#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include <SOGoLogic/SOGoAppointment.h>
 #include "common.h"
 

diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m b/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m
index 4be72e2e45674b58d60f04535054223a061faf0c..42af8f06db933910444964b17e67c9d2c4e2bbf1 100644 (file)
--- a/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m
+++ b/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m
@@ -28,8 +28,8 @@
 @end
 
 #include "SOGoICalHTTPHandler.h"
-#include <SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h>
-#include <SOGo/SoObjects/Appointments/SOGoAppointmentObject.h>
+#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
+#include <SoObjects/Appointments/SOGoAppointmentObject.h>
 #include <SOGoLogic/SOGoAppointment.h>
 #include <NGiCal/NGiCal.h>
 #include <NGiCal/iCalRenderer.h>

diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m b/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m
index ccf3593fafe009a4c89490920c9ddcd5c82c6a33..c8178da9790dfb35749f1496a62d3fdbeb7c2d74 100644 (file)
--- a/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m
+++ b/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m
@@ -20,7 +20,7 @@
 */
 
 #include "SOGoICalHTTPHandler.h"
-#include <SOGo/SoObjects/Appointments/SOGoAppointmentFolder.h>
+#include <SoObjects/Appointments/SOGoAppointmentFolder.h>
 #include "common.h"
 #include <NGObjWeb/WOContext+SoObjects.h>
 

diff --git a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h
index 45f7f7e04146e02b9363f31885d2b238ed260813..982f28ef72b14d0f35cf6d71f3f7e7e1f95224ff 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h
+++ b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoDraftsFolder_H__
 #define __Mailer_SOGoDraftsFolder_H__
 
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
 
 /*
   SOGoDraftsFolder

diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccount.h b/SOGo/SoObjects/Mailer/SOGoMailAccount.h
index 1c3b4ae6bbd5094ca84b64f2e69e18584bb524b2..61ccc18540e41c58bfce14b9c846a635114f5171 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailAccount.h
+++ b/SOGo/SoObjects/Mailer/SOGoMailAccount.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailAccount_H__
 #define __Mailer_SOGoMailAccount_H__
 
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
 
 /*
   SOGoMailAccount

diff --git a/SOGo/SoObjects/Mailer/SOGoMailFolder.h b/SOGo/SoObjects/Mailer/SOGoMailFolder.h
index ffdd06f6558d9517f53225471da0e98ed8e8556d..cc7d34ab1a3acf24031da991e925a6742b8f34ab 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailFolder.h
+++ b/SOGo/SoObjects/Mailer/SOGoMailFolder.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailFolder_H__
 #define __Mailer_SOGoMailFolder_H__
 
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
 #import <Foundation/NSRange.h>
 
 /*

diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.h b/SOGo/SoObjects/Mailer/SOGoMailObject.h
index d653b741231465644902cdcb7034fadacab1c8bd..3b5a054985dd4f04703bccc6ecaae1ef3e22e1dd 100644 (file)
--- a/SOGo/SoObjects/Mailer/SOGoMailObject.h
+++ b/SOGo/SoObjects/Mailer/SOGoMailObject.h
@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailObject_H__
 #define __Mailer_SOGoMailObject_H__
 
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
 
 /*
   SOGoMailObject

diff --git a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
index 1a79e25f8a23b6c832a789043c94e010de228731..2f3b6ad1ca4d5bcc686b3f33a26211bd8323d587 100644 (file)
--- a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
+++ b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m
@@ -43,6 +43,7 @@ static NSString *SOGoUIDSeparator = @",";
 
 - (NSArray *)unescapeURLComponents:(NSArray *)_parts {
 #warning TODO: implement URL UID unescaping if necessary
+  // TODO: who calls this for what?
   // Note: remember URL encoding!
   return _parts;
 }
@@ -100,7 +101,7 @@ static NSString *SOGoUIDSeparator = @",";
     if (ms != nil) return ms;
   }
   
-#warning TODO: localize 'members' (UI component task?)
+  // TODO: localize 'members' (UI component task?)
   return [NSString stringWithFormat:@"Members: %d", count];
 }
 

diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make
index 947d9a0c65a0564fd552ce24a1c240c267257a5c..7187754fecf7a3b171ebdc4b8c72368e4e171a86 100644 (file)
--- a/SOGo/SoObjects/common.make
+++ b/SOGo/SoObjects/common.make
@@ -9,7 +9,7 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I.. \
-       -I../../..
+       -I../..
 
 ADDITIONAL_LIB_DIRS += \
        -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \

diff --git a/SOGo/UI/Mailer/UIxFilterList.m b/SOGo/UI/Mailer/UIxFilterList.m
index 08cb7831b0fbc7fb5dd3f5fbfb602530fc94f8e8..2b9dfce9b76e18c6dfa59c240fdfa50a0c2576b1 100644 (file)
--- a/SOGo/UI/Mailer/UIxFilterList.m
+++ b/SOGo/UI/Mailer/UIxFilterList.m
@@ -37,8 +37,8 @@
 @end
 
 #include "common.h"
-#include <SOGo/SoObjects/Mailer/SOGoMailFolder.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailObject.h>
+#include <SoObjects/Mailer/SOGoMailFolder.h>
+#include <SoObjects/Mailer/SOGoMailObject.h>
 
 @implementation UIxFilterList
 

diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m
index e7ac4f78d24568914389bc1f9cd16b80cb6aaf94..89dbeacd5bde2000a6aa8eb395eed7069ba17bec 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditor.m
+++ b/SOGo/UI/Mailer/UIxMailEditor.m
@@ -42,9 +42,9 @@
 
 @end
 
-#include <SOGo/SoObjects/Mailer/SOGoDraftObject.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailFolder.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailAccount.h>
+#include <SoObjects/Mailer/SOGoDraftObject.h>
+#include <SoObjects/Mailer/SOGoMailFolder.h>
+#include <SoObjects/Mailer/SOGoMailAccount.h>
 #include <NGMail/NGMimeMessage.h>
 #include <NGMail/NGMimeMessageGenerator.h>
 #include "common.h"

diff --git a/SOGo/UI/Mailer/UIxMailEditorAction.m b/SOGo/UI/Mailer/UIxMailEditorAction.m
index 7bb19508a20bbb4139bceca9113f5353e4cf8bd8..9cc8f2a0c4739e72a27ef9a01c5e84743abb0223 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditorAction.m
+++ b/SOGo/UI/Mailer/UIxMailEditorAction.m
@@ -21,10 +21,10 @@
 
 #include "UIxMailEditorAction.h"
 
-#include <SOGo/SoObjects/Mailer/SOGoDraftsFolder.h>
-#include <SOGo/SoObjects/Mailer/SOGoDraftObject.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailAccount.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailObject.h>
+#include <SoObjects/Mailer/SOGoDraftsFolder.h>
+#include <SoObjects/Mailer/SOGoDraftObject.h>
+#include <SoObjects/Mailer/SOGoMailAccount.h>
+#include <SoObjects/Mailer/SOGoMailObject.h>
 #include "common.h"
 
 @implementation UIxMailEditorAction

diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/Mailer/UIxMailEditorAttach.m
index 900e78bc4b0019cb91601cdfedfa3fe925da7025..3be38fe0333ab8455cae42946fed63d3d7c1abcd 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailEditorAttach.m
+++ b/SOGo/UI/Mailer/UIxMailEditorAttach.m
@@ -45,7 +45,7 @@
 
 @end
 
-#include <SOGo/SoObjects/Mailer/SOGoDraftObject.h>
+#include <SoObjects/Mailer/SOGoDraftObject.h>
 #include "common.h"
 
 @implementation UIxMailEditorAttach

diff --git a/SOGo/UI/Mailer/UIxMailForwardAction.m b/SOGo/UI/Mailer/UIxMailForwardAction.m
index 647f6194e785d50d3027abeb5ff4e07b2ca4014e..9719f44cf24aa1fc72ff65a35292ccddd93fc1d9 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailForwardAction.m
+++ b/SOGo/UI/Mailer/UIxMailForwardAction.m
@@ -24,8 +24,8 @@
 @interface UIxMailForwardAction : UIxMailEditorAction
 @end
 
-#include <SOGo/SoObjects/Mailer/SOGoMailObject.h>
-#include <SOGo/SoObjects/Mailer/SOGoDraftObject.h>
+#include <SoObjects/Mailer/SOGoMailObject.h>
+#include <SoObjects/Mailer/SOGoDraftObject.h>
 #include "common.h"
 
 @implementation UIxMailForwardAction

diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m
index 63365076b0fd465930d6a81180ad05fd6b138cb3..eac0fdc9fe7ba2e92d31e6631dbb3203236293e1 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.m
+++ b/SOGo/UI/Mailer/UIxMailListView.m
@@ -45,8 +45,8 @@
 @end
 
 #include "common.h"
-#include <SOGo/SoObjects/Mailer/SOGoMailFolder.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailObject.h>
+#include <SoObjects/Mailer/SOGoMailFolder.h>
+#include <SoObjects/Mailer/SOGoMailObject.h>
 
 @implementation UIxMailListView
 

diff --git a/SOGo/UI/Mailer/UIxMailReplyAction.m b/SOGo/UI/Mailer/UIxMailReplyAction.m
index 0b0b1dc70ca09fe9cc63995d81246d612dfe5a85..cb00981f3ef3220fc2dddf8ff7f4e5d609e5c947 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailReplyAction.m
+++ b/SOGo/UI/Mailer/UIxMailReplyAction.m
@@ -24,8 +24,8 @@
 @interface UIxMailReplyAction : UIxMailEditorAction
 @end
 
-#include <SOGo/SoObjects/Mailer/SOGoMailObject.h>
-#include <SOGo/SoObjects/Mailer/SOGoDraftObject.h>
+#include <SoObjects/Mailer/SOGoMailObject.h>
+#include <SoObjects/Mailer/SOGoDraftObject.h>
 #include <NGImap4/NGImap4EnvelopeAddress.h>
 #include <NGImap4/NGImap4Envelope.h>
 #include "common.h"

diff --git a/SOGo/UI/Mailer/UIxMailToolbar.m b/SOGo/UI/Mailer/UIxMailToolbar.m
index ac56d416102618b7b8c899372be3e615e745b2de..4b217d367da11ca117f9016b4286b8c4dd757695 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailToolbar.m
+++ b/SOGo/UI/Mailer/UIxMailToolbar.m
@@ -32,7 +32,7 @@
 }
 @end
 
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
 #include "common.h"
 #include <NGObjWeb/SoComponent.h>
 

diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/Mailer/UIxMailTree.m
index 45cb57c580cb98379d758c3c5b21a776995a5123..5284b4142eb0d8268e93836a22fc71cf0a08eb50 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailTree.m
+++ b/SOGo/UI/Mailer/UIxMailTree.m
@@ -29,8 +29,8 @@
 @end
 
 #include "UIxMailTreeBlock.h"
-#include <SOGo/SoObjects/Mailer/SOGoMailBaseObject.h>
-#include <SOGo/SoObjects/Mailer/SOGoMailAccount.h>
+#include <SoObjects/Mailer/SOGoMailBaseObject.h>
+#include <SoObjects/Mailer/SOGoMailAccount.h>
 #include "common.h"
 #include <NGObjWeb/SoComponent.h>
 #include <NGObjWeb/SoObject+SoDAV.h>

diff --git a/SOGo/UI/Mailer/UIxSieveEditor.m b/SOGo/UI/Mailer/UIxSieveEditor.m
index a9dd7021af4c047cec51fb95036486c0c7743cea..ddd8ca9e96ede9ebc75daadffd91099ea4ac77bf 100644 (file)
--- a/SOGo/UI/Mailer/UIxSieveEditor.m
+++ b/SOGo/UI/Mailer/UIxSieveEditor.m
@@ -37,7 +37,7 @@
 
 @end
 
-#include <SOGo/SoObjects/Sieve/SOGoSieveScriptObject.h>
+#include <SoObjects/Sieve/SOGoSieveScriptObject.h>
 #include "common.h"
 
 @implementation UIxSieveEditor

diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m
index 42c3f4a4d7af78265ad03a0eec85857a3894285c..87dac44c891b90ad505dd06c2574b64d8f3a10d6 100644 (file)
--- a/SOGo/UI/SOGoUI/UIxComponent.m
+++ b/SOGo/UI/SOGoUI/UIxComponent.m
@@ -313,11 +313,12 @@ static BOOL uixDebugEnabled = NO;
 
 - (NSString *)shortUserNameForDisplay {
   // TODO: better use a SoUser formatter?
+  // TODO: who calls that?
   NSString *s;
   NSRange  r;
-
-#warning TODO: USE USER MANAGER INSTEAD!
-
+  
+  // TODO: USE USER MANAGER INSTEAD!
+  
   s = [[self user] login];
   if ([s length] < 10)
     return s;

diff --git a/SOGo/fhsbundle.make b/SOGo/fhsbundle.make
new file mode 100644 (file)
index 0000000..1c4fbdc
--- /dev/null
+++ b/SOGo/fhsbundle.make
@@ -0,0 +1,35 @@
+# 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_SOGOD_DIR=$(FHS_LIB_DIR)sogod-$(MAJOR_VERSION).$(MINOR_VERSION)/
+
+#NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/"
+#NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)"
+NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)"
+
+
+fhs-sogod-dirs ::
+       $(MKDIRS) $(FHS_SOGOD_DIR)
+
+move-bundles-to-fhs :: fhs-sogod-dirs
+       @echo "moving bundles $(BUNDLE_INSTALL_DIR) to $(FHS_WEBUI_DIR) .."
+       for i in $(BUNDLE_NAME); do \
+          j="$(FHS_WEBUI_DIR)/$${i}$(BUNDLE_EXTENSION)"; \
+         if test -d $$j; then rm -r $$j; fi; \
+         (cd $(BUNDLE_INSTALL_DIR); \
+           $(TAR) chf - --exclude=CVS --exclude=.svn --to-stdout \
+            "$${i}$(BUNDLE_EXTENSION)") | \
+          (cd $(FHS_WEBUI_DIR); $(TAR) xf -); \
+         rm -rf "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)";\
+       done
+
+#        mv "$(BUNDLE_INSTALL_DIR)/$${i}$(BUNDLE_EXTENSION)" $$j; \
+
+move-to-fhs :: move-bundles-to-fhs
+
+after-install :: move-to-fhs
+
+endif