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

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

Browse Source 
* config/*/*.mk
  * config/*.mk
  * config/postinst.hb
  * ChangeLog.txt
  * src/rdd/usrrdd/rdds/*.prg
    * sync with 3.4 fork minor code changes, comments, some strings
This commit is contained in:
Viktor Szakats
2017-09-13 11:51:47 +00:00
parent a83c8f1fd8
commit fa876ddc8a
23 changed files with 498 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/aix/gcc.mk
View File

@@ -16,7 +16,7 @@ CC_OUT := -o
CFLAGS += -I. -I$(HB_HOST_INC)
# uncomment this if you want to force creating 64bit binaries
# uncomment this if you want to force creating 64-bit binaries
#CFLAGS += -maix64
#LDFLAGS += -maix64 -Wl,-b64
#DFLAGS += -maix64 -Wl,-b64

2
config/aix/libs.mk
View File

@@ -1,6 +1,6 @@
# When compiling and linking with -pthread, the library search path should
# include -L/usr/lib/threads at the beginning of the path.
# http://www.ibm.com/developerworks/aix/library/au-gnu.html
# https://www.ibm.com/developerworks/aix/library/au-gnu.html
# (libc is there)
ifeq ($(HB_LINKING_VMMT),yes)
SYSLIBPATHS := /usr/lib/threads

2
config/bsd/pcc.mk
View File

@@ -1,4 +1,4 @@
# TODO: No autodetection
# TODO: No auto-detection
ifeq ($(HB_BUILD_MODE),cpp)
HB_BUILD_MODE := c

10
config/common/watcom.mk
View File

@@ -1,12 +1,10 @@
# GNU Make file for Open Watcom C/C++ compiler
# (shell specific rules)
# ---------------------------------------------------------------
# See option docs here:
# http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
# http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlink.html
# http://www.users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html
# ---------------------------------------------------------------
# https://users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/cpopts.html
# https://users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlink.html
# https://users.pjwstk.edu.pl/~jms/qnx/help/watcom/compiler-tools/wlib.html
# NOTE: Hack to force no extension for Linux binaries created on non-Linux hosts.
# Otherwise they become '.elf'. [vszakats]
@@ -94,7 +92,7 @@ ifeq ($(ANYDOS),yes)
# disable DOS/32A Banner
export DOS32A := /NOC
# work arround to DOS command line size limit
# workaround for MS-DOS command-line length limit
ifneq ($(findstring wcc386,$(CC)),)
export WCC386 := $(strip $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS)))
else

2
config/detect.mk
View File

@@ -74,7 +74,7 @@ _DET_INC_HEAD := /gpm.h
include $(TOP)$(ROOT)config/detfun.mk
# Detect slang
# Detect s-lang
_DET_DSP_NAME := slang
_DET_VAR_INC_ := HB_INC_SLANG

2
config/dos/djgpp.mk
View File

@@ -77,7 +77,7 @@ define lib_object
endef
# We have to use script to overcome the MS-DOS limit of max 128 characters
# in commmand line
# in command-line
define create_library
@$(ECHO) $(ECHOQUOTE)CREATE $(LIB_DIR)/$@$(ECHOQUOTE) > __lib__.tmp
$(foreach file,$(^F),$(lib_object))

30
config/global.mk
View File

@@ -148,7 +148,7 @@ ifeq ($(HB_INIT_DONE),)
export HB_REBUILD_PARSER := no
endif
# Can't build shared tools if we don't create dlls
# Cannot build shared tools if we don't create dlls
ifeq ($(HB_BUILD_DYN),no)
export HB_BUILD_SHARED := no
endif
@@ -1822,36 +1822,36 @@ ifneq ($(HB_INSTALL_PREFIX),)
endif
endif
LIBPOSTFIX :=
INCPOSTFIX :=
LIBSUFFIX :=
INCSUFFIX :=
ifeq ($(HB_PLATFORM),beos)
ifeq ($(HB_SYSLOC),yes)
LIBPOSTFIX := $(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
LIBSUFFIX := $(DIRSEP)harbour
INCSUFFIX := $(DIRSEP)harbour
endif
else
ifeq ($(HB_PLATFORM_UNIX),)
LIBPOSTFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
LIBSUFFIX := $(DIRSEP)$(subst /,$(DIRSEP),$(PLAT_COMP))
else
LIBPOSTFIX :=
LIBSUFFIX :=
# Use 'lib64' instead of 'lib' for 64-bit targets where lib64 dir exists
ifneq ($(wildcard $(HB_INSTALL_PREFIX)$(DIRSEP)lib64),)
ifneq ($(filter $(HB_CPU),x86_64),)
LIBPOSTFIX := 64
LIBSUFFIX := 64
endif
endif
# Not perfect, please enhance it.
ifneq ($(findstring |/usr,|$(HB_INSTALL_PREFIX)),)
ifeq ($(findstring |/usr/home,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
LIBSUFFIX := $(LIBSUFFIX)$(DIRSEP)harbour
INCSUFFIX := $(DIRSEP)harbour
endif
else
ifneq ($(findstring |/opt,|$(HB_INSTALL_PREFIX)),)
LIBPOSTFIX := $(LIBPOSTFIX)$(DIRSEP)harbour
INCPOSTFIX := $(DIRSEP)harbour
LIBSUFFIX := $(LIBSUFFIX)$(DIRSEP)harbour
INCSUFFIX := $(DIRSEP)harbour
else
LIBPOSTFIX :=
LIBSUFFIX :=
endif
endif
endif
@@ -1863,7 +1863,7 @@ ifneq ($(HB_INSTALL_PREFIX),)
endif
# Standard name: LIBDIR
ifeq ($(HB_INSTALL_LIB),)
export HB_INSTALL_LIB := $(HB_INSTALL_PREFIX)$(DIRSEP)lib$(LIBPOSTFIX)
export HB_INSTALL_LIB := $(HB_INSTALL_PREFIX)$(DIRSEP)lib$(LIBSUFFIX)
endif
ifeq ($(HB_INSTALL_DYN),)
ifeq ($(HB_PLATFORM_UNIX),)
@@ -1878,7 +1878,7 @@ ifneq ($(HB_INSTALL_PREFIX),)
endif
# Standard name: INCLUDEDIR
ifeq ($(HB_INSTALL_INC),)
export HB_INSTALL_INC := $(HB_INSTALL_PREFIX)$(DIRSEP)include$(INCPOSTFIX)
export HB_INSTALL_INC := $(HB_INSTALL_PREFIX)$(DIRSEP)include$(INCSUFFIX)
endif
# Standard name: DOCDIR
ifeq ($(HB_INSTALL_DOC),)

10
config/globsh.mk
View File

@@ -79,8 +79,8 @@ endif
ifeq ($(HB_SHELL),nt)
# NOTE: According to http://support.microsoft.com/kb/830473
# The command line length limit for cmd.exe is 8191 chars
# NOTE: According to https://support.microsoft.com/kb/830473
# The command-line length limit for cmd.exe is 8191 chars
# for Windows XP and upper and 2047 for Windows NT and 2000.
# This is true for commands which are recognized as shell
# commands (by using an internal list). For the rest
@@ -134,7 +134,7 @@ endif
ifeq ($(HB_SHELL),os2)
# NOTE: Maximum size of command line in OS/2 is limited to 1024
# NOTE: Maximum size of command-line in OS/2 is limited to 1024
# characters.
# NOTE: Comment on included OS/2 GNU tools:
@@ -184,9 +184,9 @@ endif
ifeq ($(HB_SHELL),dos)
# NOTE: MS-DOS command line length has a limit of 126 characters.
# NOTE: MS-DOS command-line length has a limit of 126 characters.
# When using DJGPP GNU Make to invoke other DJGPP tools this limit
# is about 13KB, as they do special trick to overcome it.
# is about 13 kB, as they do special trick to overcome it.
# See these DJGPP FAQs:
# http://www.delorie.com/djgpp/v2faq/faq16_4.html
# http://www.delorie.com/djgpp/v2faq/faq16_5.html

2
config/hpux/gcc.mk
View File

@@ -16,7 +16,7 @@ CC_OUT := -o
CFLAGS += -I. -I$(HB_HOST_INC)
# uncomment this if you want to force creating 64bit binaries on IA64
# uncomment this if you want to force creating 64-bit binaries on IA64
#CFLAGS += -mlp64
#LDFLAGS += -mlp64

2
config/linux/sunpro.mk
View File

@@ -27,7 +27,7 @@ CFLAGS += -I. -I$(HB_HOST_INC)
ifneq ($(HB_BUILD_OPTIM),no)
# Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
# conform to the Blastwave build standards, see
# http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
# https://web.archive.org/web/wiki.blastwave.org/mediawiki/index.php/Build_Standards
# Try to keep them this way.
CFLAGS += -fast
CFLAGS += -xnolibmopt

2
config/os2/gcc.mk
View File

@@ -87,7 +87,7 @@ else
endef
# We have to use a script to overcome the AR limit of max 850 characters
# in commmand line
# in command-line
define create_library
$(if $(wildcard $(subst /,$(DIRSEP),$(LIB_FILE))),@$(RM) $(subst /,$(DIRSEP),$(LIB_FILE)),)
@$(ECHO) $(ECHOQUOTE)CREATE $(LIB_DIR)/$@$(ECHOQUOTE) > __lib__.tmp

4
config/postinst.hb
View File

@@ -273,7 +273,7 @@ PROCEDURE Main( ... )
ELSEIF Empty( query_stdout( "tar --version" ) )
cBin_Tar := ""
ELSEIF "bsdtar" $ query_stdout( "tar --version" )
/* tar is mapped to bsdtar starting OS X 10.6 */
/* tar is mapped to bsdtar starting Mac OS X 10.6 */
lGNU_Tar := .F.
ENDIF
@@ -654,7 +654,7 @@ STATIC FUNCTION __hb_extern_get_list( cInputName )
hExtern := { => }
FOR EACH tmp IN aResult
tmp[ 2 ] := hb_asciiUpper( tmp[ 2 ] )
IF !( tmp[ 2 ] $ hExtern )
IF ! tmp[ 2 ] $ hExtern
AAdd( aExtern, tmp[ 2 ] )
hExtern[ tmp[ 2 ] ] := NIL
ENDIF

