fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

See ChangeLog entry 2001-12-26 16:20 UTC-0500 David G. Holm <dholm@jsd-llc.com>

Browse Source
This commit is contained in:
David G. Holm
2001-12-26 21:21:08 +00:00
parent 788876c5e3
commit e240b5be8d
19 changed files with 121 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
harbour/ChangeLog
View File

@@ -7,6 +7,38 @@
For example:
2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
*/
! function renaming: filebase() => hbmake_filebase()
2001-12-28 05:15 UTC+0700 Andi Jahja <harbour@cbn.net.id>
* utils/hbmake/hbmake.prg
! enhancement in parameter passing
2001-12-27 13:25 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
* source/rdd/dbf1.c
* source/rdd/dbfntx/dbfntx1.c
* source/rdd/dbfcdx/dbfcdx1.c
* Calls of hb_fsOpen() and hb_fsCreate() replaced by hb_spOpen() and
hb_spCreate() to allow SET PATH and SET DEFAULT settings
2001-12-26 22:20 GMT-3 Luiz Rafael Culik <culik@sl.conex.net>
* utils/hbmake/hbmake.prg
utils/hbmake/hbmutils.prg
* Added code that allows the user select the 3rd party libraries they want
* source/compiler/gencobj.c
* Fixed an problem on the extension of object file(Borland and MSVC user .obj/Gcc uses .o)
2001-12-26 16:20 UTC-0500 David G. Holm <dholm@jsd-llc.com>
* config/bsd/gcc.cf
* config/dos/bcc16.cf
* config/dos/djgpp.cf
* config/dos/rsx32.cf
* config/dos/watcom.cf
* config/linux/gcc.cf
* config/os2/gcc.cf
* config/os2/icc.cf
* config/w32/bcc32.cf
* config/w32/gcc.cf
* config/w32/mingw32.cf
* config/w32/msvc.cf
* config/w32/rsxnt.cf
* Fix for the contrib library renames that broke the GNU Make

1
harbour/config/bsd/gcc.cf
View File

@@ -25,6 +25,7 @@ LD_OUT = -o
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(CONTRIBS), -L$(TOP)$(ROOT)contrib/lib$(lib)/$(ARCH))
LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)

2
harbour/config/dos/bcc16.cf
View File

@@ -44,11 +44,13 @@ endef
LD = bcc
LDFLAGS = -O2 -mh $(L_USR)
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS = $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
ifeq ($(findstring rdd,$(LIBS)),rdd)
LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(TOP)$(ROOT)source/rdd/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
endif
else
LINKLIBS = $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
LINKLIBS = $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
ifeq ($(findstring rdd,$(LIBS)),rdd)
LINKLIBS += $(foreach lib, $(HB_DB_DRIVERS), $(lib)$(LIB_EXT))

2
harbour/config/dos/djgpp.cf
View File

@@ -29,7 +29,7 @@ LINKPATHS += $(foreach lib, $(LIBS), -L$(TOP)$(ROOT)source/$(lib)/$(ARCH))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/dos/rsx32.cf
View File

@@ -33,7 +33,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/dos/watcom.cf
View File

@@ -44,7 +44,7 @@ endef
LD = wlink
LDFLAGS = debug all OP osn=DOS4G OP stack=65536 OP CASEEXACT
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(lib)))
LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))))
LINKLIBS := $(foreach lib, $(LIBS), $(subst /,\,$(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)))
else
LINKLIBS := $(foreach lib, $(CONTRIBS), $(subst /,\,$(HB_LIB_COMPILE)/$(lib)))

2
harbour/config/linux/gcc.cf
View File

@@ -30,7 +30,7 @@ else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LINKLIBS += -Wl,--start-group
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/os2/gcc.cf
View File

@@ -38,7 +38,7 @@ else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
#LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/os2/icc.cf
View File

@@ -30,7 +30,7 @@ endif
endif
endif
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
LINKLIBS = $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.
ifeq ($(findstring rdd,$(LIBS)),rdd)

4
harbour/config/w32/bcc32.cf
View File

