2017-09-12 15:13 UTC Viktor Szakats (vszakats users.noreply.github.com)

* bin/check.hb
  * config/*/*.mk
  * contrib/gtwvg/wvgwing.c
  * contrib/hbcomm/comm.prg
  * contrib/hbfbird/tfirebrd.prg
  * contrib/hbfimage/fi_wrp.c
  * contrib/hbformat/hbfmtcls.prg
  * contrib/hbformat/utils/hbformat.prg
  * contrib/hbhttpd/core.prg
  * contrib/hbnetio/utils/hbnetio/hbnetio.prg
  * contrib/hbnetio/utils/hbnetio/netiomgm.hb
  * contrib/hbsqlit3/hdbc.prg
  * contrib/hbwin/win_bmp.c
  * contrib/xhb/htmutil.prg
  * contrib/xhb/thtm.prg
  * contrib/xhb/xhbarr.c
  * contrib/xhb/xhbtedit.prg
  * ChangeLog.txt
  * debian/control
  * debian/copyright
  * doc/*.txt
  * LICENSE.txt
  * package/harbour.spec
  * README.md
  * src/compiler/hbusage.c
  * src/pp/hbpp.c
  * src/rtl/memoedit.prg
  * src/rtl/teditor.prg
  * src/rtl/tget.prg
  * src/rtl/version.c
  * utils/hbi18n/hbi18n.prg
  * utils/hbmk2/hbmk2.prg
  * utils/hbmk2/po/hbmk2.hu.po
  * utils/hbtest/hbtest.prg
    * sync with 3.4 fork (no change in functionality)
      CC3 -> CC4 license, copyright banners, some strings, minor
      code changes, doc folder, TOFIX -> FIXME
This commit is contained in:
Viktor Szakats
2017-09-12 15:15:14 +00:00
parent 15795f6330
commit 760112e3c5
81 changed files with 2526 additions and 2457 deletions

View File

@@ -73,12 +73,12 @@ AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rc $(LIB_DIR)/$@ $(^
DY := $(CC)
DFLAGS += -shared -Wl,-G $(LIBPATHS)
# TOFIX: CHECKME, there was space between -o and output name
# FIXME: CHECKME, there was space between -o and output name
#DY_OUT := -o$(subst x,x, )
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
#define dynlib_object
# @$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -33,14 +33,14 @@ AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreac
ifeq ($(HB_SHELL),dos)
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
# It causes that every command will be separated by LF
define link_file
@$(ECHO) $(ECHOQUOTE)FILE $(file)$(ECHOQUOTE) >> __link__.tmp
endef
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define link_lib
@$(ECHO) $(ECHOQUOTE)LIB $(lib)$(ECHOQUOTE) >> __link__.tmp
@@ -55,7 +55,7 @@ ifeq ($(HB_SHELL),dos)
LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS)
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define lib_object
@$(ECHO) $(ECHOQUOTE)-+$(file)$(ECHOQUOTE) >> __lib__.tmp

View File

@@ -61,7 +61,7 @@ LDFLAGS += $(LIBPATHS)
AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define library_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __lib__.tmp
@@ -79,7 +79,7 @@ DFLAGS += -shared $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -44,7 +44,7 @@ DFLAGS += -dynamic -flat_namespace -undefined warning -multiply_defined suppress
DY_OUT := -o$(subst x,x, )
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -69,7 +69,7 @@ LD_OUT := -o
LIBPATHS := $(foreach dir,$(LIB_DIR) $(SYSLIBPATHS),-L$(dir))
LDLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
# It causes that every command will be separated by LF
define lib_object
@$(ECHO) $(ECHOQUOTE)ADDMOD $(file)$(ECHOQUOTE) >> __lib__.tmp
@@ -88,7 +88,7 @@ define create_library
$(ARSTRIP)
endef
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define link_file
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __link__.tmp
@@ -120,7 +120,7 @@ ifeq ($(HB_BUILD_DYN),dostest)
DFLAGS += --whole-archive
DLIBS :=
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -97,7 +97,7 @@ ifeq ($(HB_BUILD_DYN),dostest)
DLIBS_COMMA :=
endif
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -53,7 +53,7 @@ DFLAGS += -shared $(LIBPATHS)
DY_OUT := -o$(subst x,x, )
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -48,7 +48,7 @@ ifeq ($(HB_SHELL),sh)
AR_RULE = ( $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) rcs $(LIB_DIR)/$@ $(^F) $(ARSTRIP) ) || ( $(RM) $(LIB_DIR)/$@ && $(FALSE) )
else
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define library_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __lib__.tmp
@@ -71,7 +71,7 @@ ifeq ($(HB_SHELL),sh)
DY_RULE = $(DY) $(DFLAGS) -Wl,-soname,$(DYN_NAME_CPT) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) $(DYSTRIP) && ([ "$(@F)" = "$(notdir $(DYN_FILE_NVR))" ] || $(LN) $(@F) $(DYN_FILE_NVR)) && ([ "$(@F)" = "$(notdir $(DYN_FILE_CPT))" ] || $(LN) $(@F) $(DYN_FILE_CPT))
else
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -49,7 +49,7 @@ DFLAGS += -shared $(LIBPATHS)
DY_OUT := -o$(subst x,x, )
DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -62,7 +62,7 @@ LDLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
#DY_OUT :=
#DLIBS :=
#
## NOTE: The empty line directly before 'endef' HAVE TO exist!
## NOTE: The empty line directly before 'endef' HAS TO exist!
#define dynlib_object
# @$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp
#

View File

@@ -73,7 +73,7 @@ DY_OUT :=
DLIBS := $(HB_USER_LIBS)
DLIBS += $(foreach lib,$(LIBS),$(LIB_DIR)/$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -179,7 +179,7 @@ PROCEDURE Main( ... )
mk_hb_FLinkSym( "harbour" + hb_ps() + cDynVersionFull, hb_DirSepToOS( GetEnvC( "HB_INSTALL_DYN" ) ) + hb_ps() + ".." + hb_ps() + cDynVersionFull )
CASE GetEnvC( "HB_INSTALL_DYN" ) == "/usr/local/harbour/lib"
/* TOFIX: Rewrite this in .prg:
/* FIXME: Rewrite this in .prg:
ld="/usr/lib"
if [ -n "${HB_INST_PKGPREF}" ] || [ -w $ld ]
then

View File

@@ -85,7 +85,7 @@ DFLAGS += -Xpic -Wl, -Xshared -Wl, -Xdynamic $(DLIBPATHS)
DY_OUT := -o$(subst x,x, )
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS_DYN),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -66,7 +66,7 @@ DFLAGS += -shared $(DLIBPATHS)
DY_OUT := -o$(subst x,x, )
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(SYSLIBS_DYN),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -59,7 +59,7 @@ LDFLAGS += $(LIBPATHS)
AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define library_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __lib__.tmp
@@ -77,7 +77,7 @@ DFLAGS += -shared $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -105,7 +105,7 @@ DFLAGS += -nologo -dll -subsystem:windowsce -nodefaultlib:oldnames.lib $(LIBPATH
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -53,7 +53,7 @@ DFLAGS += -nologo -dll $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -121,7 +121,7 @@ ifneq ($(HB_SHELL),sh)
# are only needed to support pre-Windows XP systems, where
# limit is 2047 chars. [vszakats]
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define library_object
@$(ECHO) $(ECHOQUOTE)-+$(subst /,$(ECHOBACKSLASH),$(file)) $(LINECONT)$(ECHOQUOTE) >> __lib__.tmp
@@ -153,7 +153,7 @@ else
DLIBS := $(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS) cw32mt import32
endif
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(subst /,$(ECHOBACKSLASH),$(file)) +$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -53,7 +53,7 @@ DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -107,7 +107,7 @@ LDFLAGS += $(LIBPATHS)
AR := $(HB_CCPATH)$(HB_CCPREFIX)ar
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define library_object
@$(ECHO) $(ECHOQUOTE)$(subst \,/,$(file))$(ECHOQUOTE) >> __lib__.tmp
@@ -125,7 +125,7 @@ DFLAGS += -shared $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),-l$(lib))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)INPUT($(subst \,/,$(file)))$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -89,7 +89,7 @@ DFLAGS += -nologo -dll -subsystem:console $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -52,7 +52,7 @@ DFLAGS += -nologo -dll $(LIBPATHS)
DY_OUT := $(LD_OUT)
DLIBS := $(foreach lib,$(HB_USER_LIBS) $(LIBS) $(3RDLIBS) $(SYSLIBS),$(lib)$(LIB_EXT))
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(file)$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -79,7 +79,7 @@ else
DLIBS_COMMA :=
endif
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)FILE '$(file)'$(ECHOQUOTE) >> __dyn__.tmp

View File

@@ -61,7 +61,7 @@ else
DYNFIX :=
endif
# NOTE: The empty line directly before 'endef' HAVE TO exist!
# NOTE: The empty line directly before 'endef' HAS TO exist!
define dynlib_object
@$(ECHO) $(ECHOQUOTE)$(subst /,\,$(file))$(ECHOQUOTE) >> __dyn__.tmp