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

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

Browse Source 
* source/pp/Makefile
  * config/header.cf
  * config/darwin/install.cf
  * config/dos/install.cf
  * config/doc.cf
  * config/lib.cf
  * config/win/install.cf
  * config/bin.cf
  * config/linux/install.cf
  * config/os2/install.cf
  * config/sunos/install.cf
  * config/bsd/install.cf
  * config/wce/install.cf
    * INSTALL_OBJS -> INSTALL_FILES
    * INSTALL_DIRSH -> INSTALL_DIR_OS
    * INSTALL_OBJSH, INSTALL_LIST -> INSTALL_FILES_OS
This commit is contained in:
Viktor Szakats
2009-07-14 18:41:35 +00:00
parent 2e1303e9c6
commit 5047203687
14 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
harbour/ChangeLog
View File

@@ -17,6 +17,24 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-14 20:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/pp/Makefile
* config/header.cf
* config/darwin/install.cf
* config/dos/install.cf
* config/doc.cf
* config/lib.cf
* config/win/install.cf
* config/bin.cf
* config/linux/install.cf
* config/os2/install.cf
* config/sunos/install.cf
* config/bsd/install.cf
* config/wce/install.cf
* INSTALL_OBJS -> INSTALL_FILES
* INSTALL_DIRSH -> INSTALL_DIR_OS
* INSTALL_OBJSH, INSTALL_LIST -> INSTALL_FILES_OS
2009-07-14 20:10 UTC+0200 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
* bin/hb-func.sh
* add creation of unver harbour dll links in win/wce builds

2
harbour/config/bin.cf
View File

@@ -39,7 +39,7 @@ $(EXE_NAME) : $(ALL_OBJS)
$(LD_RULE)
INSTALL_OBJS = $(EXE_ARCH)
INSTALL_FILES = $(EXE_ARCH)
INSTALL_DIR = $(HB_BIN_INSTALL)
include $(TOP)$(ROOT)config/install.cf

2
harbour/config/bsd/install.cf
View File

@@ -7,7 +7,7 @@ INSTALL_RULE =\
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

4
harbour/config/darwin/install.cf
View File

@@ -7,7 +7,7 @@ INSTALL_RULE =\
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \
@@ -20,6 +20,6 @@ INSTALL_RULE =\
done; \
if [ $(INSTALL_DIR) = $(HB_LIB_INSTALL) ]; \
then \
$(RANLIB) $(foreach file,$(notdir $(INSTALL_OBJS)),$(INSTALL_DIR)/$(file)); \
$(RANLIB) $(foreach file,$(notdir $(INSTALL_FILES)),$(INSTALL_DIR)/$(file)); \
fi \
fi

2
harbour/config/doc.cf
View File

@@ -13,7 +13,7 @@ ifeq ($(HB_DOC_INSTALL),)
install::
else
INSTALL_OBJS = $(DOC_FILES)
INSTALL_FILES = $(DOC_FILES)
INSTALL_DIR = $(HB_DOC_INSTALL)$(DOC_SUBDIR)
include $(TOP)$(ROOT)config/install.cf

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

@@ -2,7 +2,7 @@
# $Id$
#
ifeq ($(INSTALL_OBJS),) # Empty install list
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
@@ -18,24 +18,24 @@ $(COMSPEC) /Cxcopy /Y /I $(file) $(subst /,\,$(INSTALL_DIR))
endef
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
else # bash
INSTALL_DIRSH = $(subst \,/,$(INSTALL_DIR))
INSTALL_OBJSH = $(subst \,/,$(INSTALL_OBJS))
INSTALL_DIR_OS = $(subst \,/,$(INSTALL_DIR))
INSTALL_FILES_OS = $(subst \,/,$(INSTALL_FILES))
INSTALL_RULE =\
@sh -c 'if [ ! -d $(INSTALL_DIRSH) ]; \
@sh -c 'if [ ! -d $(INSTALL_DIR_OS) ]; \
then \
echo "! Cannot install, path not found: $(INSTALL_DIRSH)" 1>&2; \
echo "! Cannot install, path not found: $(INSTALL_DIR_OS)" 1>&2; \
else \
for i in $(INSTALL_OBJSH); \
for i in $(INSTALL_FILES_OS); \
do \
if [ -r $$i ]; \
then \
echo "! Installing $$i on $(INSTALL_DIRSH)"; \
$(CP) $$i $(INSTALL_DIRSH); \
echo "! Installing $$i on $(INSTALL_DIR_OS)"; \
$(CP) $$i $(INSTALL_DIR_OS); \
true; \
else \
echo "! Cannot install $$i, not found" 1>&2; \

