modified build process for SOGo

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

diff --git a/SOGo/GNUmakefile b/SOGo/GNUmakefile
index 13f780ca3597d2779bb639c6caad42215c81c0ae..610d83fdfcbcd8beca87291f451a4a53807b4894 100644 (file)
--- 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 f8c8667dab03119b99a8e6ed7345735b040255a7..a7cee7830eba7ca9896728e46605dff34fa74bee 100644 (file)
--- a/SOGo/UI/ChangeLog
+++ b/SOGo/UI/ChangeLog
@@ -1,4 +1,8 @@
-2004-06-30  Marcus Müller  <znek@mulle-kybernetik.com>
+2004-06-30  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * SOGoUI: moved over from Common to ease build dependencies.
+
+2004-06-30  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * 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 3b50ba21aa6b7064b93e7330a221f8b9a7e6ffae..e00b3c3f8a2dd1127bf5f1e9460619bdfdb0bcaf 100644 (file)
--- 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 e76e480c05eb6620bc7723d1e68350677f15f7cd..6d5a9d41d3641b00884ec4f799fda19f66e185fb 100644 (file)
--- 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 688556495d5d2633e0913355bfc0e2dbd8122d6c..23d300c515cd126366c94c024b15b2ca822d7604 100644 (file)
--- 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 (file)
index 0000000..50aaf59
--- /dev/null
+++ b/SOGo/UI/SOGoUI/ChangeLog
@@ -0,0 +1,7 @@
+2004-06-30  Helge Hess  <helge.hess@opengroupware.org>
+
+       * 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 (file)
index 0000000..32fddf9
--- /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 (file)
index 0000000..136d539
--- /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 (file)
index 0000000..f5832bd
--- /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 bc431e59c20fda5181ce2f773d77cfe0a163588b..a354a777433397029ec0db2b2084d226a8ab0be3 100644 (file)
--- 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 23c9438a91153e090869b8ebbbd8e2f59226d347..a0b5a392e1b10720a96ac10a0487cb66993c22c8 100644 (file)
--- 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