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

2009-07-14 21:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* config/dos/global.cf
  * config/win/global.cf
  * config/win/mingw.cf
  * config/linux/global.cf
  * config/os2/gcc.cf
  * config/os2/global.cf
  * config/wce/global.cf
  * config/wce/mingwarm.cf
    * DOS_ARCH_DIR -> HB_ARCH_OS
    * DOS_LIB_DIR  -> LIB_DIR_OS
    * DOS_LIB_ARCH -> LIB_ARCH_OS
    * DOS_LIB_PATH -> LIB_PATH_OS
    * LIB_PATH_DOS -> LIB_PATH_OS
This commit is contained in:
Viktor Szakats
2009-07-14 19:02:31 +00:00
parent 02b2a299bf
commit 0474999908
9 changed files with 79 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
harbour/ChangeLog
View File

@@ -17,6 +17,21 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-14 21:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/dos/global.cf
* config/win/global.cf
* config/win/mingw.cf
* config/linux/global.cf
* config/os2/gcc.cf
* config/os2/global.cf
* config/wce/global.cf
* config/wce/mingwarm.cf
* DOS_ARCH_DIR -> HB_ARCH_OS
* DOS_LIB_DIR -> LIB_DIR_OS
* DOS_LIB_ARCH -> LIB_ARCH_OS
* DOS_LIB_PATH -> LIB_PATH_OS
* LIB_PATH_DOS -> LIB_PATH_OS
2009-07-14 20:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* config/dos/dir.cf
* config/win/dir.cf

20
harbour/config/dos/global.cf
View File

@@ -16,12 +16,12 @@ ifeq ($(SHLVL),) # non-bash
# There is a conflict with the use of '\' and '/' characters
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
# and some DOS commands require '\' (DOS_ARCH_DIR)
# and some DOS commands require '\' (HB_ARCH_OS)
ARCH_DIR = $(subst \,/,$(HB_ARCH))
DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
LIB_PATH_DOS = $(subst /,\,$(LIB_PATH))
DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
HB_ARCH_OS = $(subst /,\,$(HB_ARCH))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_PATH_OS = $(subst /,\,$(LIB_PATH))
LIB_ARCH_OS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -50,13 +50,13 @@ MD = md
RANLIB = ranlib
dirbase::
-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR)) do if not exist %d\nul $(MD) %d
$(if $(LIB_PATH_DOS),-@$(COMSPEC) /Cfor %d in ($(LIB_PATH_DOS) $(DOS_LIB_DIR)) do if not exist %d\nul $(MD) %d,)
-@$(COMSPEC) /Cfor %d in ($(HB_ARCHITECTURE) $(HB_ARCH_OS)) do if not exist %d\nul $(MD) %d
$(if $(LIB_PATH_OS),-@$(COMSPEC) /Cfor %d in ($(LIB_PATH_OS) $(LIB_DIR_OS)) do if not exist %d\nul $(MD) %d,)
clean::
-@$(COMSPEC) /Cfor %f in ($(DOS_ARCH_DIR)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
-@$(COMSPEC) /Cfor %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /Cif exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)
-@$(COMSPEC) /Cfor %f in ($(HB_ARCH_OS)\*.* *.bak *.obj *.o *.tds) do $(RM) %f
-@$(COMSPEC) /Cfor %d in ($(HB_ARCH_OS) $(HB_ARCHITECTURE)) do if exist %d\nul $(RD) %d
$(if $(LIB_ARCH_OS),-@$(COMSPEC) /Cif exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS),)
else # bash

30
harbour/config/linux/global.cf
View File

