diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c82dd8c52d..8d2757f674 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,24 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-18 22:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/dos/watcom.mk + * config/dos/djgpp.mk + * config/win/bcc.mk + * config/win/watcom.mk + * config/os2/watcom.mk + * config/os2/gcc.mk + * 'echo' -> '$(ECHO)' + + * config/readme.txt + + Added link to DJGPP echo tool. + ; TOFIX: This isn't the echo tool which is currently included + in SVN, but points to the place where other dj-*.exes + came from. + + * ChangeLog + ! Fixed date in my today's entries. + 2009-08-18 21:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/config/global.mk * use $(error ...) instead of echo to inform about wrong GNU make @@ -48,7 +66,7 @@ It also resolve the problem with IF EXIST \NUL which is always true in some environment, i.e. Novel-NetWare drives. -2009-08-17 19:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 19:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/dirsh.mk + Added '@' prefixes for nt and os2 shells. @@ -60,11 +78,11 @@ ! use := instead of = for DIR_RULE assignment - these rules contain dependencies macros which cannot be resolved during assignment -2009-08-17 17:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 17:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/dir.mk ! Fixed DIR_RULE assignment (:= back to =) -2009-08-17 17:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 17:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk * Upped minimum GNU Make version requirement to 3.78 (from 3.70). We use many 3.78-only features since very long and in many @@ -90,7 +108,7 @@ * ChangeLog * Updated cross-build compatibility chart. -2009-08-17 13:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 13:29 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Added autodetection of cegcc tools on default install location. + Added error messages if specified or autodetected mingw/cegcc @@ -145,7 +163,7 @@ ! fixed HB_CCPATH setting to be compatible with .mk files and hb* scripts ! fixed links to harbour share libraries -2009-08-17 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 10:38 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/wce/poccarm.mk * config/wce/msvcarm.mk * config/win/xcc.mk @@ -161,7 +179,7 @@ dynamic compilation pass. F.e. for *nix/gcc compilers it can be set to -fPIC. -2009-08-17 10:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) +2009-08-18 10:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk + Implemented win/mingw cross-tool autodetection. Based on the logic found in make_gnu_xmingwce.sh. It's not diff --git a/harbour/config/dos/djgpp.mk b/harbour/config/dos/djgpp.mk index ac857d2607..2c59aa41a7 100644 --- a/harbour/config/dos/djgpp.mk +++ b/harbour/config/dos/djgpp.mk @@ -54,28 +54,28 @@ LDLIBS += -lm # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every command will be separated by LF define lib_object - @echo ADDMOD $(file) >> __lib__.tmp + @$(ECHO) ADDMOD $(file) >> __lib__.tmp endef # We have to use script to overcome the DOS limit of max 128 characters # in commmand line define create_library - @echo CREATE $(LIB_DIR)/$@ > __lib__.tmp + @$(ECHO) CREATE $(LIB_DIR)/$@ > __lib__.tmp $(foreach file,$(^F),$(lib_object)) - @echo SAVE >> __lib__.tmp - @echo END >> __lib__.tmp + @$(ECHO) SAVE >> __lib__.tmp + @$(ECHO) END >> __lib__.tmp $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp endef # NOTE: The empty line directly before 'endef' HAVE TO exist! define link_file - @echo $(file) >> __link__.tmp + @$(ECHO) $(file) >> __link__.tmp endef define link_exe_file - @echo $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(BIN_DIR)/$@ > __link__.tmp + @$(ECHO) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LD_OUT)$(BIN_DIR)/$@ > __link__.tmp $(foreach file,$(^F),$(link_file)) $(foreach file,$(LIBPATHS),$(link_file)) $(foreach file,$(LDLIBS),$(link_file)) diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk index 11e2a5fe6a..a2921ee3d2 100644 --- a/harbour/config/dos/watcom.mk +++ b/harbour/config/dos/watcom.mk @@ -75,18 +75,18 @@ CPPFLAGS := # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every command will be separated by LF define link_file - @echo FILE $(file) >> __link__.tmp + @$(ECHO) FILE $(file) >> __link__.tmp endef # NOTE: The empty line directly before 'endef' HAVE TO exist! define link_lib - @echo LIB $(lib) >> __link__.tmp + @$(ECHO) LIB $(lib) >> __link__.tmp endef define link_exe_file - @echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp + @$(ECHO) $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp $(foreach file,$(^F),$(link_file)) $(foreach lib,$(LDLIBS),$(link_lib)) -$(LD) @__link__.tmp @@ -110,12 +110,12 @@ LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) # NOTE: The empty line directly before 'endef' HAVE TO exist! define lib_object - @echo -+$(file) >> __lib__.tmp + @$(ECHO) -+$(file) >> __lib__.tmp endef define create_library - @echo $(LIB_DIR)/$@ > __lib__.tmp + @$(ECHO) $(LIB_DIR)/$@ > __lib__.tmp $(foreach file,$(^F),$(lib_object)) $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp endef diff --git a/harbour/config/os2/gcc.mk b/harbour/config/os2/gcc.mk index 9e187adc37..f9699b704c 100644 --- a/harbour/config/os2/gcc.mk +++ b/harbour/config/os2/gcc.mk @@ -71,7 +71,7 @@ endif # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every command will be separated by LF #define lib_object -# @echo ADDMOD $(file) >> __lib__.tmp +# @$(ECHO) ADDMOD $(file) >> __lib__.tmp # #endef @@ -79,10 +79,10 @@ endif # in commmand line define create_library if exist $(subst /,$(DIRSEP),$(LIB_FILE)) $(RM) $(subst /,$(DIRSEP),$(LIB_FILE)) - @echo CREATE $(LIB_DIR)/$@ > __lib__.tmp - for %i in ( *$(OBJ_EXT) ) do @echo ADDMOD %i >> __lib__.tmp - @echo SAVE >> __lib__.tmp - @echo END >> __lib__.tmp + @$(ECHO) CREATE $(LIB_DIR)/$@ > __lib__.tmp + for %i in ( *$(OBJ_EXT) ) do @$(ECHO) ADDMOD %i >> __lib__.tmp + @$(ECHO) SAVE >> __lib__.tmp + @$(ECHO) END >> __lib__.tmp $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp endef diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk index d324dc885f..aa8dba6d9c 100644 --- a/harbour/config/os2/watcom.mk +++ b/harbour/config/os2/watcom.mk @@ -84,9 +84,9 @@ ifeq ($(HB_SHELL),sh) else # maximum size of command line in OS2 is limited to 1024 characters # the trick with divided 'wordlist' is workaround for it: - # -$(if $(wordlist 1,100,$(^F)), echo $(wordlist 1,100,$(addprefix -+,$(^F))) >> __lib__.tmp,) - # -$(if $(wordlist 101,200,$(^F)), echo $(wordlist 101,200,$(addprefix -+,$(^F))) >> __lib__.tmp,) - # -$(if $(wordlist 201,300,$(^F)), echo $(wordlist 301,300,$(addprefix -+,$(^F))) >> __lib__.tmp,) + # -$(if $(wordlist 1,100,$(^F)), $(ECHO) $(wordlist 1,100,$(addprefix -+,$(^F))) >> __lib__.tmp,) + # -$(if $(wordlist 101,200,$(^F)), $(ECHO) $(wordlist 101,200,$(addprefix -+,$(^F))) >> __lib__.tmp,) + # -$(if $(wordlist 201,300,$(^F)), $(ECHO) $(wordlist 301,300,$(addprefix -+,$(^F))) >> __lib__.tmp,) # anyhow OS2 port# of GNU make 3.81 seems to have bug and GPFs when total # commands length is too big so for %i in ( *$(OBJ_EXT) ) do ... below is # ugly workaround for both problems @@ -98,8 +98,8 @@ else endif define create_library - @echo $(LIB_DIR)/$@ > __lib__.tmp - for $(FILE) in ( *$(OBJ_EXT) ) do @echo -+$(FILE) >> __lib__.tmp + @$(ECHO) $(LIB_DIR)/$@ > __lib__.tmp + for $(FILE) in ( *$(OBJ_EXT) ) do @$(ECHO) -+$(FILE) >> __lib__.tmp $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp endef endif diff --git a/harbour/config/readme.txt b/harbour/config/readme.txt index 1270fbec97..d3fa6fba26 100644 --- a/harbour/config/readme.txt +++ b/harbour/config/readme.txt @@ -23,14 +23,16 @@ Included utilities are: ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381b.zip ftp://ftp.delorie.com/pub/djgpp/beta/v2gnu/mak381s.zip -- GNU coreutils (mkdir, rm, cp) +- GNU coreutils (mkdir, rm, cp, echo) Licence: GPL 2 (see below) Links to included binaries + sources: - - DJGPP (dj-mkdir.exe, dj-rm.exe, dj-cp.exe) + - DJGPP (dj-mkdir.exe, dj-rm.exe, dj-cp.exe, dj-echo.exe) ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/ ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41b.zip ftp://ftp.delorie.com/pub/djgpp/current/v2gnu/fil41s.zip + ftp://ftp.delorie.com/pub/djgpp/current/v2/djdev203.zip + ftp://ftp.delorie.com/pub/djgpp/current/v2/djlsr203.zip - OS/2 (os2-mkdir.exe, os2-rm.exe) http://os2ports.smedley.info/index.php?page=build-environment http://download.smedley.info/buildenv_20071022.zip diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk index a4d18f04e1..c66437f0aa 100644 --- a/harbour/config/win/bcc.mk +++ b/harbour/config/win/bcc.mk @@ -58,14 +58,14 @@ ifneq ($(HB_SHELL),sh) # NOTE: The empty line directly before 'endef' HAVE TO exist! define lib_object - @echo -+$(subst /,\,$(file)) ^& >> __lib__.tmp + @$(ECHO) -+$(subst /,\,$(file)) ^& >> __lib__.tmp endef define create_library @if exist __lib__.tmp del __lib__.tmp $(foreach file,$(^F),$(lib_object)) - @echo -+>> __lib__.tmp + @$(ECHO) -+>> __lib__.tmp $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp endef diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk index a2e58b4036..b84e6819ca 100644 --- a/harbour/config/win/watcom.mk +++ b/harbour/config/win/watcom.mk @@ -71,18 +71,18 @@ endif # NOTE: The empty line directly before 'endef' HAVE TO exist! # It causes that every command will be separated by LF define link_file - @echo FILE $(file) >> __link__.tmp + @$(ECHO) FILE $(file) >> __link__.tmp endef # NOTE: The empty line directly before 'endef' HAVE TO exist! define link_lib - @echo LIB $(lib) >> __link__.tmp + @$(ECHO) LIB $(lib) >> __link__.tmp endef define link_exe_file - @echo $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp + @$(ECHO) $(LDFLAGS) NAME $(BIN_DIR)/$@ > __link__.tmp $(foreach file,$(^F),$(link_file)) $(foreach lib,$(LDLIBS),$(link_lib)) -$(LD) @__link__.tmp @@ -101,12 +101,12 @@ LD_RULE = $(link_exe_file) $(HB_USER_LDFLAGS) # NOTE: The empty line directly before 'endef' HAVE TO exist! define lib_object - @echo -+$(file) >> __lib__.tmp + @$(ECHO) -+$(file) >> __lib__.tmp endef define create_library - @echo $(LIB_DIR)/$@ > __lib__.tmp + @$(ECHO) $(LIB_DIR)/$@ > __lib__.tmp $(foreach file,$(^F),$(lib_object)) $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp endef