diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ebc2151234..309b4e3ee9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -7,6 +7,38 @@ For example: 2002-12-01 23:12 UTC+0100 Foo Bar */ + ! function renaming: filebase() => hbmake_filebase() + +2001-12-28 05:15 UTC+0700 Andi Jahja + * utils/hbmake/hbmake.prg + ! enhancement in parameter passing + +2001-12-27 13:25 UTC+0300 Alexander Kresin + * 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 + * 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 + * 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 diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf index 7609e19b9f..f94b7335d3 100644 --- a/harbour/config/bsd/gcc.cf +++ b/harbour/config/bsd/gcc.cf @@ -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) diff --git a/harbour/config/dos/bcc16.cf b/harbour/config/dos/bcc16.cf index 7ece3cbe00..bc82c517b6 100644 --- a/harbour/config/dos/bcc16.cf +++ b/harbour/config/dos/bcc16.cf @@ -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)) diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 395c0d9ad3..6f084cc7e9 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -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. diff --git a/harbour/config/dos/rsx32.cf b/harbour/config/dos/rsx32.cf index c5b9f0c451..9882fbdb2a 100644 --- a/harbour/config/dos/rsx32.cf +++ b/harbour/config/dos/rsx32.cf @@ -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. diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf index 98d2ae305a..fd23eefa47 100644 --- a/harbour/config/dos/watcom.cf +++ b/harbour/config/dos/watcom.cf @@ -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))) diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf index 533044742f..afe10f65d0 100644 --- a/harbour/config/linux/gcc.cf +++ b/harbour/config/linux/gcc.cf @@ -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. diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf index 3320944c7f..89a4764d0f 100644 --- a/harbour/config/os2/gcc.cf +++ b/harbour/config/os2/gcc.cf @@ -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. diff --git a/harbour/config/os2/icc.cf b/harbour/config/os2/icc.cf index d39bdb4540..747e5b9b47 100644 --- a/harbour/config/os2/icc.cf +++ b/harbour/config/os2/icc.cf @@ -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) diff --git a/harbour/config/w32/bcc32.cf b/harbour/config/w32/bcc32.cf index a842297b8e..c329580e60 100644 --- a/harbour/config/w32/bcc32.cf +++ b/harbour/config/w32/bcc32.cf @@ -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 diff --git a/harbour/config/w32/gcc.cf b/harbour/config/w32/gcc.cf index be60eb83bd..8b782bd8d3 100644 --- a/harbour/config/w32/gcc.cf +++ b/harbour/config/w32/gcc.cf @@ -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. diff --git a/harbour/config/w32/mingw32.cf b/harbour/config/w32/mingw32.cf index 8d223288e2..a2f6f155ca 100644 --- a/harbour/config/w32/mingw32.cf +++ b/harbour/config/w32/mingw32.cf @@ -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. diff --git a/harbour/config/w32/msvc.cf b/harbour/config/w32/msvc.cf index bd639780f5..859c42a7c0 100644 --- a/harbour/config/w32/msvc.cf +++ b/harbour/config/w32/msvc.cf @@ -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. diff --git a/harbour/config/w32/rsxnt.cf b/harbour/config/w32/rsxnt.cf index 3e9dd74fbe..935b77101c 100644 --- a/harbour/config/w32/rsxnt.cf +++ b/harbour/config/w32/rsxnt.cf @@ -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. diff --git a/harbour/contrib/libmisc/Makefile b/harbour/contrib/libmisc/Makefile index 925fe6f78e..4d1bf9796f 100644 --- a/harbour/contrib/libmisc/Makefile +++ b/harbour/contrib/libmisc/Makefile @@ -22,4 +22,7 @@ PRG_SOURCES=\ LIBNAME=misc +DIRS=tests + include $(TOP)$(ROOT)config/lib.cf +include $(TOP)$(ROOT)config/dir.cf diff --git a/harbour/contrib/libmisc/tests/Makefile b/harbour/contrib/libmisc/tests/Makefile new file mode 100644 index 0000000000..a53c39a0c3 --- /dev/null +++ b/harbour/contrib/libmisc/tests/Makefile @@ -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 diff --git a/harbour/tests/readfile.prg b/harbour/contrib/libmisc/tests/readfile.prg similarity index 100% rename from harbour/tests/readfile.prg rename to harbour/contrib/libmisc/tests/readfile.prg diff --git a/harbour/source/vm/dynlibhb.c b/harbour/source/vm/dynlibhb.c index dfb3206e23..291f92a360 100644 --- a/harbour/source/vm/dynlibhb.c +++ b/harbour/source/vm/dynlibhb.c @@ -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 -} \ No newline at end of file +} diff --git a/harbour/tests/Makefile b/harbour/tests/Makefile index cf7efcbaac..b4838ea8a4 100644 --- a/harbour/tests/Makefile +++ b/harbour/tests/Makefile @@ -170,7 +170,6 @@ BAD_PRG_SOURCES=\ mathtest.prg \ objarr.prg \ objasign.prg \ - readfile.prg \ rtfclass.prg \ spawn.prg \ spawn2.prg \