@@ -13,10 +13,10 @@ HB_GT_LIBS=\
ifeq ($(SHLVL),) # non-bash
ARCH_DIR = $(HB_ARCH)
DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
DOS_LIB_PATH = $(subst /,\,$(LIB_PATH))
DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
HB_ARCH_OS = $(subst /,\,$(HB_ARCH))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_PATH_OS = $(subst /,\,$(LIB_PATH))
LIB_ARCH_OS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
MK = $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -37,12 +37,12 @@ ifeq ($(OS2_SHELL),) # non-OS/2
MV = move
dirbase::
-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)
-@$(COMSPEC) /c if not exist $(HB_ARCH_OS)\. $(MD) $(HB_ARCH_OS)
$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS)\. $(MD) $(LIB_DIR_OS),)
clean::
-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)
-@$(COMSPEC) /c if exist $(HB_ARCH_OS) $(RD) $(HB_ARCH_OS)
$(if $(LIB_ARCH_OS),-@$(COMSPEC) /c if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS),)
else # OS/2
RM = del /n
@@ -54,21 +54,21 @@ else # OS/2
ifeq ($(LIB_PATH),)
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR)) do if not exist %d $(MD) %d
-for %d in ($(HB_ARCHITECTURE) $(HB_ARCH_OS)) do if not exist %d $(MD) %d
clean::
-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(HB_ARCH_OS)\*.* $(RM) $(HB_ARCH_OS)\*.*
-for %d in ($(HB_ARCH_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
else
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR) $(DOS_LIB_PATH) $(DOS_LIB_DIR)) do if not exist %d $(MD) %d
-for %d in ($(HB_ARCHITECTURE) $(HB_ARCH_OS) $(LIB_PATH_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d
clean::
-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH)
-if exist $(HB_ARCH_OS)\*.* $(RM) $(HB_ARCH_OS)\*.*
-for %d in ($(HB_ARCH_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS)
endif

2
harbour/config/os2/gcc.cf
View File

@@ -98,7 +98,7 @@ endif
# We have to use a script to overcome the AR limit of max 850 characters
# in commmand line
define create_library
IF EXIST $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH)
IF EXIST $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS)
echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
for %i in ( *$(OBJ_EXT) ) do @echo ADDMOD %i >> __lib__.tmp
echo SAVE >> __lib__.tmp

32
harbour/config/os2/global.cf
View File

@@ -13,10 +13,10 @@ HB_GT_LIBS=\
ifeq ($(SHLVL),) # non-bash
ARCH_DIR = $(HB_ARCH)
DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
DOS_LIB_PATH = $(subst /,\,$(LIB_PATH))
DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
HB_ARCH_OS = $(subst /,\,$(HB_ARCH))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_PATH_OS = $(subst /,\,$(LIB_PATH))
LIB_ARCH_OS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
MK := $(subst /,\,$(subst \~,~,$(MAKE)))
@@ -37,12 +37,12 @@ ifeq ($(OS2_SHELL),) # non-OS/2
MV = move
dirbase::
-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)
-@$(COMSPEC) /c if not exist $(HB_ARCH_OS)\. $(MD) $(HB_ARCH_OS)
$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS)\. $(MD) $(LIB_DIR_OS),)
clean::
-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)
-@$(COMSPEC) /c if exist $(HB_ARCH_OS) $(RD) $(HB_ARCH_OS)
$(if $(LIB_ARCH_OS),-@$(COMSPEC) /c if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS),)
else # OS/2
RM = del /n
@@ -54,21 +54,21 @@ else # OS/2
ifeq ($(LIB_PATH),)
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR)) do if not exist %d $(MD) %d
-for %d in ($(HB_ARCHITECTURE) $(HB_ARCH_OS)) do if not exist %d $(MD) %d
clean::
-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(HB_ARCH_OS)\*.* $(RM) $(HB_ARCH_OS)\*.*
-for %d in ($(HB_ARCH_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
else
dirbase::
-for %d in ($(HB_ARCHITECTURE) $(DOS_ARCH_DIR) $(DOS_LIB_PATH) $(DOS_LIB_DIR)) do if not exist %d $(MD) %d
-for %d in ($(HB_ARCHITECTURE) $(HB_ARCH_OS) $(LIB_PATH_OS) $(LIB_DIR_OS)) do if not exist %d $(MD) %d
clean::
-if exist $(DOS_ARCH_DIR)\*.* $(RM) $(DOS_ARCH_DIR)\*.*
-for %d in ($(DOS_ARCH_DIR) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH)
-if exist $(HB_ARCH_OS)\*.* $(RM) $(HB_ARCH_OS)\*.*
-for %d in ($(HB_ARCH_OS) $(HB_ARCHITECTURE)) do if exist %d $(RD) %d
-if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS)
endif
@@ -85,7 +85,7 @@ MV = mv -f
MD = mkdir
MDP = mkdir -p
DOS_LIB_ARCH = $(LIB_ARCH)
LIB_ARCH_OS = $(LIB_ARCH)
dirbase::
@[ -d $(ARCH_DIR) ] || $(MDP) $(ARCH_DIR)

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

@@ -24,11 +24,11 @@ ifeq ($(SHLVL),) # non-bash
# There is a conflict with the use of '\' and '/' characters
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
# and some DOS commands require '\' (DOS_ARCH_DIR)
# and some DOS commands require '\' (HB_ARCH_OS)
ARCH_DIR = $(subst \,/,$(HB_ARCH))
DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
HB_ARCH_OS = $(subst /,\,$(HB_ARCH))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_ARCH_OS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -48,12 +48,12 @@ CP = $(COMSPEC) /c copy
MV = move
dirbase::
-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)
-@$(COMSPEC) /c if not exist $(HB_ARCH_OS)\. $(MD) $(HB_ARCH_OS)
$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS)\. $(MD) $(LIB_DIR_OS),)
clean::
-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)
-@$(COMSPEC) /c if exist $(HB_ARCH_OS) $(RD) $(HB_ARCH_OS)
$(if $(LIB_ARCH_OS),-@$(COMSPEC) /c if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS),)
else # bash