@@ -36,11 +36,11 @@ LD_OUT = -e
# Add all libraries specified in CONTRIBS and LIBS.
ifeq ($(HB_LIB_COMPILE),)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(CONTRIBS), $(TOP)$(ROOT)/contrib/$(lib)/$(ARCH)/$(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(TOP)$(ROOT)/source/$(lib)/$(ARCH)/$(lib)$(LIB_EXT))
else
LINKPATHS += -L$(HB_LIB_COMPILE)
LINKLIBS += $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
endif

2
harbour/config/w32/gcc.cf
View File

@@ -34,7 +34,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

2
harbour/config/w32/mingw32.cf
View File

@@ -30,7 +30,7 @@ else
LINKPATHS += -L$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

2
harbour/config/w32/msvc.cf
View File

@@ -25,7 +25,7 @@ LINKPATHS += -link $(foreach lib, $(LIBS), -LIBPATH:$(TOP)$(ROOT)source/$(lib)/$
else
LINKPATHS += -link -LIBPATH:$(HB_LIB_COMPILE)
endif
LINKLIBS += $(foreach lib, $(CONTRIBS), $(lib)$(LIB_EXT))
LINKLIBS += $(foreach lib, $(CONTRIBS), $(subst lib,,$(lib))$(LIB_EXT))
LINKLIBS += $(foreach lib, $(LIBS), $(lib)$(LIB_EXT))
# If LIBS specifies the rdd library, add all DB drivers.

2
harbour/config/w32/rsxnt.cf
View File

@@ -32,7 +32,7 @@ endif
# cyclic dependencies, but I think it is not really necessary if the
# libraries are kept in proper order.
# LINKLIBS += -Wl,-(
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(lib))
LINKLIBS += $(foreach lib, $(CONTRIBS), -l$(subst lib,,$(lib)))
LINKLIBS += $(foreach lib, $(LIBS), -l$(lib))
# This library is needed for CharToOemBuff() and OemToCharBuff() support.

3
harbour/contrib/libmisc/Makefile
View File

@@ -22,4 +22,7 @@ PRG_SOURCES=\
LIBNAME=misc
DIRS=tests
include $(TOP)$(ROOT)config/lib.cf
include $(TOP)$(ROOT)config/dir.cf

65
harbour/contrib/libmisc/tests/Makefile Normal file
View File

@@ -0,0 +1,65 @@
#
# $Id$
#
ifeq ($(HB_MAIN),)
HB_MAIN = std
endif
ROOT = ../../../
CONTRIBS=\
libmisc \
LIBS=\
debug \
vm \
rtl \
lang \
rdd \
rtl \
vm \
macro \
pp \
common \
ifeq ($(PM),)
PM := $(pm)
endif
ifeq ($(PM),) # PM not defined = build all files
PRG_SOURCES=\
readfile.prg \
PRG_HEADERS=\
db_brows.ch \
cgi.ch \
keywords.ch \
test.ch \
BAD_PRG_SOURCES=\
C_SOURCES=\
C_HEADERS=\
BAD_C_SOURCES=\
include $(TOP)$(ROOT)config/test.cf
else #PM defined = build specified file
ifneq ($(findstring .prg,$(PM)),)
PRG_MAIN := $(PM)
else
ifneq ($(findstring .PRG,$(PM)),)
PRG_MAIN := $(PM)
else
PRG_MAIN := $(PM).prg
endif
endif
echo $(TOP)$(ROOT)config/bin.cf
include $(TOP)$(ROOT)config/bin.cf
endif

0
harbour/tests/readfile.prg → harbour/contrib/libmisc/tests/readfile.prg
View File

8
harbour/source/vm/dynlibhb.c
View File

@@ -62,7 +62,11 @@
#include "hbvm.h"
#if defined(HB_OS_WIN_32)
extern HMODULE _hInstance;
#if defined(__BORLANDC__)
extern HMODULE _hInstance;
#else
HMODULE _hInstance;
#endif
#endif
HB_FUNC( LIBLOAD )
@@ -134,4 +138,4 @@ BOOL hb_StartApp( void )
return TRUE; /* Warning: this must be changed for other OS */
}
#endif
}
}

1
harbour/tests/Makefile
View File

@@ -170,7 +170,6 @@ BAD_PRG_SOURCES=\
mathtest.prg \
objarr.prg \
objasign.prg \
readfile.prg \
rtfclass.prg \
spawn.prg \
spawn2.prg \