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

2009-07-17 12:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/pp/Makefile
    ! Fixed to delete hbpp.tds.

  * config/globsh.cf
    + Attempt to fix nt shell clean rules. Please test.
    ! Fixed to create bin dir even when lib targets are being
      created. This hack is needed to support existing hack
      inside source/pp/Makefile. If there is any possibility
      to solve current hbpp lib+bin rules in some cleaner ways
      IMO we should do it, but so far I couldn't figure out
      how current method works.
This commit is contained in:
Viktor Szakats
2009-07-17 10:06:27 +00:00
parent e6948aba1f
commit 5cb93fcc29
3 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
harbour/ChangeLog
View File

@@ -17,6 +17,19 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-17 12:05 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/pp/Makefile
! Fixed to delete hbpp.tds.
* config/globsh.cf
+ Attempt to fix nt shell clean rules. Please test.
! Fixed to create bin dir even when lib targets are being
created. This hack is needed to support existing hack
inside source/pp/Makefile. If there is any possibility
to solve current hbpp lib+bin rules in some cleaner ways
IMO we should do it, but so far I couldn't figure out
how current method works.
2009-07-17 11:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/globsh.cf
* Using RM instead of RD in sh clean rules.

26
harbour/config/globsh.cf
View File

@@ -8,13 +8,20 @@
# http://www.robvanderwoude.com/batchcommands.php
# ---------------------------------------------------------------
# NOTE: In dirbase rules, EXE_DIR is intentionally created even
# when a lib is built, so I'm checking for LIB_FILE presence
# instead of EXE_FILE, which would be normal. This is needed
# to support the hack inside source/pp/Makefile. [vszakats]
ifneq ($(HB_SHELL),sh)
DIRSEP = $(subst /,\,\)
OBJ_DIR_OS = $(subst /,\,$(OBJ_DIR))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
EXE_DIR_OS = $(subst /,\,$(EXE_DIR))
EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
endif
@@ -30,7 +37,7 @@ MDP = mkdir -p
dirbase::
@[ -d $(OBJ_DIR) ] || $(MDP) $(OBJ_DIR)
@[ -z $(LIB_FILE) ] || [ -d $(LIB_DIR) ] || $(MDP) $(LIB_DIR)
@[ -z $(EXE_FILE) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
@[ -z $(LIB_FILE) ] || [ -d $(EXE_DIR) ] || $(MDP) $(EXE_DIR)
clean::
-@$(RDP) $(OBJ_DIR) $(LIB_FILE) $(EXE_FILE); \
@@ -65,12 +72,16 @@ MDP = mkdir
dirbase::
-@$(CMDPREF)if not exist $(OBJ_DIR_OS) $(MDP) "$(OBJ_DIR_OS)"
$(if $(LIB_FILE),-@$(CMDPREF)if not exist "$(LIB_DIR_OS)" $(MDP) "$(LIB_DIR_OS)",)
$(if $(EXE_FILE),-@$(CMDPREF)if not exist "$(EXE_DIR_OS)" $(MDP) "$(EXE_DIR_OS)",)
$(if $(LIB_FILE),-@$(CMDPREF)if not exist "$(EXE_DIR_OS)" $(MDP) "$(EXE_DIR_OS)",)
clean::
-@$(CMDPREF)if exist $(OBJ_DIR_OS) $(RDP) "$(OBJ_DIR_OS)"
$(if $(LIB_FILE),-@$(CMDPREF)if exist "$(LIB_DIR_OS)" $(RDP) "$(LIB_DIR_OS)",)
$(if $(EXE_FILE),-@$(CMDPREF)if exist "$(EXE_DIR_OS)" $(RDP) "$(EXE_DIR_OS)",)
$(if $(LIB_FILE),-@$(CMDPREF)if exist "$(LIB_FILE_OS)" $(RM) "$(LIB_FILE_OS)",)
$(if $(LIB_FILE),-@$(CMDPREF)if exist "$(basename $(LIB_FILE_OS)).bak" $(RM) "$(basename $(LIB_FILE_OS)).bak",)
$(if $(LIB_FILE),-@$(CMDPREF)if exist "$(LIB_DIR_OS)" if not exist "$(LIB_DIR_OS)\*" $(RDP) "$(LIB_DIR_OS)",)
$(if $(EXE_FILE),-@$(CMDPREF)if exist "$(EXE_FILE_OS)" $(RM) "$(EXE_FILE_OS)",)
$(if $(EXE_FILE),-@$(CMDPREF)if exist "$(basename $(EXE_FILE_OS)).tds" $(RM) "$(basename $(EXE_FILE_OS)).tds",)
$(if $(EXE_FILE),-@$(CMDPREF)if exist "$(EXE_DIR_OS)" if not exist "$(EXE_DIR_OS)\*" $(RDP) "$(EXE_DIR_OS)",)
endif
@@ -89,7 +100,7 @@ EXE_ARCH_DIR_OS = $(subst /,\,$(EXE_ARCH_DIR))
dirbase::
-for %d in ($(OBJ_BASE) $(OBJ_ARCH_DIR_OS) $(OBJ_DIR_OS)) do if not exist %d $(MD) %d
$(if $(LIB_FILE),-for %d in ($(LIB_ARCH_DIR_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d,)
$(if $(EXE_FILE),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
$(if $(LIB_FILE),-for %d in ($(EXE_ARCH_DIR_OS) $(EXE_DIR_OS)) do if not exist %d $(MD) %d,)
clean::
-if exist $(OBJ_DIR_OS)\*.* $(RM) $(OBJ_DIR_OS)\*.*
@@ -112,13 +123,10 @@ CP = $(TOOL_DIR)dj-cp -f
MD = $(TOOL_DIR)dj-mkdir
MDP = $(TOOL_DIR)dj-mkdir -p
LIB_FILE_OS = $(subst /,\,$(LIB_FILE))
EXE_FILE_OS = $(subst /,\,$(EXE_FILE))
dirbase::
-@$(CMDPREF)if not exist $(OBJ_DIR_OS)\nul $(MDP) $(OBJ_DIR_OS)
$(if $(LIB_FILE),-@$(CMDPREF)if not exist $(LIB_DIR_OS)\nul $(MDP) $(LIB_DIR_OS),)
$(if $(EXE_FILE),-@$(CMDPREF)if not exist $(EXE_DIR_OS)\nul $(MDP) $(EXE_DIR_OS),)
$(if $(LIB_FILE),-@$(CMDPREF)if not exist $(EXE_DIR_OS)\nul $(MDP) $(EXE_DIR_OS),)
clean::
-@$(RDP) $(OBJ_DIR_OS) $(LIB_FILE_OS) $(EXE_FILE_OS)

1
harbour/source/pp/Makefile
View File

@@ -45,3 +45,4 @@ install::
clean::
-$(RM) $(subst /,$(DIRSEP),$(HB_VERHEADER))
-$(RM) $(subst /,$(DIRSEP),$(EXE_DIR)/hbpp$(EXE_EXT))
-$(RM) $(subst /,$(DIRSEP),$(EXE_DIR)/hbpp.tds)