support for compiling against FHS SOPE

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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index ce9279f371b85f64d55b223bfea1c85430274b67..9e3f4287e1f6a0cd1751960a0899da91368bef38 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-10  Helge Hess  <helge.hess@skyrix.com>
+
+       * v0.9.9
+
+       * fixed some gcc warnings
+
+       * GNUmakefile.preamble: added pathes to compile against an FHS SOPE
+
+       * OCSiCalFieldExtractor.m: fixed type of sequence iCalEvent field
+
 2004-09-01  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * GNUmakefile: install type models into $(GNUSTEP_USER_ROOT) (v0.9.8)

diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index 6974d977d24603694c9196b9e2f50b55e74e9b22..2ef902195e51dac3a21e2f29f9466ffc41d03f4e 100644 (file)
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -18,7 +18,7 @@ ocs_recreatequick_TOOL_LIBS += $(OCS_TOOL_LIBS)
 
 ADDITIONAL_INCLUDE_DIRS += -I. -I..
 
-ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L/usr/local/lib -L/usr/lib
 
 ifeq ($(FOUNDATION_LIB),apple)
 libOGoContentStore_PREBIND_ADDR="0xC7700000"

diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m
index fefcebfe99b8e59b023d8989697f414aacf5d3e7..8225353c2a162fe9221c1d5d1d4d040e369ecfdb 100644 (file)
--- a/OGoContentStore/OCSiCalFieldExtractor.m
+++ b/OGoContentStore/OCSiCalFieldExtractor.m
@@ -66,7 +66,8 @@ static OCSiCalFieldExtractor *extractor = nil;
 - (NSMutableDictionary *)extractQuickFieldsFromEvent:(iCalEvent *)_event {
   NSMutableDictionary *row;
   NSCalendarDate *startDate, *endDate;
-  NSString       *uid, *title, *location, *sequence;
+  NSString       *uid, *title, *location;
+  NSNumber       *sequence;
   id participants, partmails;
   
   if (_event == nil)

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 88e369f4de056b8f2fa3039c581dee9801a226be..b99f57a4593b02a82d185a8ac1d44b77928d1cf7 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,6 +2,6 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=8
+SUBMINOR_VERSION:=9
 
 # v0.9.7 requires libGDLAccess v1.1.35

diff --git a/OGoContentStore/ocs_cat.m b/OGoContentStore/ocs_cat.m
index b2bf596968d111f617e291b68457c974a0d8933e..fde7f7314217ae20ec7efe681b58a21701fe32a9 100644 (file)
--- a/OGoContentStore/ocs_cat.m
+++ b/OGoContentStore/ocs_cat.m
@@ -11,7 +11,7 @@
   OCSFolderManager *folderManager;
 }
 
-+ (int)run;
++ (int)runWithArgs:(NSArray *)_args;
 - (int)run;
 
 @end
@@ -80,7 +80,7 @@
   
   return 0;
 }
-+ (int)run {
++ (int)runWithArgs:(NSArray *)_args {
   return [(Tool *)[[[self alloc] init] autorelease] run];
 }
 
@@ -95,7 +95,8 @@ int main(int argc, char **argv, char **env) {
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif
 
-  rc = [Tool run];
+  rc = [Tool runWithArgs:
+               [[NSProcessInfo processInfo] argumentsWithoutDefaults]];
   
   [pool release];
   return rc;

diff --git a/OGoContentStore/ocs_ls.m b/OGoContentStore/ocs_ls.m
index 51bd1c138e19ea8d09d4b667d5684177d1d3505e..7d08bfe0d0894f317bc1845640ac18a3d7f5918c 100644 (file)
--- a/OGoContentStore/ocs_ls.m
+++ b/OGoContentStore/ocs_ls.m
@@ -11,7 +11,7 @@
   OCSFolderManager *folderManager;
 }
 
-+ (int)run;
++ (int)runWithArgs:(NSArray *)_args;
 - (int)run;
 
 @end
@@ -92,7 +92,7 @@
   
   return 0;
 }
-+ (int)run {
++ (int)runWithArgs:(NSArray *)_args {
   return [(Tool *)[[[self alloc] init] autorelease] run];
 }
 
@@ -107,7 +107,8 @@ int main(int argc, char **argv, char **env) {
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif
 
-  rc = [Tool run];
+  rc = [Tool runWithArgs:
+               [[NSProcessInfo processInfo] argumentsWithoutDefaults]];
   
   [pool release];
   return rc;

diff --git a/OGoContentStore/ocs_mkdir.m b/OGoContentStore/ocs_mkdir.m
index 63eac15eef32dc89eb9d7f9b4e0828c0bf0f9b19..ec4fcb70974cf8767ea0ee86a9077493d28b8937 100644 (file)
--- a/OGoContentStore/ocs_mkdir.m
+++ b/OGoContentStore/ocs_mkdir.m
@@ -11,7 +11,7 @@
   OCSFolderManager *folderManager;
 }
 
-+ (int)run;
++ (int)runWithArgs:(NSArray *)_args;
 - (int)run;
 
 @end
@@ -84,7 +84,7 @@
   
   return 0;
 }
-+ (int)run {
++ (int)runWithArgs:(NSArray *)_args {
   return [(Tool *)[[[self alloc] init] autorelease] run];
 }
 
@@ -99,7 +99,8 @@ int main(int argc, char **argv, char **env) {
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif
 
-  rc = [Tool run];
+  rc = [Tool runWithArgs:
+               [[NSProcessInfo processInfo] argumentsWithoutDefaults]];
   
   [pool release];
   return rc;

diff --git a/OGoContentStore/ocs_recreatequick.m b/OGoContentStore/ocs_recreatequick.m
index 0175086f057474c9ab951331997c4eaad17aa574..7576935415d3c570a6c46955c5debbc0a85745b7 100644 (file)
--- a/OGoContentStore/ocs_recreatequick.m
+++ b/OGoContentStore/ocs_recreatequick.m
@@ -11,7 +11,7 @@
   OCSFolderManager *folderManager;
 }
 
-+ (int)run;
++ (int)runWithArgs:(NSArray *)_args;
 - (int)run;
 
 @end
@@ -38,7 +38,6 @@
 /* operation */
 
 - (int)runOnPath:(NSString *)_path {
-  NSException *error;
   OCSFolder   *folder;
   
   [self logWithFormat:@"update quick from store at path: '%@'", _path];
@@ -62,7 +61,6 @@
 
 - (int)run {
   NSEnumerator *e;
-  NSString *type;
   NSString *path;
   
   [self logWithFormat:@"manager: %@", self->folderManager];
@@ -81,7 +79,7 @@
   
   return 0;
 }
-+ (int)run {
++ (int)runWithArgs:(NSArray *)_args {
   return [(Tool *)[[[self alloc] init] autorelease] run];
 }
 
@@ -96,7 +94,8 @@ int main(int argc, char **argv, char **env) {
   [NSProcessInfo initializeWithArguments:argv count:argc environment:env];
 #endif
 
-  rc = [Tool run];
+  rc = [Tool runWithArgs:
+               [[NSProcessInfo processInfo] argumentsWithoutDefaults]];
   
   [pool release];
   return rc;