From 35a4c7b9443c980acf0908a5f48f4ceebdc250ac Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sat, 10 Nov 2007 05:07:06 +0000 Subject: [PATCH] 2007-11-10 06:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - contrib/hgf/tests/build_b32.bat + contrib/hgf/tests/bld_b32.bat - contrib/hgf/win32/makefile.bc + contrib/hgf/win32/make_b32.mak - contrib/hgf/win32/makevc.bat + contrib/hgf/win32/make_vc.bat - contrib/hgf/win32/makefile.vc + contrib/hgf/win32/make_vc.mak * contrib/hgf/win32/make_b32.bat - contrib/hbzlib/hrbdll.bc + contrib/hbzlib/make_b32_dll.bat - contrib/hbzlib/dll_b32.bat + contrib/hbzlib/make_b32_dll.mak - contrib/hbzlib/makefile.vc + contrib/hbzlib/make_vc.mak - contrib/hbzlib/makefile.bc + contrib/hbzlib/make_b32.mak * contrib/hbzlib/make_b32.bat * contrib/hbzlib/make_vc.bat * Some non-GNU make file cleanup. --- harbour/ChangeLog | 22 +++++++++++++++++++ harbour/contrib/hbzlib/make_b32.bat | 2 +- .../hbzlib/{makefile.bc => make_b32.mak} | 4 ++-- .../hbzlib/{dll_b32.bat => make_b32_dll.bat} | 2 +- .../hbzlib/{hrbdll.bc => make_b32_dll.mak} | 0 harbour/contrib/hbzlib/make_vc.bat | 2 +- .../hbzlib/{makefile.vc => make_vc.mak} | 0 .../hgf/tests/{build_b32.bat => bld_b32.bat} | 0 harbour/contrib/hgf/win32/make_b32.bat | 2 +- .../hgf/win32/{makefile.bc => make_b32.mak} | 4 ++++ .../hgf/win32/{makevc.bat => make_vc.bat} | 6 ++++- .../hgf/win32/{makefile.vc => make_vc.mak} | 4 ++++ 12 files changed, 41 insertions(+), 7 deletions(-) rename harbour/contrib/hbzlib/{makefile.bc => make_b32.mak} (98%) rename harbour/contrib/hbzlib/{dll_b32.bat => make_b32_dll.bat} (88%) rename harbour/contrib/hbzlib/{hrbdll.bc => make_b32_dll.mak} (100%) rename harbour/contrib/hbzlib/{makefile.vc => make_vc.mak} (100%) rename harbour/contrib/hgf/tests/{build_b32.bat => bld_b32.bat} (100%) rename harbour/contrib/hgf/win32/{makefile.bc => make_b32.mak} (98%) rename harbour/contrib/hgf/win32/{makevc.bat => make_vc.bat} (81%) rename harbour/contrib/hgf/win32/{makefile.vc => make_vc.mak} (99%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c95e0f38cb..a4238f2066 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,28 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-10 06:10 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + - contrib/hgf/tests/build_b32.bat + + contrib/hgf/tests/bld_b32.bat + - contrib/hgf/win32/makefile.bc + + contrib/hgf/win32/make_b32.mak + - contrib/hgf/win32/makevc.bat + + contrib/hgf/win32/make_vc.bat + - contrib/hgf/win32/makefile.vc + + contrib/hgf/win32/make_vc.mak + * contrib/hgf/win32/make_b32.bat + - contrib/hbzlib/hrbdll.bc + + contrib/hbzlib/make_b32_dll.bat + - contrib/hbzlib/dll_b32.bat + + contrib/hbzlib/make_b32_dll.mak + - contrib/hbzlib/makefile.vc + + contrib/hbzlib/make_vc.mak + - contrib/hbzlib/makefile.bc + + contrib/hbzlib/make_b32.mak + * contrib/hbzlib/make_b32.bat + * contrib/hbzlib/make_vc.bat + * Some non-GNU make file cleanup. + 2007-11-10 05:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * make_b32.bat + make_b32.mak diff --git a/harbour/contrib/hbzlib/make_b32.bat b/harbour/contrib/hbzlib/make_b32.bat index 56e14150bb..fc0179edff 100644 --- a/harbour/contrib/hbzlib/make_b32.bat +++ b/harbour/contrib/hbzlib/make_b32.bat @@ -8,7 +8,7 @@ if not exist obj\b32 md obj\b32 :BUILD - make -fmakefile.bc %1 %2 %3 > make_b32.log + make -fmake_b32.mak %1 %2 %3 > make_b32.log if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN if errorlevel 1 goto BUILD_ERR diff --git a/harbour/contrib/hbzlib/makefile.bc b/harbour/contrib/hbzlib/make_b32.mak similarity index 98% rename from harbour/contrib/hbzlib/makefile.bc rename to harbour/contrib/hbzlib/make_b32.mak index 263ab4451e..4bee20f343 100644 --- a/harbour/contrib/hbzlib/makefile.bc +++ b/harbour/contrib/hbzlib/make_b32.mak @@ -20,7 +20,7 @@ OBJ_DIR = obj\b32 LIB_DIR = ..\..\lib\b32 IMPLIB = Implib -BCC32 = Bcc32 @bccw32.cfg +BCC32 = Bcc32 -vi -Ve -6 -R- -H- -5 -OS -w- -O2 -X- -a8 -b -k- TLINK32 = TLink32 TLIB = TLib BRC32 = Brc32 @@ -49,7 +49,7 @@ BOptsAt_ziparddll = $(BLocalOptsAtC32_ziparddll) Dep_zipar = \ $(LIB_DIR)\hbzip.lib -ziparchive : BccW32.cfg $(Dep_zipar) +ziparchive : $(Dep_zipar) echo MakeNode CLEAN: diff --git a/harbour/contrib/hbzlib/dll_b32.bat b/harbour/contrib/hbzlib/make_b32_dll.bat similarity index 88% rename from harbour/contrib/hbzlib/dll_b32.bat rename to harbour/contrib/hbzlib/make_b32_dll.bat index be0a2ae13a..cb29b3182e 100644 --- a/harbour/contrib/hbzlib/dll_b32.bat +++ b/harbour/contrib/hbzlib/make_b32_dll.bat @@ -9,7 +9,7 @@ if not exist obj\dll\b32 md obj\dll\b32 :BUILD - make -fhrbdll.bc %1 %2 %3 > dll_b32.log + make -fmake_b32_dll.mak %1 %2 %3 > dll_b32.log if errorlevel 1 goto BUILD_ERR if "%1" == "clean" goto CLEAN if "%1" == "CLEAN" goto CLEAN diff --git a/harbour/contrib/hbzlib/hrbdll.bc b/harbour/contrib/hbzlib/make_b32_dll.mak similarity index 100% rename from harbour/contrib/hbzlib/hrbdll.bc rename to harbour/contrib/hbzlib/make_b32_dll.mak diff --git a/harbour/contrib/hbzlib/make_vc.bat b/harbour/contrib/hbzlib/make_vc.bat index cb7d3c2d35..79c905a2d2 100644 --- a/harbour/contrib/hbzlib/make_vc.bat +++ b/harbour/contrib/hbzlib/make_vc.bat @@ -8,7 +8,7 @@ if not exist obj\vc md obj\vc :BUILD - nmake -fmakefile.vc %1 %2 %3 > make_vc.log + nmake -fmake_vc.mak %1 %2 %3 > make_vc.log if errorlevel 1 goto BUILD_ERR :BUILD_OK diff --git a/harbour/contrib/hbzlib/makefile.vc b/harbour/contrib/hbzlib/make_vc.mak similarity index 100% rename from harbour/contrib/hbzlib/makefile.vc rename to harbour/contrib/hbzlib/make_vc.mak diff --git a/harbour/contrib/hgf/tests/build_b32.bat b/harbour/contrib/hgf/tests/bld_b32.bat similarity index 100% rename from harbour/contrib/hgf/tests/build_b32.bat rename to harbour/contrib/hgf/tests/bld_b32.bat diff --git a/harbour/contrib/hgf/win32/make_b32.bat b/harbour/contrib/hgf/win32/make_b32.bat index 0dd01f55ad..f898a4dd60 100644 --- a/harbour/contrib/hgf/win32/make_b32.bat +++ b/harbour/contrib/hgf/win32/make_b32.bat @@ -8,7 +8,7 @@ if "%1" == "CLEAN" goto CLEAN :BUILD - make -fmakefile.bc %1 %2 %3 > make_b32.log + make -fmake_b32.mak %1 %2 %3 > make_b32.log if errorlevel 1 goto BUILD_ERR :BUILD_OK diff --git a/harbour/contrib/hgf/win32/makefile.bc b/harbour/contrib/hgf/win32/make_b32.mak similarity index 98% rename from harbour/contrib/hgf/win32/makefile.bc rename to harbour/contrib/hgf/win32/make_b32.mak index 457bac1eee..207d313321 100644 --- a/harbour/contrib/hgf/win32/makefile.bc +++ b/harbour/contrib/hgf/win32/make_b32.mak @@ -1,3 +1,7 @@ +# +# $Id$ +# + # makefile for Borland C/C++ 32 bits # Building of hgfwin32.lib - Harbour GUI framework for Win32 diff --git a/harbour/contrib/hgf/win32/makevc.bat b/harbour/contrib/hgf/win32/make_vc.bat similarity index 81% rename from harbour/contrib/hgf/win32/makevc.bat rename to harbour/contrib/hgf/win32/make_vc.bat index 5d43656106..c084fe6866 100644 --- a/harbour/contrib/hgf/win32/makevc.bat +++ b/harbour/contrib/hgf/win32/make_vc.bat @@ -1,11 +1,15 @@ @echo off +rem +rem $Id$ +rem + SET _LIB=%LIB% SET _PATH=%PATH% SET _INCLUDE=%INCLUDE% SET LIB=C:\COMPILER\VC\LIB;%PATH% SET PATH=C:\COMPILER\VC\BIN;%PATH% SET INCLUDE=..\..\..\INCLUDE;C:\COMPILER\VC\INCLUDE;%_INCLUDE% -nmake /f makefile.vc %1 %2 %3 +nmake /f make_vc.mak %1 %2 %3 SET LIB=%_LIB% SET PATH=%_PATH% SET INCLUDE=%_INCLUDE% diff --git a/harbour/contrib/hgf/win32/makefile.vc b/harbour/contrib/hgf/win32/make_vc.mak similarity index 99% rename from harbour/contrib/hgf/win32/makefile.vc rename to harbour/contrib/hgf/win32/make_vc.mak index cca6e5dd66..2a90478181 100644 --- a/harbour/contrib/hgf/win32/makefile.vc +++ b/harbour/contrib/hgf/win32/make_vc.mak @@ -1,3 +1,7 @@ +# +# $Id$ +# + # makefile for Microsoft Visual C++ 32 bits # Building of hgfwin32.lib - Harbour GUI framework for Win32