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

2009-08-21 15:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/globsh.mk
    ! Restored backslashes for GNU rm command for os2 shell.
      It turns out rm needs backslashes in filenames (on contrary 
      to mkdir which needs forward slashes.) Not terribly consistent.
      BTW they came from same packages.
      Thanks to Maurilio Longo for the information.

  * source/pp/Makefile
    ! Readded empty line after pptable rule.
      I couldn't find the reason why this was needed, anyhow
      without it the dynamic hbpp obj deletion didn't work.
      Which GNU Make syntax rules am I forgetting? Any hints?

    ; TOFIX: Another issue has shown its ugly head, here clean
             in hbpp shows error message from 'del' command on
             nt shell deleting the .exe (and .tds), despite the
             file is there and we're doing wildcard check too.
             Ideas are welcome. This worked a few days ago.
This commit is contained in:
Viktor Szakats
2009-08-21 14:08:03 +00:00
parent 8c65f4fab8
commit e68440e238
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -18,6 +18,13 @@
*/
2009-08-21 15:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/globsh.mk
! Restored backslashes for GNU rm command for os2 shell.
It turns out rm needs backslashes in filenames (on contrary
to mkdir which needs forward slashes.) Not terribly consistent.
BTW they came from same packages.
Thanks to Maurilio Longo for the information.
* source/pp/Makefile
! Readded empty line after pptable rule.
I couldn't find the reason why this was needed, anyhow

21
harbour/config/globsh.mk
View File

@@ -104,6 +104,11 @@ endif
ifeq ($(HB_SHELL),os2)
# NOTE: Comment on included GNU tools:
# os2-mkdir expects forward slashes, while
# os2-rm expects backslashes in filenames.
# [vszakats]
MK := $(subst \,/,$(MAKE))
RM := del /n
RDP := $(TOOL_DIR)os2-rm -fr
@@ -120,14 +125,14 @@ dirbase::
$(if $(DYN_FILE),-@$(MDP) $(DYN_DIR),)
clean::
-@$(RDP) $(PKG_DIR) $(OBJ_DIR) $(LIB_FILE) $(BIN_FILE)
$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE)).bak,)
$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR)),)
$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE)).tds,)
$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR)),)
$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE)).def,)
$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE)).exp,)
$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR)),)
-@$(RDP) $(PKG_DIR_OS) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(BIN_FILE_OS)
$(if $(LIB_FILE),-@$(RM) $(basename $(LIB_FILE_OS)).bak,)
$(if $(LIB_FILE),$(if $(wildcard $(LIB_DIR)/*.*),,-@$(RDP) $(LIB_DIR_OS)),)
$(if $(BIN_FILE),-@$(RM) $(basename $(BIN_FILE_OS)).tds,)
$(if $(BIN_FILE),$(if $(wildcard $(BIN_DIR)/*.*),,-@$(RDP) $(BIN_DIR_OS)),)
$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).def,)
$(if $(DYN_FILE),-@$(RM) $(basename $(DYN_FILE_OS)).exp,)
$(if $(DYN_FILE),$(if $(wildcard $(DYN_DIR)/*.*),,-@$(RDP) $(DYN_DIR_OS)),)
endif