fixed some makefile in OCS

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

diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog
index b9a53300d22a456d70aa537c4a28f268022593db..81d3be3a640b583545bdb5ce50575ba2cdd22f2a 100644 (file)
--- a/OGoContentStore/ChangeLog
+++ b/OGoContentStore/ChangeLog
@@ -1,24 +1,28 @@
+2004-08-25  Helge Hess  <helge.hess@skyrix.com>
+       
+       * GNUmakefile: automatically install OCSTypeModels (v0.9.4)
+       
 2004-08-15  Helge Hess  <helge.hess@skyrix.com>
-
+       
        * OCSFolder.m: added content deletion (v0.9.3)
-
+       
        * OCSFolder.m: added sanity check to store method (v0.9.2)
-
+       
 2004-08-14  Helge Hess  <helge.hess@skyrix.com>
-
+       
        * v0.9.1
-
+       
        * OCSiCalFieldExtractor.m: extract new quick fields: location, 
          partmails, sequence (does not yet handle allday and cycle due to
          NGiCal restrictions)
-
+       
        * appointment.ocs, sql/foldertablecreate-helge-privcal.psql, 
          sql/testapt-agenor-helge-privcal.psql, sql/appointment-create.psql:
          added quick fields: isallday, iscycle, location, partmails, sequence
-
+       
        * started ocs_recreatequick tool intended for recreating a quick table
          based on the content table of a folder
-
+       
 2004-07-20  Helge Hess  <helge.hess@opengroupware.org>
 
        * OCSChannelManager.m: fixed a bug in the channel GC which resulted

diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile
index f60c6f125f9c918477454d751fe1c547450514c2..e5e6ade88d796104e790d533b8b682b37292c583 100644 (file)
--- a/OGoContentStore/GNUmakefile
+++ b/OGoContentStore/GNUmakefile
@@ -6,6 +6,8 @@ include ./Version
 LIBRARY_NAME = libOGoContentStore
 TOOL_NAME = ocs_ls ocs_mkdir ocs_cat ocs_recreatequick
 
+TYPEMODELS_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/OCSTypeModels/
+
 libOGoContentStore_HEADER_FILES_DIR         = .
 libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore
 
@@ -36,6 +38,10 @@ libOGoContentStore_OBJC_FILES += \
        OCSFieldExtractor.m     \
        OCSiCalFieldExtractor.m \
 
+libOGoContentStore_TYPEMODELS += \
+       appointment.ocs \
+       contact.ocs     \
+
 ocs_ls_OBJC_FILES    += ocs_ls.m
 ocs_mkdir_OBJC_FILES += ocs_mkdir.m
 ocs_cat_OBJC_FILES   += ocs_cat.m

diff --git a/OGoContentStore/GNUmakefile.postamble b/OGoContentStore/GNUmakefile.postamble
new file mode 100644 (file)
index 0000000..834af22
--- /dev/null
+++ b/OGoContentStore/GNUmakefile.postamble
@@ -0,0 +1,15 @@
+# postprocessing
+
+$(TYPEMODELS_DIR) :
+       $(MKDIRS) $(TYPEMODELS_DIR)
+
+ocs-typemodels : $(TYPEMODELS_DIR) $(libOGoContentStore_TYPEMODELS)
+       @(if [ "$(libOGoContentStore_TYPEMODELS)" != "" ]; then \
+         echo "Copying type models into install path ..."; \
+          for ff in $(libOGoContentStore_TYPEMODELS); do \
+           cp $$ff $(TYPEMODELS_DIR)/$$ff; \
+          done; \
+       fi)
+
+after-install :: ocs-typemodels
+

diff --git a/OGoContentStore/Version b/OGoContentStore/Version
index 12dfa9a87c97d73cc7fe3fdd4fcc3df9b638150a..36cb3fd6ce87d039dbab4482cd05fec04d27eb3d 100644 (file)
--- a/OGoContentStore/Version
+++ b/OGoContentStore/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=0
 MINOR_VERSION=9
-SUBMINOR_VERSION:=3
+SUBMINOR_VERSION:=4

diff --git a/OGoContentStore/contact.ocs b/OGoContentStore/contact.ocs
new file mode 100644 (file)
index 0000000..fa794ed
--- /dev/null
+++ b/OGoContentStore/contact.ocs
@@ -0,0 +1,32 @@
+{
+  blobTablePattern  = "SOGo_$folderId$_blob";
+  quickTablePattern = "SOGo_$folderId$_quick";
+
+  fields = (
+    {
+      columnName = uid;
+      sqlType    = "VARCHAR(256)";
+      allowsNull = NO;
+    },
+    {
+      columnName = name;
+      sqlType    = "VARCHAR(1000)";
+      allowsNull = NO;
+    },
+    {
+      columnName = lastname;
+      sqlType    = "VARCHAR(1000)";
+      allowsNull = NO;
+    },
+    {
+      columnName = email;
+      sqlType    = "VARCHAR(1000)";
+      allowsNull = NO;
+    },
+    {
+      columnName = location;
+      sqlType    = "VARCHAR(256)";
+      allowsNull = YES;
+    },
+  );
+}

diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index 20d7db051dfd01472ee243ec6d2dd16911a05d64..8ee96db6c84f0840f6f72cd9299ce8ad63686930 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile.preamble
+++ b/SOGo/UI/Scheduler/GNUmakefile.preamble
@@ -21,7 +21,7 @@ SchedulerUI_LIB_DIRS +=                       \
        -L$(RELBUILD_DIR_libSOGoUI)     \
        -L$(RELBUILD_DIR_libSOGoLogic)
 
-SchedulerUI_BUNDLE_LIBS +=                             \
+SchedulerUI_BUNDLE_LIBS += \
        -lNGObjWeb -lNGScripting                        \
        -lNGMime -lNGStreams -lNGExtensions -lEOControl \
        -lXmlRpc -lDOM -lSaxObjC -lNGiCal               \