gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-04-23 15:33:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* config.mak.in: Added EOCONTROL_LIBRARY_NAME,

Browse source 
EOACCESS_LIBRARY_NAME and HAVE_NATIVE_FRAMEWORK_SUPPORT.
        * GSWeb.framework/Makefile.preamble.in: Added support for
        buildings on OS X and improve support for others.
        * GSWExtensions.framework/Makefile.preamble: Ditto.
        * GSWExtensionsGSW.framework/Makefile.preamble: Ditto.
        * GSWeb.framework/GNUmakefile: Remove GNUSTEP_MAKEFILES.

        * GSWeb.framework/GSWMultiKeyDictionary.m
        ([GSWMultiKeyDictionary initWithNodeSize:capacity:]): Replace
        usage of GSObjCZone with -zone for OS X compatibility.
        ([GSWMultiKeyDictionary dealloc]): Ditto.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18773 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2004-03-04 18:36:50 +00:00
parent cb17620a27
commit e59b95fcfc
7 changed files with 102 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2004-03-04 David Ayers <d.ayers@inode.at>
* config.mak.in: Added EOCONTROL_LIBRARY_NAME,
EOACCESS_LIBRARY_NAME and HAVE_NATIVE_FRAMEWORK_SUPPORT.
* GSWeb.framework/Makefile.preamble.in: Added support for
buildings on OS X and improve support for others.
* GSWExtensions.framework/Makefile.preamble: Ditto.
* GSWExtensionsGSW.framework/Makefile.preamble: Ditto.
* GSWeb.framework/GNUmakefile: Remove GNUSTEP_MAKEFILES.
* GSWeb.framework/GSWMultiKeyDictionary.m
([GSWMultiKeyDictionary initWithNodeSize:capacity:]): Replace
usage of GSObjCZone with -zone for OS X compatibility.
([GSWMultiKeyDictionary dealloc]): Ditto.
2004-03-03 Manuel Guesdon <mguesdon@orange-concept.com>
* GSWeb.framework/GSWDefaultAdaptorThread.m:

41
GSWExtensions.framework/Makefile.preamble
View file

