From d56c29714903f9c9a1c54d91933fa0e35ac0c9b2 Mon Sep 17 00:00:00 2001 From: znek Date: Wed, 30 Jun 2004 12:42:20 +0000 Subject: [PATCH] modified build process for SOGo git-svn-id: http://svn.opengroupware.org/SOGo/trunk@121 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/GNUmakefile | 3 ++- SOGo/UI/ChangeLog | 6 +++++- SOGo/UI/Common/GNUmakefile | 14 -------------- SOGo/UI/Common/GNUmakefile.preamble | 11 +++++------ SOGo/UI/GNUmakefile | 1 + SOGo/UI/SOGoUI/ChangeLog | 7 +++++++ SOGo/UI/SOGoUI/GNUmakefile | 20 ++++++++++++++++++++ SOGo/UI/SOGoUI/GNUmakefile.preamble | 9 +++++++++ SOGo/UI/{Common => SOGoUI}/UIxComponent.h | 0 SOGo/UI/{Common => SOGoUI}/UIxComponent.m | 0 SOGo/UI/SOGoUI/Version | 5 +++++ SOGo/UI/Scheduler/GNUmakefile | 5 ++++- SOGo/UI/Scheduler/GNUmakefile.preamble | 10 +++++----- 13 files changed, 63 insertions(+), 28 deletions(-) create mode 100644 SOGo/UI/SOGoUI/ChangeLog create mode 100644 SOGo/UI/SOGoUI/GNUmakefile create mode 100644 SOGo/UI/SOGoUI/GNUmakefile.preamble rename SOGo/UI/{Common => SOGoUI}/UIxComponent.h (100%) rename SOGo/UI/{Common => SOGoUI}/UIxComponent.m (100%) create mode 100644 SOGo/UI/SOGoUI/Version diff --git a/SOGo/GNUmakefile b/SOGo/GNUmakefile index 13f780ca..610d83fd 100644 --- a/SOGo/GNUmakefile +++ b/SOGo/GNUmakefile @@ -4,6 +4,7 @@ include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECTS = \ SoObjects \ - Main + Main \ + UI include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/SOGo/UI/ChangeLog b/SOGo/UI/ChangeLog index f8c8667d..a7cee783 100644 --- a/SOGo/UI/ChangeLog +++ b/SOGo/UI/ChangeLog @@ -1,4 +1,8 @@ -2004-06-30 Marcus Müller +2004-06-30 Marcus Mueller + + * SOGoUI: moved over from Common to ease build dependencies. + +2004-06-30 Marcus Mueller * Scheduler/UIxAppointmentEditor.m: improved -saveAction. Does everything in a complete manner now - except for saving which isn't diff --git a/SOGo/UI/Common/GNUmakefile b/SOGo/UI/Common/GNUmakefile index 3b50ba21..e00b3c3f 100644 --- a/SOGo/UI/Common/GNUmakefile +++ b/SOGo/UI/Common/GNUmakefile @@ -6,19 +6,6 @@ BUNDLE_NAME = CommonUI BUNDLE_EXTENSION = .SOGo BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo -LIBRARY_NAME = libSOGoUI - - -libSOGoUI_HEADER_FILES_DIR = . -libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI - -libSOGoUI_HEADER_FILES += \ - UIxComponent.h \ - -libSOGoUI_OBJC_FILES += \ - UIxComponent.m \ - - CommonUI_PRINCIPAL_CLASS = CommonUIProduct CommonUI_OBJC_FILES += \ @@ -69,6 +56,5 @@ CommonUI_RESOURCE_FILES += \ # make -include GNUmakefile.preamble -include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/SOGo/UI/Common/GNUmakefile.preamble b/SOGo/UI/Common/GNUmakefile.preamble index e76e480c..6d5a9d41 100644 --- a/SOGo/UI/Common/GNUmakefile.preamble +++ b/SOGo/UI/Common/GNUmakefile.preamble @@ -1,16 +1,15 @@ # $Id$ ifneq ($(GNUSTEP_BUILD_DIR),) - RELBUILD_DIR_libZideStoreCommonUI = $(GNUSTEP_OBJ_DIR) + RELBUILD_DIR_libSOGoUI = \ + $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) else - RELBUILD_DIR_libZideStoreCommonUI = $(GNUSTEP_OBJ_DIR) + RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) endif -libZideStoreCommonUI_LIBRARIES_DEPEND_UPON += -lNGObjWeb - -CommonUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI) +CommonUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI) CommonUI_BUNDLE_LIBS += \ -lNGObjWeb -lNGScripting \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ - -lXmlRpc -lDOM -lSaxObjC -lZideStoreCommonUI + -lXmlRpc -lDOM -lSaxObjC -lSOGoUI diff --git a/SOGo/UI/GNUmakefile b/SOGo/UI/GNUmakefile index 68855649..23d300c5 100644 --- a/SOGo/UI/GNUmakefile +++ b/SOGo/UI/GNUmakefile @@ -3,6 +3,7 @@ include $(GNUSTEP_MAKEFILES)/common.make SUBPROJECTS = \ + SOGoUI \ Common \ Scheduler \ diff --git a/SOGo/UI/SOGoUI/ChangeLog b/SOGo/UI/SOGoUI/ChangeLog new file mode 100644 index 00000000..50aaf591 --- /dev/null +++ b/SOGo/UI/SOGoUI/ChangeLog @@ -0,0 +1,7 @@ +2004-06-30 Helge Hess + + * product.plist: make categories on SOGoObject instead of SxFolder + + * GNUmakefile: patches for different build/runtime environment + + * created ChangeLog diff --git a/SOGo/UI/SOGoUI/GNUmakefile b/SOGo/UI/SOGoUI/GNUmakefile new file mode 100644 index 00000000..32fddf93 --- /dev/null +++ b/SOGo/UI/SOGoUI/GNUmakefile @@ -0,0 +1,20 @@ +# $Id$ + +include $(GNUSTEP_MAKEFILES)/common.make + +LIBRARY_NAME = libSOGoUI + +libSOGoUI_HEADER_FILES_DIR = . +libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI + +libSOGoUI_HEADER_FILES += \ + UIxComponent.h \ + +libSOGoUI_OBJC_FILES += \ + UIxComponent.m \ + +# make + +-include GNUmakefile.preamble +include $(GNUSTEP_MAKEFILES)/library.make +-include GNUmakefile.postamble diff --git a/SOGo/UI/SOGoUI/GNUmakefile.preamble b/SOGo/UI/SOGoUI/GNUmakefile.preamble new file mode 100644 index 00000000..136d5396 --- /dev/null +++ b/SOGo/UI/SOGoUI/GNUmakefile.preamble @@ -0,0 +1,9 @@ +# $Id$ + +ifneq ($(GNUSTEP_BUILD_DIR),) + RELBUILD_DIR_libSOGoCommonUI = $(GNUSTEP_OBJ_DIR) +else + RELBUILD_DIR_libSOGoCommonUI = $(GNUSTEP_OBJ_DIR) +endif + +libSOGoCommonUI_LIBRARIES_DEPEND_UPON += -lNGObjWeb diff --git a/SOGo/UI/Common/UIxComponent.h b/SOGo/UI/SOGoUI/UIxComponent.h similarity index 100% rename from SOGo/UI/Common/UIxComponent.h rename to SOGo/UI/SOGoUI/UIxComponent.h diff --git a/SOGo/UI/Common/UIxComponent.m b/SOGo/UI/SOGoUI/UIxComponent.m similarity index 100% rename from SOGo/UI/Common/UIxComponent.m rename to SOGo/UI/SOGoUI/UIxComponent.m diff --git a/SOGo/UI/SOGoUI/Version b/SOGo/UI/SOGoUI/Version new file mode 100644 index 00000000..f5832bdd --- /dev/null +++ b/SOGo/UI/SOGoUI/Version @@ -0,0 +1,5 @@ +# $Id$ + +SUBMINOR_VERSION:=1 + +# 1.1.0 requires NGObjWeb 4.2.202 diff --git a/SOGo/UI/Scheduler/GNUmakefile b/SOGo/UI/Scheduler/GNUmakefile index bc431e59..a354a777 100644 --- a/SOGo/UI/Scheduler/GNUmakefile +++ b/SOGo/UI/Scheduler/GNUmakefile @@ -1,4 +1,4 @@ -# $Id: GNUmakefile,v 1.4 2004/06/04 16:15:23 znek Exp $ +# $Id$ include $(GNUSTEP_MAKEFILES)/common.make @@ -46,6 +46,9 @@ SchedulerUI_RESOURCE_FILES += \ images/icon_apt_list.gif \ images/icon_apt_list_inactive.gif \ +ADDITIONAL_INCLUDE_DIRS += \ + -I.. + # make diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble index 23c9438a..a0b5a392 100644 --- a/SOGo/UI/Scheduler/GNUmakefile.preamble +++ b/SOGo/UI/Scheduler/GNUmakefile.preamble @@ -1,17 +1,17 @@ # $Id$ ifneq ($(GNUSTEP_BUILD_DIR),) - RELBUILD_DIR_libZideStoreCommonUI = \ - $(GNUSTEP_BUILD_DIR)/../Common/$(GNUSTEP_OBJ_DIR_NAME) + RELBUILD_DIR_libSOGoUI = \ + $(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME) else - RELBUILD_DIR_libZideStoreCommonUI = ../Common + RELBUILD_DIR_libSOGoUI = ../SOGoUI/$(GNUSTEP_OBJ_DIR) endif -SchedulerUI_LIB_DIRS += -L$(RELBUILD_DIR_libZideStoreCommonUI) +SchedulerUI_LIB_DIRS += -L$(RELBUILD_DIR_libSOGoUI) SchedulerUI_BUNDLE_LIBS += \ -lNGObjWeb -lNGScripting -lNGJavaScript -ljs \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC \ - -lSOGoLogic -lZideStoreCommonUI \ + -lSOGoLogic -lSOGoUI \ -lNGiCal -- 2.39.5