6
config/rules.mk
View File

@@ -11,9 +11,9 @@ else
endif
ifeq ($(HB_DYN_COPT),)
OBJ_DYN_POSTFIX :=
OBJ_DYN_SUFFIX :=
else
OBJ_DYN_POSTFIX := _dyn
OBJ_DYN_SUFFIX := _dyn
endif
# How to run Harbour
@@ -34,7 +34,7 @@ ifeq ($(CC_RULE),)
ifneq ($(filter $(LIBNAME),$(HB_DYN_LIBS)),)
define cc_comp_all
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(HB_CFLAGS_STA) $(CC_IN) $<)
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_POSTFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(HB_CFLAGS_DYN) $(CC_IN) $<)
$(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_DYN_SUFFIX)$(OBJ_EXT)) $(HB_DYN_COPT) $(HB_CFLAGS_DYN) $(CC_IN) $<)
endef
CC_RULE = $(cc_comp_all)
endif

4
config/sunos/sunpro.mk
View File

@@ -25,14 +25,14 @@ CXX := $(HB_CCACHE) $(HB_CCPATH)$(HB_CCPREFIX)sunCC$(HB_CCSUFFIX)
CFLAGS += -I. -I$(HB_HOST_INC)
# try to keep `-fast' as left as possible, as later optim
# try to keep `-fast' as left as possible, as later optimization
# flags may override values set by `-fast', and this way
# no warnings are generated.
ifneq ($(HB_BUILD_OPTIM),no)
# Together with $(HB_ISAOPT) above, these are supposed to (somewhat)
# conform to the Blastwave build standards, see
# http://wiki.blastwave.org/mediawiki/index.php/Build_Standards
# https://web.archive.org/web/wiki.blastwave.org/mediawiki/index.php/Build_Standards
# Try to keep them this way.
CFLAGS += -fast
CFLAGS += -xnolibmopt