diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 429fade56f..a8c4ff0604 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,27 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-08 14:03 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_b32.bat + * make_vc.bat + * contrib/mtpl_b32.bat + * contrib/mtpl_gcc.sh + * contrib/mtpl_vc.bat + * Sync with GNU make system: + HB_MAKE_FLAGS -> MK_USR + ; TOFIX: Maybe it's a good time now to resolve the missing HB_ + prefixes for C_USR, L_USR, A_USR, MK_USR. + If there are no objections / better ideas I'd like + to make these changes: + HB_USER_LIBS -> HB_USR_LIBS + PRG_USR -> HB_USR_PRG + C_USR -> HB_USR_C + L_USR -> HB_USR_LINK (or HB_USR_L ?) + A_USR -> HB_USR_LIB (or HB_USR_A ?) + MK_USR -> HB_USR_MAKE (or HB_USR_MAK ?) + As an option we may keep the old names for + compatibility to give some transition time. + 2008-11-08 13:55 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * source/vm/set.c ! _SET_EVENTMASK RTE removed to be Clipper compatible. diff --git a/harbour/contrib/mtpl_b32.bat b/harbour/contrib/mtpl_b32.bat index 9766ba483a..be9acc8834 100644 --- a/harbour/contrib/mtpl_b32.bat +++ b/harbour/contrib/mtpl_b32.bat @@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats] rem rem Set any of the below settings to customize your build process: rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= +rem set MK_USR= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT @@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/contrib/mtpl_gcc.sh b/harbour/contrib/mtpl_gcc.sh index dcec3a887e..d51f60967d 100755 --- a/harbour/contrib/mtpl_gcc.sh +++ b/harbour/contrib/mtpl_gcc.sh @@ -21,7 +21,7 @@ # # export any of the below settings to customize your build process: # export HB_MAKE_PROGRAM= -# export HB_MAKE_FLAGS= +# export MK_USR= # --------------------------------------------------------------- if [ -z "$HB_ARCHITECTURE" ]; then @@ -63,7 +63,7 @@ export HB_EXIT_LEVEL= [ -z "$CC" ] && export CC="gcc" [ -z "$LD" ] && export LD="gcc" -${_HB_MAKE_PROGRAM} ${HB_MAKE_FLAGS} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1 +${_HB_MAKE_PROGRAM} ${MK_USR} -f ${_HB_MAKEFILE} $1 $2 $3 || export HB_EXIT_LEVEL=1 # --------------------------------------------------------------- diff --git a/harbour/contrib/mtpl_vc.bat b/harbour/contrib/mtpl_vc.bat index da6581572c..a17e8b8e80 100644 --- a/harbour/contrib/mtpl_vc.bat +++ b/harbour/contrib/mtpl_vc.bat @@ -12,7 +12,7 @@ rem this batch file from your customized one. [vszakats] rem rem Set any of the below settings to customize your build process: rem set HB_MAKE_PROGRAM= -rem set HB_MAKE_FLAGS= +rem set MK_USR= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -37,14 +37,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad %_HB_MAKELOG% goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > %_HB_MAKELOG% if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT @@ -53,7 +53,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/make_b32.bat b/harbour/make_b32.bat index 9e4634c367..e756a8356b 100644 --- a/harbour/make_b32.bat +++ b/harbour/make_b32.bat @@ -17,7 +17,7 @@ rem set HB_BUILD_VERBOSE=no rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= -rem set HB_MAKE_FLAGS= +rem set MK_USR= rem --------------------------------------------------------------- set _HB_CC_NAME=%HB_CC_NAME% @@ -47,14 +47,14 @@ if "%1" == "INSTALL" goto INSTALL :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul @@ -63,7 +63,7 @@ if "%1" == "INSTALL" goto INSTALL :INSTALL - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %MK_USR% -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT diff --git a/harbour/make_vc.bat b/harbour/make_vc.bat index 86a8bb757c..04725f31ed 100644 --- a/harbour/make_vc.bat +++ b/harbour/make_vc.bat @@ -17,7 +17,7 @@ rem set HB_BUILD_VERBOSE=no rem set HB_REBUILD_PARSER=yes rem set HB_MAKE_PROGRAM= rem set HB_SHOW_ERRORS= -rem set HB_MAKE_FLAGS= +rem set MK_USR= rem rem To create a WinCE build, use the following settings: rem set HB_BUILD_WINCE=yes @@ -83,14 +83,14 @@ rem --------------------------------------------------------------- :BUILD - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% %1 %2 %3 > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 if not "%HB_SHOW_ERRORS%" == "no" notepad make_%_HB_CC_NAME%.log goto EXIT :CLEAN - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% CLEAN > make_%_HB_CC_NAME%.log if errorlevel 1 set HB_EXIT_LEVEL=1 if errorlevel 1 goto EXIT if exist make_%_HB_CC_NAME%.log del make_%_HB_CC_NAME%.log > nul @@ -99,7 +99,7 @@ rem --------------------------------------------------------------- :INSTALL - %_HB_MAKE_PROGRAM% %HB_MAKE_FLAGS% -nologo -f %_HB_MAKEFILE% INSTALL > nul + %_HB_MAKE_PROGRAM% %MK_USR% -nologo -f %_HB_MAKEFILE% INSTALL > nul if errorlevel 1 set HB_EXIT_LEVEL=1 goto EXIT