@ -69,21 +69,42 @@ ADDITIONAL_LDFLAGS =
# These variables should only be needed on windows
# but they aren't set yet.
LIBRARIES_DEPEND_UPON +=
# -l$(FOUNDATION_LIBRARY_NAME) \
# -l$(EOCONTROL_LIBRARY_NAME) \
# -l$(EOACCESS_LIBRARY_NAME) \
LIBRARIES_DEPEND_UPON += -lGSANTLR
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
GSWExtentions_LIBRARIES_DEPEND_UPON += -lGSWeb
WOExtentions_LIBRARIES_DEPEND_UPON += -lWebObjects
ifeq ($(GDL2),yes)
LIBRARIES_DEPEND_UPON += \
-l$(EOCONTROL_LIBRARY_NAME) \
-l$(EOACCESS_LIBRARY_NAME)
endif
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
GSWExtensions_LIBRARIES_DEPEND_UPON += -framework GSWeb
WOExtensions_LIBRARIES_DEPEND_UPON += -framework WebObjects
else
GSWExtensions_LIBRARIES_DEPEND_UPON += -lGSWeb
WOExtensions_LIBRARIES_DEPEND_UPON += -lWebObjects
endif
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =
GSWExtentions_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
WOExtentions_ADDITIONAL_LIB_DIRS = \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/WebObjects
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb.framework
else
#This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR
GSWEB_LIBRARY_BASE = ../GSWeb.framework/GSWeb.framework
WO_LIBRARY_BASE = ../GSWeb.framework/WebObjects.framework
GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR)
GSWExtensions_LIB_DIRS = \
-L$(GSWEB_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
WOExtensions_LIB_DIRS = \
-L$(WO_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
endif
#

39
GSWExtensionsGSW.framework/Makefile.preamble
View file

@ -68,15 +68,40 @@ ADDITIONAL_LDFLAGS =
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS =
GSWExtensionsGSW_ADDITIONAL_LIB_DIRS += \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/GSWeb
WOExtensionsGSW_ADDITIONAL_LIB_DIRS += \
-L../GSWeb.framework/$(GNUSTEP_OBJ_DIR)/WebObjects
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
ADDITIONAL_FRAMEWORK_DIRS = -F../GSWeb.framework
else
#This is needed to strip GSW/WOExtensions from GNUSTEP_OBJ_DIR
GSWEB_LIBRARY_BASE = ../GSWeb.framework/GSWeb.framework
WO_LIBRARY_BASE = ../GSWeb.framework/WebObjects.framework
GSW_FRAMEWORK_SUFFIX = Versions/Current/$(GNUSTEP_TARGET_LDIR)
LIBRARIES_DEPEND_UPON =
GSWExtentions_LIBRARIES_DEPEND_UPON += -lGSWeb
WOExtentions_LIBRARIES_DEPEND_UPON += -lWebObjects
GSWExtensionsGSW_LIB_DIRS = \
-L$(GSWEB_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
WOExtensionsGSW_LIB_DIRS = \
-L$(WO_LIBRARY_BASE)/$(GSW_FRAMEWORK_SUFFIX)
endif
LIBRARIES_DEPEND_UPON += -lGSANTLR
ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
ifeq ($(GDL2),yes)
LIBRARIES_DEPEND_UPON += \
-l$(EOCONTROL_LIBRARY_NAME) \
-l$(EOACCESS_LIBRARY_NAME)
endif
ifeq ($(HAVE_NATIVE_FRAMEWORK_SUPPORT),yes)
GSWExtensionsGSW_LIBRARIES_DEPEND_UPON += -framework GSWeb
WOExtensionsGSW_LIBRARIES_DEPEND_UPON += -framework WebObjects
else
GSWExtensionsGSW_LIBRARIES_DEPEND_UPON += -lGSWeb
WOExtensionsGSW_LIBRARIES_DEPEND_UPON += -lWebObjects
endif
#
# Flags dealing with installing and uninstalling

2
GSWeb.framework/GNUmakefile
View file

@ -24,8 +24,6 @@
# Install into the system root by default
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gsweb.make
include $(GNUSTEP_MAKEFILES)/common.make
ifeq ($(GDL2),yes)

7
GSWeb.framework/GSWMultiKeyDictionary.m
View file

@ -1048,14 +1048,15 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
sizeof(GSWMapNode_t));
if ((self=[super init]))
{
_mapBase = (GSWMapBase)NSZoneMalloc(GSObjCZone(self),sizeof(GSWMapBase_t));
_mapBase = (GSWMapBase)NSZoneMalloc([self zone],sizeof(GSWMapBase_t));
((GSWMapBase)_mapBase)->nodeSize=nodeSize;
/*
NSDebugMLLog(@"GSWMultiKeyDictionary",
@"self=%p class=%@ base=%p nodeSize=%u sizeof(GSWMapNode_t)=%u",
self,[self class],_mapBase,nodeSize,sizeof(GSWMapNode_t));
*/
GSWMapBaseInitWithZoneAndCapacity((GSWMapBase)_mapBase, GSObjCZone(self),capacity);
GSWMapBaseInitWithZoneAndCapacity((GSWMapBase)_mapBase, [self zone],
capacity);
};
LOGObjectFnStop();
return self;
@ -1077,7 +1078,7 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
if (_mapBase)
{
GSWMapEmptyBase((GSWMapBase)_mapBase);
NSZoneFree(GSObjCZone(self),_mapBase);
NSZoneFree([self zone],_mapBase);
};
[super dealloc];
}

4
GSWeb.framework/Makefile.preamble.in
View file

@ -69,7 +69,9 @@ ifneq ($(FOUNDATION_LIB),gnu)
LIBRARIES_DEPEND_UPON += -lgnustep-baseadd
endif
ifeq ($(GDL2),yes)
LIBRARIES_DEPEND_UPON += -lgnustep-db2control -lgnustep-db2
LIBRARIES_DEPEND_UPON += \
-l$(EOCONTROL_LIBRARY_NAME) \
-l$(EOACCESS_LIBRARY_NAME)
endif
# Additional library directories the linker should search

17
config.mak.in
View file

@ -5,6 +5,23 @@ DYNAMIC_LINKER=simple
GDL2=@GDL2@
LIBWRAP=@LIBWRAP@
#EOControl dependancy
ifeq ($(GDL2),yes)
EOCONTROL_LIBRARY_NAME=gnustep-db2control
EOACCESS_LIBRARY_NAME=gnustep-db2
endif
#Native Framework support
ifeq ($(OBJC_RUNTIME_LIB),apple)
HAVE_NATIVE_FRAMEWORK_SUPPORT=yes
else
ifeq ($(OBJC_RUNTIME_LIB),nx)
HAVE_NATIVE_FRAMEWORK_SUPPORT=yes
else
HAVE_NATIVE_FRAMEWORK_SUPPORT=no
endif
endif
#Log
GSWDEBUG=no