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

2009-07-03 11:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/win/global.cf
  * config/wce/global.cf
    - Removed pre-NT compatibility.
    % Hidden build dir creation/deletion for a cleaner build log.
This commit is contained in:
Viktor Szakats
2009-07-03 09:59:00 +00:00
parent 6276c852a7
commit 5377655895
3 changed files with 26 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
harbour/ChangeLog
View File

@@ -17,6 +17,12 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-03 11:56 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/win/global.cf
* config/wce/global.cf
- Removed pre-NT compatibility.
% Hidden build dir creation/deletion for a cleaner build log.
2009-07-03 09:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* contrib/hbct/screen2.c
* contrib/hbct/token2.c

52
harbour/config/wce/global.cf
View File

@@ -26,7 +26,7 @@ ifeq ($(HB_DYNLIB),yes)
HB_CDYNLIB=-DHB_DYNLIB
endif
ifeq ($(SHLVL),) # COMMAND.COM
ifeq ($(SHLVL),) # NT Shell
# There is a conflict with the use of '\' and '/' characters
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
@@ -34,7 +34,6 @@ ifeq ($(SHLVL),) # COMMAND.COM
ARCH_DIR = $(subst \,/,$(HB_ARCH))
ARCH_DOS = $(subst /,\,$(HB_ARCH))
LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
LIB_ARCH_DOS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
@@ -42,56 +41,25 @@ MK := $(subst \,/,$(subst \~,~,$(MAKE)))
ifneq ($(ComSpec),)
COMSPEC := $(ComSpec)
endif
ifeq ($(COMSPEC),) #location of command.com
ifeq ($(OS),Windows_NT)
else
ifeq ($(COMSPEC),)
COMSPEC := cmd.exe
else
COMSPEC := command.com
endif
endif
ifeq ($(findstring cmd.exe,$(COMSPEC)),cmd.exe)
CMD_EXE := yes
else
CMD_EXE := no
endif
RM = del
RD = rmdir
MD = md
CP = $(COMSPEC) /C copy
MV = move
ifeq ($(CMD_EXE),yes)
RM = del /q /f
RD = rmdir /q /s
MD = mkdir
CP = $(COMSPEC) /c copy
MV = move
dirbase::
-@$(COMSPEC) /c \
for %d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %d\. $(MD) %d
$(if $(LIB_PATH_DOS),-@$(COMSPEC) /c \
for %d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %d\. $(MD) %d,)
-@$(COMSPEC) /c @if not exist $(ARCH_DOS)\. $(MD) $(ARCH_DOS)
$(if $(LIB_DIR_DOS),-@$(COMSPEC) /c @if not exist $(LIB_DIR_DOS)\. $(MD) $(LIB_DIR_DOS),)
clean::
-@$(COMSPEC) /c \
if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
else # command.com
dirbase::
-@for %%d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %%d\nul $(MD) %%d
$(if $(LIB_PATH_DOS),-@for %%d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %%d\nul $(MD) %%d,)
clean::
-@for %%f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %%f
-@for %%d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %%d\nul $(RD) %%d
$(if $(LIB_ARCH_DOS),-@if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
endif
-@$(COMSPEC) /c @if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c @if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
else # bash

52
harbour/config/win/global.cf
View File

@@ -22,7 +22,7 @@ ifeq ($(HB_DYNLIB),yes)
HB_CDYNLIB=-DHB_DYNLIB
endif
ifeq ($(SHLVL),) # COMMAND.COM
ifeq ($(SHLVL),) # NT Shell
# There is a conflict with the use of '\' and '/' characters
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
@@ -30,7 +30,6 @@ ifeq ($(SHLVL),) # COMMAND.COM
ARCH_DIR = $(subst \,/,$(HB_ARCH))
ARCH_DOS = $(subst /,\,$(HB_ARCH))
LIB_DIR_DOS = $(subst /,\,$(LIB_DIR))
LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
LIB_ARCH_DOS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
@@ -38,56 +37,25 @@ MK := $(subst \,/,$(subst \~,~,$(MAKE)))
ifneq ($(ComSpec),)
COMSPEC := $(ComSpec)
endif
ifeq ($(COMSPEC),) #location of command.com
ifeq ($(OS),Windows_NT)
else
ifeq ($(COMSPEC),)
COMSPEC := cmd.exe
else
COMSPEC := command.com
endif
endif
ifeq ($(findstring cmd.exe,$(COMSPEC)),cmd.exe)
CMD_EXE := yes
else
CMD_EXE := no
endif
RM = del
RD = rmdir
MD = md
CP = $(COMSPEC) /C copy
MV = move
ifeq ($(CMD_EXE),yes)
RM = del /q /f
RD = rmdir /q /s
MD = mkdir
CP = $(COMSPEC) /c copy
MV = move
dirbase::
-@$(COMSPEC) /c \
for %d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %d\. $(MD) %d
$(if $(LIB_PATH_DOS),-@$(COMSPEC) /c \
for %d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %d\. $(MD) %d,)
-@$(COMSPEC) /c @if not exist $(ARCH_DOS)\. $(MD) $(ARCH_DOS)
$(if $(LIB_DIR_DOS),-@$(COMSPEC) /c @if not exist $(LIB_DIR_DOS)\. $(MD) $(LIB_DIR_DOS),)
clean::
-@$(COMSPEC) /c \
if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
else # command.com
dirbase::
-@for %%d in ($(HB_ARCHITECTURE) $(ARCH_DOS)) do if not exist %%d\nul $(MD) %%d
$(if $(LIB_PATH_DOS),-@for %%d in ($(LIB_PATH_DOS) $(LIB_DIR_DOS)) do if not exist %%d\nul $(MD) %%d,)
clean::
-@for %%f in ($(ARCH_DOS)\*.* *.bak *.obj *.o *.tds) do $(RM) %%f
-@for %%d in ($(ARCH_DOS) $(HB_ARCHITECTURE)) do if exist %%d\nul $(RD) %%d
$(if $(LIB_ARCH_DOS),-@if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
endif
-@$(COMSPEC) /c @if exist $(ARCH_DOS) $(RD) $(ARCH_DOS)
$(if $(LIB_ARCH_DOS),-@$(COMSPEC) /c @if exist $(LIB_ARCH_DOS) $(RM) $(LIB_ARCH_DOS),)
else # bash