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

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

Browse Source 
* bin/postinst.bat
    ! Fixed for MS-DOS. Again.
      Here ChangeLog again causes some problems.

  * config/globsh.cf
    % Removed some redundancy regarding tool path forming.
This commit is contained in:
Viktor Szakats
2009-07-16 18:04:55 +00:00
parent d9f771d119
commit 46ce9925cf
3 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
harbour/ChangeLog
View File

@@ -17,6 +17,14 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-07-16 20:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* bin/postinst.bat
! Fixed for MS-DOS. Again.
Here ChangeLog again causes some problems.
* config/globsh.cf
% Removed some redundancy regarding tool path forming.
2009-07-16 19:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
- harbour/source/nulrtl
- harbour/source/nulrtl/nulrtl.c

25
harbour/bin/postinst.bat
View File

@@ -22,17 +22,6 @@ echo libpaths=../contrib/rddsql/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
echo libpaths=../addons/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
echo libpaths=../examples/%%{hb_name}>> %HB_BIN_INSTALL%\hbmk.cfg
rem ; Post-build installation
set _HB_COPYCMD=%COPYCMD%
set COPYCMD=/Y
if not "%HB_INSTALL_PREFIX%" == "" copy ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy COPYING "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy TODO "%HB_INSTALL_PREFIX%\" > nul
set COPYCMD=%_HB_COPYCMD%
set _HB_COPYCMD=
goto INST_%HB_ARCHITECTURE%
:INST_WIN
@@ -43,6 +32,13 @@ goto INST_%HB_ARCHITECTURE%
if not "%OS%" == "Windows_NT" echo This Harbour build script requires Windows NT or upper.
if not "%OS%" == "Windows_NT" goto END
rem ; Post-build installation
if not "%HB_INSTALL_PREFIX%" == "" copy ChangeLog* "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy COPYING "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL "%HB_INSTALL_PREFIX%\" > nul
if not "%HB_INSTALL_PREFIX%" == "" copy TODO "%HB_INSTALL_PREFIX%\" > nul
if "%HB_COMPILER%" == "mingw" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingw64" set HB_DYNLIB=yes
if "%HB_COMPILER%" == "mingwarm" set HB_DYNLIB=yes
@@ -77,6 +73,13 @@ goto INST_%HB_ARCHITECTURE%
:INST_DOS
rem ; Post-build installation
if not "%HB_INSTALL_PREFIX%" == "" copy CHANG* %HB_INSTALL_PREFIX%\CHANGES > nul
if not "%HB_INSTALL_PREFIX%" == "" copy COPYING %HB_INSTALL_PREFIX% > nul
if not "%HB_INSTALL_PREFIX%" == "" copy ERRATA %HB_INSTALL_PREFIX% > nul
if not "%HB_INSTALL_PREFIX%" == "" copy INSTALL %HB_INSTALL_PREFIX% > nul
if not "%HB_INSTALL_PREFIX%" == "" copy TODO %HB_INSTALL_PREFIX% > nul
rem DOS post install part
goto END

22
harbour/config/globsh.cf
View File

@@ -12,11 +12,11 @@ ifneq ($(HB_SHELL),bash)
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))
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
@@ -91,13 +91,15 @@ endif
ifeq ($(HB_SHELL),dos)
TOOL_DIR := $(subst /,\,$(TOP)$(ROOT)config/)
MK = $(subst \,/,$(subst \~,~,$(MAKE)))
RM = $(subst /,\,$(TOP)$(ROOT)config/dj-rm.exe) -f
RD = $(subst /,\,$(TOP)$(ROOT)config/dj-rm.exe) -f -r
CP = $(subst /,\,$(TOP)$(ROOT)config/dj-cp.exe) -f
RM = $(TOOL_DIR)dj-rm.exe -f
RD = $(TOOL_DIR)dj-rm.exe -f -r
CP = $(TOOL_DIR)dj-cp.exe -f
MV = move
MD = $(subst /,\,$(TOP)$(ROOT)config/dj-mkdir.exe)
MDP = $(subst /,\,$(TOP)$(ROOT)config/dj-mkdir.exe) -p
MD = $(TOOL_DIR)dj-mkdir.exe
MDP = $(TOOL_DIR)dj-mkdir.exe -p
dirbase::
-@$(CMDPREF)if not exist $(OBJ_DIR_OS)\nul $(MDP) $(OBJ_DIR_OS)