From fa8119350ad3af32fa638296c033cdc8876c5493 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 15 Aug 2009 10:20:38 +0000 Subject: [PATCH] 2009-08-15 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/none.cf * config/global.cf * config/instsh.cf * config/dirsh.cf ! Fixed minor visual glitch on non-sh shells where some echoed messages were shown inside double quotes. There is only one such but very rare message left in global.cf. * ChangeLog ! Typo in prev entry. * config/dos/djgpp.cf * Changed 'echo.' to 'echo' to make it shell independent just like all other echo commands in the make config files. Pre-2.02 DJGPP distros had an echo.exe, originally I may have added to dots to force using the shell echo instead of this external one. Quick tests made with djecho.exe (the new name of echo.exe) showed it working. Maybe old echo.exe had some bad side effects, I don't remember and ChangeLog entry doesn't have the reason. --- harbour/ChangeLog | 23 ++++++++++++++++++++++- harbour/config/dirsh.cf | 2 +- harbour/config/dos/djgpp.cf | 12 ++++++------ harbour/config/global.cf | 6 ++++++ harbour/config/instsh.cf | 4 ++-- harbour/config/none.cf | 2 +- 6 files changed, 38 insertions(+), 11 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8b93c33275..656f5ffd7c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,10 +17,31 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-08-15 12:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/none.cf + * config/global.cf + * config/instsh.cf + * config/dirsh.cf + ! Fixed minor visual glitch on non-sh shells where some echoed messages + were shown inside double quotes. + There is only one such but very rare message left in global.cf. + + * ChangeLog + ! Typo in prev entry. + + * config/dos/djgpp.cf + * Changed 'echo.' to 'echo' to make it shell independent just like + all other echo commands in the make config files. + Pre-2.02 DJGPP distros had an echo.exe, originally I may have + added to dots to force using the shell echo instead of this external + one. Quick tests made with djecho.exe (the new name of echo.exe) + showed it working. Maybe old echo.exe had some bad side effects, + I don't remember and ChangeLog entry doesn't have the reason. + 2009-08-15 11:48 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg ! Minor fix for darwin and automatic entry function detection using 'nm'. - nm on Darwin doesn't seem to support '--defined-only -C' option. + nm on Darwin doesn't seem to support '--defined-only -C' options. Przemek, please check this, maybe this hurts functionality. 2009-08-15 11:44 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) diff --git a/harbour/config/dirsh.cf b/harbour/config/dirsh.cf index 502abbb6b8..0d1c3723dd 100644 --- a/harbour/config/dirsh.cf +++ b/harbour/config/dirsh.cf @@ -8,7 +8,7 @@ ifneq ($(HB_SHELL),sh) endif ifeq ($(DIRS),) # Empty directory list - DIR_RULE := @echo "! Done" + DIR_RULE := @echo $(ECHOQUOTE)! Done$(ECHOQUOTE) else ifeq ($(HB_SHELL),sh) diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf index 559c240076..0d2c7d6ad2 100644 --- a/harbour/config/dos/djgpp.cf +++ b/harbour/config/dos/djgpp.cf @@ -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/global.cf b/harbour/config/global.cf index 31a7159b37..15fc5546ca 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -419,6 +419,12 @@ endif # endif #endif +ifeq ($(HB_SHELL),sh) + ECHOQUOTE := " +else + ECHOQUOTE := +endif + HB_HOST_CPU := ifeq ($(HB_HOST_ARCH),win) ifeq ($(PROCESSOR_ARCHITECTURE),AMD64) diff --git a/harbour/config/instsh.cf b/harbour/config/instsh.cf index b1f9ba97f4..617fb99d15 100644 --- a/harbour/config/instsh.cf +++ b/harbour/config/instsh.cf @@ -3,10 +3,10 @@ # ifeq ($(INSTALL_FILES),) # Empty install list - INSTALL_RULE := @echo "! Nothing to install" + INSTALL_RULE := @echo $(ECHOQUOTE)! Nothing to install$(ECHOQUOTE) else ifeq ($(INSTALL_DIR),) # Empty install dir - INSTALL_RULE := @echo "! Can't install, install dir isn't set" + INSTALL_RULE := @echo $(ECHOQUOTE)! Can't install, install dir isn't set$(ECHOQUOTE) else ifneq ($(HB_SHELL),sh) diff --git a/harbour/config/none.cf b/harbour/config/none.cf index 4e83e91fb2..ef62641f81 100644 --- a/harbour/config/none.cf +++ b/harbour/config/none.cf @@ -8,7 +8,7 @@ ifneq ($(HB_ARCHITECTURE),) ifneq ($(HB_COMPILER),) ifneq ($(LIBNAME),) - DIR_RULE := @echo "! '$(LIBNAME)' library skipped" + DIR_RULE := @echo $(ECHOQUOTE)! '$(LIBNAME)' library skipped$(ECHOQUOTE) else DIR_RULE := endif