From 79f256c31f1516694bb089c470433c92254a06bb Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 16 Aug 2005 11:37:07 +0000 Subject: [PATCH] added OSX framework support git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1032 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ical/NGiCal/ChangeLog | 5 ++ sope-ical/NGiCal/GNUmakefile | 19 +++++++ sope-ical/NGiCal/GNUmakefile.preamble | 51 +++++++++++-------- sope-ical/NGiCal/Version | 2 +- sope-ical/samples/ChangeLog | 4 ++ sope-ical/samples/GNUmakefile | 5 -- sope-ical/samples/GNUmakefile.preamble | 46 ++++++++++++++--- sope-ical/versitSaxDriver/ChangeLog | 4 ++ .../versitSaxDriver/GNUmakefile.preamble | 28 ++++++++-- sope-ical/versitSaxDriver/VSSaxDriver.m | 38 +++++++------- sope-ical/versitSaxDriver/Version | 2 +- 11 files changed, 144 insertions(+), 60 deletions(-) diff --git a/sope-ical/NGiCal/ChangeLog b/sope-ical/NGiCal/ChangeLog index 51097b28..c8502f93 100644 --- a/sope-ical/NGiCal/ChangeLog +++ b/sope-ical/NGiCal/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Helge Hess + + * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation + (v4.5.60) + 2005-08-06 Helge Hess * iCalCalendar.m, NGVCardName.m: fixed gcc 4.0 warnings (v4.5.59) diff --git a/sope-ical/NGiCal/GNUmakefile b/sope-ical/NGiCal/GNUmakefile index fbbf97af..60105b6a 100644 --- a/sope-ical/NGiCal/GNUmakefile +++ b/sope-ical/NGiCal/GNUmakefile @@ -4,7 +4,12 @@ include $(GNUSTEP_MAKEFILES)/common.make include ./Version +ifneq ($(frameworks),yes) LIBRARY_NAME = libNGiCal +else +FRAMEWORK_NAME = NGiCal +endif + libNGiCal_HEADER_FILES_DIR = . libNGiCal_HEADER_FILES_INSTALL_DIR = /NGiCal @@ -85,7 +90,21 @@ libNGiCal_OBJC_FILES = \ # IcalElements.m # IcalResponse.m + +# framework support + +NGiCal_HEADER_FILES = $(libNGiCal_HEADER_FILES) +NGiCal_OBJC_FILES = $(libNGiCal_OBJC_FILES) +NGiCal_SUBPROJECTS = $(libNGiCal_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif -include GNUmakefile.postamble -include fhs.make diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble index 7a0e15e7..1d56597a 100644 --- a/sope-ical/NGiCal/GNUmakefile.preamble +++ b/sope-ical/NGiCal/GNUmakefile.preamble @@ -1,5 +1,7 @@ # compilation settings +SOPE_ROOT=../.. + ADDITIONAL_CPPFLAGS += \ -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION) \ @@ -8,37 +10,42 @@ ADDITIONAL_CPPFLAGS += \ ADDITIONAL_INCLUDE_DIRS += \ -I. -I.. \ - -I../../sope-core/NGExtensions/ \ - -I../../sope-core \ - -I../../sope-xml + -I$(SOPE_ROOT)/sope-core/NGExtensions/ \ + -I$(SOPE_ROOT)/sope-core \ + -I$(SOPE_ROOT)/sope-xml + + +# dependencies libNGiCal_LIBRARIES_DEPEND_UPON += \ -lNGExtensions \ -lEOControl \ + -lDOM \ -lSaxObjC -libNGiCal_LIBRARIES_DEPEND_UPON += \ - -lDOM - -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml - -libNGiCal_LIB_DIRS += \ - -L$(GNUSTEP_OBJ_DIR) \ - -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) +NGiCal_LIBRARIES_DEPEND_UPON += \ + -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC + + +# library/framework search pathes + +DEP_DIRS = \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else -libNGiCal_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib # Apple diff --git a/sope-ical/NGiCal/Version b/sope-ical/NGiCal/Version index 2b4f99b5..a5b5ba42 100644 --- a/sope-ical/NGiCal/Version +++ b/sope-ical/NGiCal/Version @@ -2,7 +2,7 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=59 +SUBMINOR_VERSION:=60 # v4.5.40 requires NGExtensions v4.5.145 # v4.5.37 requires NGExtensions v4.5.140 diff --git a/sope-ical/samples/ChangeLog b/sope-ical/samples/ChangeLog index 09fb425f..1ca2105e 100644 --- a/sope-ical/samples/ChangeLog +++ b/sope-ical/samples/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * link tools against OSX frameworks if configured so + 2005-05-06 Helge Hess * renamed ical3.m to icalds.m, ical2.m to icalparsetest diff --git a/sope-ical/samples/GNUmakefile b/sope-ical/samples/GNUmakefile index c3a3fbef..61b8e8a5 100644 --- a/sope-ical/samples/GNUmakefile +++ b/sope-ical/samples/GNUmakefile @@ -10,11 +10,6 @@ icalds_OBJC_FILES = icalds.m vcf2xml_OBJC_FILES = vcf2xml.m vcfparsetest_OBJC_FILES = vcfparsetest.m -icalparsetest_TOOL_LIBS += -lNGiCal -lSaxObjC -icalds_TOOL_LIBS += -lNGiCal -lSaxObjC -vcf2xml_TOOL_LIBS += -lSaxObjC -vcfparsetest_TOOL_LIBS += -lNGiCal -lSaxObjC - -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble diff --git a/sope-ical/samples/GNUmakefile.preamble b/sope-ical/samples/GNUmakefile.preamble index d6d42dee..c696de3b 100644 --- a/sope-ical/samples/GNUmakefile.preamble +++ b/sope-ical/samples/GNUmakefile.preamble @@ -1,5 +1,6 @@ # compilation flags +SOPE_ROOT=../.. SOPE_CORE="../../sope-core" SOPE_XML="../../sope-xml" @@ -8,17 +9,46 @@ ADDITIONAL_INCLUDE_DIRS += \ -I$(SOPE_CORE)/NGStreams \ -I$(SOPE_CORE)/NGExtensions \ -ADDITIONAL_LIB_DIRS += \ - -L../NGiCal/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_CORE)/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_CORE)/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_CORE)/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_XML)/DOM/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_XML)/SaxObjC/$(GNUSTEP_OBJ_DIR) -SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +# dependencies +ifneq ($(frameworks),yes) +icalparsetest_TOOL_LIBS += -lNGiCal +icalds_TOOL_LIBS += -lNGiCal +vcfparsetest_TOOL_LIBS += -lNGiCal + ADDITIONAL_TOOL_LIBS += \ -lNGStreams -lNGExtensions -lEOControl \ -lDOM -lSaxObjC +else +icalparsetest_TOOL_LIBS += -framework NGiCal +icalds_TOOL_LIBS += -framework NGiCal +vcfparsetest_TOOL_LIBS += -framework NGiCal + +ADDITIONAL_TOOL_LIBS += \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC +endif + + +# library/framework search pathes + +DEP_DIRS = \ + ../NGiCal/ \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) +else +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) +endif + +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib diff --git a/sope-ical/versitSaxDriver/ChangeLog b/sope-ical/versitSaxDriver/ChangeLog index a767579b..41453d46 100644 --- a/sope-ical/versitSaxDriver/ChangeLog +++ b/sope-ical/versitSaxDriver/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * GNUmakefile.preamble: added support for OSX frameworks (v4.5.17) + 2005-06-02 Helge Hess * VSSaxDriver.m: transparently decode property values if diff --git a/sope-ical/versitSaxDriver/GNUmakefile.preamble b/sope-ical/versitSaxDriver/GNUmakefile.preamble index d773696f..075ec3c5 100644 --- a/sope-ical/versitSaxDriver/GNUmakefile.preamble +++ b/sope-ical/versitSaxDriver/GNUmakefile.preamble @@ -7,10 +7,30 @@ ADDITIONAL_INCLUDE_DIRS += \ -I$(SOPE_ROOT)/sope-xml \ -I$(SOPE_ROOT)/sope-core/NGExtensions -BUNDLE_LIBS += \ - -lSaxObjC +# dependencies + +ifneq ($(frameworks),yes) +BUNDLE_LIBS += -lSaxObjC +else +BUNDLE_LIBS += -framework SaxObjC +endif ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS) -ADDITIONAL_LIB_DIRS += \ - -L$(SOPE_OBJ_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) + +# library/framework search pathes + +DEP_DIRS = \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) +else +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) +endif + +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib diff --git a/sope-ical/versitSaxDriver/VSSaxDriver.m b/sope-ical/versitSaxDriver/VSSaxDriver.m index 722e3a71..2621af92 100644 --- a/sope-ical/versitSaxDriver/VSSaxDriver.m +++ b/sope-ical/versitSaxDriver/VSSaxDriver.m @@ -1,24 +1,24 @@ /* - Copyright (C) 2003-2004 Max Berger - Copyright (C) 2004-2005 OpenGroupware.org - - This file is part of versitSaxDriver, written for the OpenGroupware.org - project (OGo). - - SOPE is free software; you can redistribute it and/or modify it under - the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2, or (at your option) any - later version. - - SOPE is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - License for more details. + Copyright (C) 2003-2004 Max Berger + Copyright (C) 2004-2005 OpenGroupware.org - You should have received a copy of the GNU Lesser General Public - License along with SOPE; see the file COPYING. If not, write to the - Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. + This file is part of versitSaxDriver, written for the OpenGroupware.org + project (OGo). + + SOPE is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + SOPE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with SOPE; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. */ #include "VSSaxDriver.h" diff --git a/sope-ical/versitSaxDriver/Version b/sope-ical/versitSaxDriver/Version index a80c05fb..da06aa73 100644 --- a/sope-ical/versitSaxDriver/Version +++ b/sope-ical/versitSaxDriver/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=16 +SUBMINOR_VERSION:=17 -- 2.39.5