6
harbour/config/wce/mingwarm.cf
View File

@@ -89,11 +89,11 @@ RANLIB = $(HB_CCPREFIX)ranlib
ifeq ($(AR_RULE),)
ifeq ($(SHLVL),) # non-bash
DOS_LIB_DIR_ = $(subst /,\,$(LIB_DIR))\$@
LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@
else
DOS_LIB_DIR_ = $(LIB_DIR)/$@
LIB_DIR_OS_ = $(LIB_DIR)/$@
endif
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(DOS_LIB_DIR_)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_)
# our libs have a lot of cross referenced now and we have to group them
# until we won't have cleaned them
LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)

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

@@ -20,11 +20,11 @@ ifeq ($(SHLVL),) # non-bash
# There is a conflict with the use of '\' and '/' characters
# The MAKE requires '/' in filenames (ARCH_DIR) however some compilers
# and some DOS commands require '\' (DOS_ARCH_DIR)
# and some DOS commands require '\' (HB_ARCH_OS)
ARCH_DIR = $(subst \,/,$(HB_ARCH))
DOS_ARCH_DIR = $(subst /,\,$(HB_ARCH))
DOS_LIB_DIR = $(subst /,\,$(LIB_DIR))
DOS_LIB_ARCH = $(subst /,\,$(LIB_ARCH))
HB_ARCH_OS = $(subst /,\,$(HB_ARCH))
LIB_DIR_OS = $(subst /,\,$(LIB_DIR))
LIB_ARCH_OS = $(subst /,\,$(LIB_ARCH))
DIRSEP = $(subst /,\,\)
MK := $(subst \,/,$(subst \~,~,$(MAKE)))
@@ -44,12 +44,12 @@ CP = $(COMSPEC) /c copy
MV = move
dirbase::
-@$(COMSPEC) /c if not exist $(DOS_ARCH_DIR)\. $(MD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_DIR),-@$(COMSPEC) /c if not exist $(DOS_LIB_DIR)\. $(MD) $(DOS_LIB_DIR),)
-@$(COMSPEC) /c if not exist $(HB_ARCH_OS)\. $(MD) $(HB_ARCH_OS)
$(if $(LIB_DIR_OS),-@$(COMSPEC) /c if not exist $(LIB_DIR_OS)\. $(MD) $(LIB_DIR_OS),)
clean::
-@$(COMSPEC) /c if exist $(DOS_ARCH_DIR) $(RD) $(DOS_ARCH_DIR)
$(if $(DOS_LIB_ARCH),-@$(COMSPEC) /c if exist $(DOS_LIB_ARCH) $(RM) $(DOS_LIB_ARCH),)
-@$(COMSPEC) /c if exist $(HB_ARCH_OS) $(RD) $(HB_ARCH_OS)
$(if $(LIB_ARCH_OS),-@$(COMSPEC) /c if exist $(LIB_ARCH_OS) $(RM) $(LIB_ARCH_OS),)
else # bash

6
harbour/config/win/mingw.cf
View File

@@ -96,11 +96,11 @@ RANLIB = $(HB_CCPREFIX)ranlib
ifeq ($(AR_RULE),)
ifeq ($(SHLVL),) # non-bash
DOS_LIB_DIR_ = $(subst /,\,$(LIB_DIR))\$@
LIB_DIR_OS_ = $(subst /,\,$(LIB_DIR))\$@
else
DOS_LIB_DIR_ = $(LIB_DIR)/$@
LIB_DIR_OS_ = $(LIB_DIR)/$@
endif
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(DOS_LIB_DIR_)
AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_OS_)
# our libs have a lot of cross referenced now and we have to group them
# until we won't have cleaned them
LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)