From c212e5cc79b9195f116e970beadab4a6fba966df Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 3 Sep 2008 14:11:44 +0000 Subject: [PATCH] 2008-09-03 16:02 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * harbour-ce-spec * make_deb.sh * harbour-w32-spec * harbour.spec * contrib/Makefile * contrib/make_b32_all.bat * contrib/make_gcc_all.sh * contrib/make_vc_all.bat + contrib/hbziparc - contrib/hbziparch + hbziparc readded to default contrib list, as it creates no more harm now. ; NOTE: And now that this is about ready, we might step forward to develop a .7z interface ;) --- harbour/ChangeLog | 16 ++++++++++++++++ harbour/contrib/Makefile | 2 +- harbour/contrib/{hbziparch => hbziparc}/Makefile | 0 .../contrib/{hbziparch => hbziparc}/common.mak | 0 .../contrib/{hbziparch => hbziparc}/hbziparc.prg | 0 .../contrib/{hbziparch => hbziparc}/hbzipold.cpp | 0 .../contrib/{hbziparch => hbziparc}/make_b32.bat | 0 .../contrib/{hbziparch => hbziparc}/make_gcc.sh | 0 .../contrib/{hbziparch => hbziparc}/make_vc.bat | 0 .../{hbziparch => hbziparc}/tests/bld_b32.bat | 0 .../{hbziparch => hbziparc}/tests/bld_vc.bat | 0 .../{hbziparch => hbziparc}/tests/unzipa.prg | 0 .../{hbziparch => hbziparc}/tests/zipa.prg | 0 harbour/contrib/make_b32_all.bat | 4 ++-- harbour/contrib/make_gcc_all.sh | 4 ++-- harbour/contrib/make_vc_all.bat | 4 ++-- harbour/harbour-ce-spec | 5 +++-- harbour/harbour-w32-spec | 5 +++-- harbour/harbour.spec | 3 ++- harbour/make_deb.sh | 2 +- 20 files changed, 32 insertions(+), 13 deletions(-) rename harbour/contrib/{hbziparch => hbziparc}/Makefile (100%) rename harbour/contrib/{hbziparch => hbziparc}/common.mak (100%) rename harbour/contrib/{hbziparch => hbziparc}/hbziparc.prg (100%) rename harbour/contrib/{hbziparch => hbziparc}/hbzipold.cpp (100%) rename harbour/contrib/{hbziparch => hbziparc}/make_b32.bat (100%) rename harbour/contrib/{hbziparch => hbziparc}/make_gcc.sh (100%) rename harbour/contrib/{hbziparch => hbziparc}/make_vc.bat (100%) rename harbour/contrib/{hbziparch => hbziparc}/tests/bld_b32.bat (100%) rename harbour/contrib/{hbziparch => hbziparc}/tests/bld_vc.bat (100%) rename harbour/contrib/{hbziparch => hbziparc}/tests/unzipa.prg (100%) rename harbour/contrib/{hbziparch => hbziparc}/tests/zipa.prg (100%) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6cfa192215..b469364093 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,22 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-09-03 16:02 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * harbour-ce-spec + * make_deb.sh + * harbour-w32-spec + * harbour.spec + * contrib/Makefile + * contrib/make_b32_all.bat + * contrib/make_gcc_all.sh + * contrib/make_vc_all.bat + + contrib/hbziparc + - contrib/hbziparch + + hbziparc readded to default contrib list, as it + creates no more harm now. + ; NOTE: And now that this is about ready, we might + step forward to develop a .7z interface ;) + 2008-09-03 15:47 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * contrib/hbziparch/Makefile * contrib/hbziparch/common.mak diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 40cc28e537..227af89601 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -25,12 +25,12 @@ DIRS=\ hbtpathy \ hbvpdf \ hbw32 \ + hbziparc \ rddado \ xhb \ # hbsqlit2 \ # hbwhat32 \ -# hbziparch \ # contribs with external dependencies DIRS +=\ diff --git a/harbour/contrib/hbziparch/Makefile b/harbour/contrib/hbziparc/Makefile similarity index 100% rename from harbour/contrib/hbziparch/Makefile rename to harbour/contrib/hbziparc/Makefile diff --git a/harbour/contrib/hbziparch/common.mak b/harbour/contrib/hbziparc/common.mak similarity index 100% rename from harbour/contrib/hbziparch/common.mak rename to harbour/contrib/hbziparc/common.mak diff --git a/harbour/contrib/hbziparch/hbziparc.prg b/harbour/contrib/hbziparc/hbziparc.prg similarity index 100% rename from harbour/contrib/hbziparch/hbziparc.prg rename to harbour/contrib/hbziparc/hbziparc.prg diff --git a/harbour/contrib/hbziparch/hbzipold.cpp b/harbour/contrib/hbziparc/hbzipold.cpp similarity index 100% rename from harbour/contrib/hbziparch/hbzipold.cpp rename to harbour/contrib/hbziparc/hbzipold.cpp diff --git a/harbour/contrib/hbziparch/make_b32.bat b/harbour/contrib/hbziparc/make_b32.bat similarity index 100% rename from harbour/contrib/hbziparch/make_b32.bat rename to harbour/contrib/hbziparc/make_b32.bat diff --git a/harbour/contrib/hbziparch/make_gcc.sh b/harbour/contrib/hbziparc/make_gcc.sh similarity index 100% rename from harbour/contrib/hbziparch/make_gcc.sh rename to harbour/contrib/hbziparc/make_gcc.sh diff --git a/harbour/contrib/hbziparch/make_vc.bat b/harbour/contrib/hbziparc/make_vc.bat similarity index 100% rename from harbour/contrib/hbziparch/make_vc.bat rename to harbour/contrib/hbziparc/make_vc.bat diff --git a/harbour/contrib/hbziparch/tests/bld_b32.bat b/harbour/contrib/hbziparc/tests/bld_b32.bat similarity index 100% rename from harbour/contrib/hbziparch/tests/bld_b32.bat rename to harbour/contrib/hbziparc/tests/bld_b32.bat diff --git a/harbour/contrib/hbziparch/tests/bld_vc.bat b/harbour/contrib/hbziparc/tests/bld_vc.bat similarity index 100% rename from harbour/contrib/hbziparch/tests/bld_vc.bat rename to harbour/contrib/hbziparc/tests/bld_vc.bat diff --git a/harbour/contrib/hbziparch/tests/unzipa.prg b/harbour/contrib/hbziparc/tests/unzipa.prg similarity index 100% rename from harbour/contrib/hbziparch/tests/unzipa.prg rename to harbour/contrib/hbziparc/tests/unzipa.prg diff --git a/harbour/contrib/hbziparch/tests/zipa.prg b/harbour/contrib/hbziparc/tests/zipa.prg similarity index 100% rename from harbour/contrib/hbziparch/tests/zipa.prg rename to harbour/contrib/hbziparc/tests/zipa.prg diff --git a/harbour/contrib/make_b32_all.bat b/harbour/contrib/make_b32_all.bat index 3348ae9638..8e575d5a89 100644 --- a/harbour/contrib/make_b32_all.bat +++ b/harbour/contrib/make_b32_all.bat @@ -39,7 +39,7 @@ rem ******************************************************* rem Compiling contrib dirs ... rem ******************************************************* -rem hbsqlit2 hbwhat32 hbziparch +rem hbsqlit2 hbwhat32 set _HB_DIRS=gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 @@ -47,7 +47,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 +set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index ec6ff62bd8..f6632b55b6 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -40,11 +40,11 @@ fi #************************************************************** # hbsqlit2 -_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbsqlit3 hbtpathy hbvpdf xhb" +_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbtip hbsqlit3 hbtpathy hbvpdf hbziparc xhb" case "$HB_ARCHITECTURE" in w32|cyg|os2) - # hbwhat32 hbziparch + # hbwhat32 _HB_DIRS_ADD="gtwvg hbole hbodbc hbw32 rddado" ;; *) diff --git a/harbour/contrib/make_vc_all.bat b/harbour/contrib/make_vc_all.bat index 870581e5c6..3d64089385 100644 --- a/harbour/contrib/make_vc_all.bat +++ b/harbour/contrib/make_vc_all.bat @@ -39,7 +39,7 @@ rem ******************************************************* rem Compiling contrib dirs ... rem ******************************************************* -rem hbsqlit2 hbwhat32 hbziparch +rem hbsqlit2 hbwhat32 set _HB_DIRS=gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 @@ -47,7 +47,7 @@ for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 set _HB_DIRS=hbmsql hbmzip hbnf hbodbc hbole hbsqlit3 for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 -set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 +set _HB_DIRS=hbtip hbtpathy hbvpdf hbw32 hbziparc for %%n in ( %_HB_DIRS% ) do %COMSPEC% /c %_HB_BATWORKER% %%n %1 %2 %3 %4 %5 %6 %7 %8 %9 set _HB_DIRS=rddado xhb diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index f5d9f9973b..9b19b2c0e0 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -117,7 +117,7 @@ export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r @@ -148,7 +148,7 @@ export HB_GT_LIB=gtwvt export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -347,6 +347,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a %{_libdir}/%{name}/libhbclipsm.a +%{_libdir}/%{name}/libhbziparc.a %defattr(755,root,root,755) %{_libdir}/%{name}/*.dll diff --git a/harbour/harbour-w32-spec b/harbour/harbour-w32-spec index 9dc1776df1..5efa44c0b2 100644 --- a/harbour/harbour-w32-spec +++ b/harbour/harbour-w32-spec @@ -117,7 +117,7 @@ export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" make -r @@ -148,7 +148,7 @@ export HB_GT_LIB=gtwin export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="hbct hbmzip hbtip xhb hbbtree hbmisc hbvpdf hbgt hbbmcdx hbclipsm gtwvg hbw32 rddado %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbw32 hbziparc rddado xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL export _DEFAULT_INC_DIR=$HB_INC_INSTALL @@ -346,6 +346,7 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a %{_libdir}/%{name}/libhbclipsm.a +%{_libdir}/%{name}/libhbziparc.a %defattr(755,root,root,755) %{_libdir}/%{name}/*.dll diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 717d32f273..a84c88ad8b 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -80,7 +80,7 @@ %define hb_idir export HB_INC_INSTALL=%{_includedir}/%{name} %define hb_ldir export HB_LIB_INSTALL=%{_libdir}/%{name} %define hb_cmrc export HB_COMMERCE=%{?_without_gpllib:yes} -%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" +%define hb_ctrb export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb %{!?_without_nf:hbnf} %{?_with_odbc:hbodbc} %{?_with_curl:hbcurl} %{?_with_hbhpdf:hbhpdf} %{?_with_ads:rddads} %{?_with_gd:hbgd} %{?_with_pgsql:hbpgsql} %{?_with_mysql:hbmysql} %{?_with_allegro:gtalleg}" %define hb_env %{hb_arch} ; %{hb_cc} ; %{hb_cflag} ; %{hb_lflag} ; %{hb_mt} ; %{hb_gt} ; %{hb_defgt} ; %{hb_gpm} ; %{hb_crs} ; %{hb_sln} ; %{hb_x11} ; %{hb_bdir} ; %{hb_idir} ; %{hb_ldir} ; %{hb_ctrb} ; %{hb_cmrc} %define hb_host www.harbour-project.org %define readme README.RPM @@ -646,6 +646,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/%{name}/libhbmsql.a %{_libdir}/%{name}/libhbsqlit3.a %{_libdir}/%{name}/libhbtpathy.a +%{_libdir}/%{name}/libhbziparc.a %files lib %defattr(755,root,root,755) diff --git a/harbour/make_deb.sh b/harbour/make_deb.sh index a4b3378fc7..73dd563f41 100755 --- a/harbour/make_deb.sh +++ b/harbour/make_deb.sh @@ -47,7 +47,7 @@ then export HB_WITHOUT_X11=yes fi -export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbsqlit3 hbtip hbtpathy hbvpdf xhb" +export HB_CONTRIBLIBS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbmzip hbnf hbsqlit3 hbtip hbtpathy hbvpdf hbziparc xhb" if [ ! -f "/usr/include/hpdf.h" ] && \ [ ! -f "/usr/local/include/hpdf.h" ]