From 502a4821b7c984f53cad8f689f43931a0fd97412 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 25 Aug 2004 10:26:02 +0000 Subject: [PATCH] fixed some makefile in OCS git-svn-id: http://svn.opengroupware.org/SOGo/trunk@265 d1b88da0-ebda-0310-925b-ed51d893ca5b --- OGoContentStore/ChangeLog | 20 +++++++++------- OGoContentStore/GNUmakefile | 6 +++++ OGoContentStore/GNUmakefile.postamble | 15 ++++++++++++ OGoContentStore/Version | 2 +- OGoContentStore/contact.ocs | 32 ++++++++++++++++++++++++++ SOGo/UI/Scheduler/GNUmakefile.preamble | 2 +- 6 files changed, 67 insertions(+), 10 deletions(-) create mode 100644 OGoContentStore/GNUmakefile.postamble create mode 100644 OGoContentStore/contact.ocs diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog index b9a53300..81d3be3a 100644 --- a/OGoContentStore/ChangeLog +++ b/OGoContentStore/ChangeLog @@ -1,24 +1,28 @@ +2004-08-25 Helge Hess + + * GNUmakefile: automatically install OCSTypeModels (v0.9.4) + 2004-08-15 Helge Hess - + * OCSFolder.m: added content deletion (v0.9.3) - + * OCSFolder.m: added sanity check to store method (v0.9.2) - + 2004-08-14 Helge Hess - + * 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 * OCSChannelManager.m: fixed a bug in the channel GC which resulted diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index f60c6f12..e5e6ade8 100644 --- 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 index 00000000..834af222 --- /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 12dfa9a8..36cb3fd6 100644 --- 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 index 00000000..fa794eda --- /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 20d7db05..8ee96db6 100644 --- 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 \ -- 2.39.5