2
harbour/config/header.cf
View File

@@ -15,7 +15,7 @@ ifeq ($(HB_INC_INSTALL),)
install::
else
INSTALL_OBJS = $(ALL_HEADERS)
INSTALL_FILES = $(ALL_HEADERS)
INSTALL_DIR = $(HB_INC_INSTALL)
include $(TOP)$(ROOT)config/install.cf

2
harbour/config/lib.cf
View File

@@ -30,7 +30,7 @@ $(LIB_NAME) : $(ALL_OBJS)
$(AR_RULE)
INSTALL_OBJS = $(LIB_ARCH)
INSTALL_FILES = $(LIB_ARCH)
INSTALL_DIR = $(HB_LIB_INSTALL)
include $(TOP)$(ROOT)config/install.cf

12
harbour/config/linux/install.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
ifeq ($(INSTALL_OBJS),) # Empty install list
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
@@ -12,10 +12,10 @@ ifeq ($(SHLVL),) # non-bash
ifeq ($(OS2_SHELL),) # non-OS/2
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
else # OS/2
@@ -27,8 +27,8 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
endef
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
endif
@@ -40,7 +40,7 @@ INSTALL_RULE =\
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

12
harbour/config/os2/install.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
ifeq ($(INSTALL_OBJS),) # Empty install list
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
@@ -12,10 +12,10 @@ ifeq ($(SHLVL),) # non-bash
ifeq ($(OS2_SHELL),) # non-OS/2
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
else # OS/2
@@ -27,8 +27,8 @@ $(COMSPEC) /C $(CP) $(file) $(subst /,\,$(INSTALL_DIR))
endef
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_RULE = $(foreach file, $(INSTALL_LIST), $(inst_file))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = $(foreach file, $(INSTALL_FILES_OS), $(inst_file))
endif
@@ -40,7 +40,7 @@ INSTALL_RULE =\
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

2
harbour/config/sunos/install.cf
View File

@@ -7,7 +7,7 @@ INSTALL_RULE =\
then \
echo "! Can't install, path not found: $(INSTALL_DIR)" 1>&2; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

8
harbour/config/wce/install.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
ifeq ($(INSTALL_OBJS),) # Empty install list
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
@@ -10,10 +10,10 @@ else
ifeq ($(SHLVL),) # non-bash
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
else # bash
@@ -23,7 +23,7 @@ INSTALL_RULE =\
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

8
harbour/config/win/install.cf
View File

@@ -2,7 +2,7 @@
# $Id$
#
ifeq ($(INSTALL_OBJS),) # Empty install list
ifeq ($(INSTALL_FILES),) # Empty install list
INSTALL_RULE = @echo Done
@@ -10,10 +10,10 @@ else
ifeq ($(SHLVL),) # non-bash
INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
INSTALL_FILES_OS = $(subst /,\,$(INSTALL_FILES))
INSTALL_RULE = \
-$(COMSPEC) /c for %%f in ($(INSTALL_LIST)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
-$(COMSPEC) /c for %%f in ($(INSTALL_FILES_OS)) do copy "%%f" "$(subst /,\,$(INSTALL_DIR))"
else # bash
@@ -23,7 +23,7 @@ INSTALL_RULE =\
echo "! Can't install, path not found: '$(INSTALL_DIR)'" 1>&2; \
false; \
else \
for i in $(INSTALL_OBJS); \
for i in $(INSTALL_FILES); \
do \
if [ -r $$i ]; \
then \

2
harbour/source/pp/Makefile
View File

@@ -35,7 +35,7 @@ pptable.c : hbpp$(EXE_EXT)
endif
ifneq ($(HB_BIN_INSTALL),)
INSTALL_OBJS = $(ARCH_DIR)/hbpp$(EXE_EXT)
INSTALL_FILES = $(ARCH_DIR)/hbpp$(EXE_EXT)
INSTALL_DIR = $(HB_BIN_INSTALL)
HB_INSTALL_DEF=yes
include $(TOP)$(ROOT)config/install.cf