From 2cfa0dbe1db7c202fc3c1468933a5103e0e818b0 Mon Sep 17 00:00:00 2001 From: helge Date: Sat, 12 Feb 2005 15:52:24 +0000 Subject: [PATCH] improved files for ZideStore compilation added fhsbundle.make git-svn-id: http://svn.opengroupware.org/SOGo/trunk@545 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m | 2 +- SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m | 4 +-- SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m | 2 +- SOGo/SoObjects/Mailer/SOGoDraftsFolder.h | 2 +- SOGo/SoObjects/Mailer/SOGoMailAccount.h | 2 +- SOGo/SoObjects/Mailer/SOGoMailFolder.h | 2 +- SOGo/SoObjects/Mailer/SOGoMailObject.h | 2 +- SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m | 3 +- SOGo/SoObjects/common.make | 2 +- SOGo/UI/Mailer/UIxFilterList.m | 4 +-- SOGo/UI/Mailer/UIxMailEditor.m | 6 ++-- SOGo/UI/Mailer/UIxMailEditorAction.m | 8 ++--- SOGo/UI/Mailer/UIxMailEditorAttach.m | 2 +- SOGo/UI/Mailer/UIxMailForwardAction.m | 4 +-- SOGo/UI/Mailer/UIxMailListView.m | 4 +-- SOGo/UI/Mailer/UIxMailReplyAction.m | 4 +-- SOGo/UI/Mailer/UIxMailToolbar.m | 2 +- SOGo/UI/Mailer/UIxMailTree.m | 4 +-- SOGo/UI/Mailer/UIxSieveEditor.m | 2 +- SOGo/UI/SOGoUI/UIxComponent.m | 7 ++-- SOGo/fhsbundle.make | 35 +++++++++++++++++++ 21 files changed, 70 insertions(+), 33 deletions(-) create mode 100644 SOGo/fhsbundle.make diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m b/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m index 75943557..17012fd3 100644 --- a/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m +++ b/SOGo/Protocols/iCalHTTP/SOGoICalFileFetch.m @@ -28,7 +28,7 @@ @end #include "SOGoICalHTTPHandler.h" -#include +#include #include #include "common.h" diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m b/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m index 4be72e2e..42af8f06 100644 --- a/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m +++ b/SOGo/Protocols/iCalHTTP/SOGoICalFilePublish.m @@ -28,8 +28,8 @@ @end #include "SOGoICalHTTPHandler.h" -#include -#include +#include +#include #include #include #include diff --git a/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m b/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m index ccf3593f..c8178da9 100644 --- a/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m +++ b/SOGo/Protocols/iCalHTTP/SOGoICalHTTPHandler.m @@ -20,7 +20,7 @@ */ #include "SOGoICalHTTPHandler.h" -#include +#include #include "common.h" #include diff --git a/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h b/SOGo/SoObjects/Mailer/SOGoDraftsFolder.h index 45f7f7e0..982f28ef 100644 --- 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 +#include /* SOGoDraftsFolder diff --git a/SOGo/SoObjects/Mailer/SOGoMailAccount.h b/SOGo/SoObjects/Mailer/SOGoMailAccount.h index 1c3b4ae6..61ccc185 100644 --- 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 +#include /* SOGoMailAccount diff --git a/SOGo/SoObjects/Mailer/SOGoMailFolder.h b/SOGo/SoObjects/Mailer/SOGoMailFolder.h index ffdd06f6..cc7d34ab 100644 --- 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 +#include #import /* diff --git a/SOGo/SoObjects/Mailer/SOGoMailObject.h b/SOGo/SoObjects/Mailer/SOGoMailObject.h index d653b741..3b5a0549 100644 --- 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 +#include /* SOGoMailObject diff --git a/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m b/SOGo/SoObjects/SOGo/SOGoCustomGroupFolder.m index 1a79e25f..2f3b6ad1 100644 --- 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 947d9a0c..7187754f 100644 --- 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 08cb7831..2b9dfce9 100644 --- a/SOGo/UI/Mailer/UIxFilterList.m +++ b/SOGo/UI/Mailer/UIxFilterList.m @@ -37,8 +37,8 @@ @end #include "common.h" -#include -#include +#include +#include @implementation UIxFilterList diff --git a/SOGo/UI/Mailer/UIxMailEditor.m b/SOGo/UI/Mailer/UIxMailEditor.m index e7ac4f78..89dbeacd 100644 --- a/SOGo/UI/Mailer/UIxMailEditor.m +++ b/SOGo/UI/Mailer/UIxMailEditor.m @@ -42,9 +42,9 @@ @end -#include -#include -#include +#include +#include +#include #include #include #include "common.h" diff --git a/SOGo/UI/Mailer/UIxMailEditorAction.m b/SOGo/UI/Mailer/UIxMailEditorAction.m index 7bb19508..9cc8f2a0 100644 --- a/SOGo/UI/Mailer/UIxMailEditorAction.m +++ b/SOGo/UI/Mailer/UIxMailEditorAction.m @@ -21,10 +21,10 @@ #include "UIxMailEditorAction.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "common.h" @implementation UIxMailEditorAction diff --git a/SOGo/UI/Mailer/UIxMailEditorAttach.m b/SOGo/UI/Mailer/UIxMailEditorAttach.m index 900e78bc..3be38fe0 100644 --- a/SOGo/UI/Mailer/UIxMailEditorAttach.m +++ b/SOGo/UI/Mailer/UIxMailEditorAttach.m @@ -45,7 +45,7 @@ @end -#include +#include #include "common.h" @implementation UIxMailEditorAttach diff --git a/SOGo/UI/Mailer/UIxMailForwardAction.m b/SOGo/UI/Mailer/UIxMailForwardAction.m index 647f6194..9719f44c 100644 --- a/SOGo/UI/Mailer/UIxMailForwardAction.m +++ b/SOGo/UI/Mailer/UIxMailForwardAction.m @@ -24,8 +24,8 @@ @interface UIxMailForwardAction : UIxMailEditorAction @end -#include -#include +#include +#include #include "common.h" @implementation UIxMailForwardAction diff --git a/SOGo/UI/Mailer/UIxMailListView.m b/SOGo/UI/Mailer/UIxMailListView.m index 63365076..eac0fdc9 100644 --- a/SOGo/UI/Mailer/UIxMailListView.m +++ b/SOGo/UI/Mailer/UIxMailListView.m @@ -45,8 +45,8 @@ @end #include "common.h" -#include -#include +#include +#include @implementation UIxMailListView diff --git a/SOGo/UI/Mailer/UIxMailReplyAction.m b/SOGo/UI/Mailer/UIxMailReplyAction.m index 0b0b1dc7..cb00981f 100644 --- a/SOGo/UI/Mailer/UIxMailReplyAction.m +++ b/SOGo/UI/Mailer/UIxMailReplyAction.m @@ -24,8 +24,8 @@ @interface UIxMailReplyAction : UIxMailEditorAction @end -#include -#include +#include +#include #include #include #include "common.h" diff --git a/SOGo/UI/Mailer/UIxMailToolbar.m b/SOGo/UI/Mailer/UIxMailToolbar.m index ac56d416..4b217d36 100644 --- a/SOGo/UI/Mailer/UIxMailToolbar.m +++ b/SOGo/UI/Mailer/UIxMailToolbar.m @@ -32,7 +32,7 @@ } @end -#include +#include #include "common.h" #include diff --git a/SOGo/UI/Mailer/UIxMailTree.m b/SOGo/UI/Mailer/UIxMailTree.m index 45cb57c5..5284b414 100644 --- a/SOGo/UI/Mailer/UIxMailTree.m +++ b/SOGo/UI/Mailer/UIxMailTree.m @@ -29,8 +29,8 @@ @end #include "UIxMailTreeBlock.h" -#include -#include +#include +#include #include "common.h" #include #include diff --git a/SOGo/UI/Mailer/UIxSieveEditor.m b/SOGo/UI/Mailer/UIxSieveEditor.m index a9dd7021..ddd8ca9e 100644 --- a/SOGo/UI/Mailer/UIxSieveEditor.m +++ b/SOGo/UI/Mailer/UIxSieveEditor.m @@ -37,7 +37,7 @@ @end -#include +#include #include "common.h" @implementation UIxSieveEditor diff --git a/SOGo/UI/SOGoUI/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m index 42c3f4a4..87dac44c 100644 --- 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 index 00000000..1c4fbdc2 --- /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 -- 2.39.5