diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 65cf572b96..c5cbb03ab9 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,35 @@ past entries belonging to these authors: Viktor Szakats. */ +2009-05-13 07:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * harbour-win-spec + * harbour-wce-spec + * bin/hb-func.sh + * doc/dirstruc.txt + * doc/whatsnew.txt + - contrib/hbwinprn + * contrib/Makefile + * contrib/hbwin/Makefile + + contrib/hbwin/win_prn1.c + + contrib/hbwin/win_prn2.c + + contrib/hbwin/win_tprn.prg + + contrib/hbwin/tests/testprn.prg + * utils/hbmk2/examples/hmg.hbp + * utils/hbmk2/examples/fwh.hbp + * utils/hbmk2/examples/contribf.hbp + ! Undone undiscussed (worsened by recent mailing list problems) + changes done in previous two commits. + The direction in Harbour is that we try to gather all + Windows specific functionality into one contrib (hbwin), + if there is a fault or missing feature we fix it at the + proper place (in this case in hbole) instead of splitting + hbwin lib into pieces. + ; TOFIX: Refix deleted change history for "moved" files. + ; TODO: Move hbole to hbwin and fix missing OLE bits in hbwin. + + * ChangeLog + ! Fixed duplicated header in one of the entries after prev two commits. + 2009-05-12 15:55 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com) * ChangeLog ! Fixed header on ChangeLog @@ -46,15 +75,6 @@ * utils/hbmk2/examples/hmg.hbp * WIN_PRN windows printing class moved out of "hbwin" lib to a new "hbwinprn" lib - License. To view a copy of this license, visit - http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to - Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, - USA. A summary of the license and the full legal text is included - in file: COPYING. If you wish to distribute some or all of this work - under different terms, please contact respective author(s). - The license applies to all entries newer than 2009-04-28 and all - past entries belonging to these authors: Viktor Szakats. -*/ 2009-05-12 18:14 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * utils/hbmk2/hbmk2.prg diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh index e9f51d4230..ddd1b8fb49 100755 --- a/harbour/bin/hb-func.sh +++ b/harbour/bin/hb-func.sh @@ -110,7 +110,7 @@ mk_hbgetlibsctb() then libs="$libs gtwin" fi - echo "$libs hbct hbnf hbmzip hbcrypt hbtip xhb hbgd hbfimage rddsql sddfb sddmy sddpg hbodbc hbpgsql hbmysql hbfbird rddads rddado hbhpdf hbvpdf hbcurl hbwin hbwinprn gtwvg gtalleg hbsqlit3 hbbtree $HB_USER_LIBS" + echo "$libs hbct hbnf hbmzip hbcrypt hbtip xhb hbgd hbfimage rddsql sddfb sddmy sddpg hbodbc hbpgsql hbmysql hbfbird rddads rddado hbhpdf hbvpdf hbcurl hbwin gtwvg gtalleg hbsqlit3 hbbtree $HB_USER_LIBS" #"hbgf hbgt hbbmcdx hbmisc hbole hbtpathy hbwhat hbziparc hbmsql" else echo "$@" diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile index 6d7e2302d5..102eb12352 100644 --- a/harbour/contrib/Makefile +++ b/harbour/contrib/Makefile @@ -25,7 +25,6 @@ DIRS=\ hbtpathy \ hbvpdf \ hbwin \ - hbwinprn \ hbziparc \ rddado \ xhb \ diff --git a/harbour/contrib/hbwin/Makefile b/harbour/contrib/hbwin/Makefile index 4b81afd3f1..4bfc48dbd9 100644 --- a/harbour/contrib/hbwin/Makefile +++ b/harbour/contrib/hbwin/Makefile @@ -22,6 +22,8 @@ C_SOURCES = \ win_misc.c \ win_ole.c \ win_osc.c \ + win_prn1.c \ + win_prn2.c \ win_prt.c \ win_regc.c \ wapi_commctrl.c \ @@ -32,6 +34,7 @@ PRG_SOURCES = \ win_os.prg \ win_reg.prg \ win_tole.prg \ + win_tprn.prg \ win_tprt.prg \ C_HEADERS = \ diff --git a/harbour/contrib/hbwinprn/tests/testprn.prg b/harbour/contrib/hbwin/tests/testprn.prg similarity index 99% rename from harbour/contrib/hbwinprn/tests/testprn.prg rename to harbour/contrib/hbwin/tests/testprn.prg index f478deb0b8..cf85246a53 100644 --- a/harbour/contrib/hbwinprn/tests/testprn.prg +++ b/harbour/contrib/hbwin/tests/testprn.prg @@ -1,5 +1,5 @@ /* - * $Id: testprn.prg 10170 2009-02-04 08:49:22Z vszakats $ + * $Id$ */ #define FORM_A4 9 diff --git a/harbour/contrib/hbwinprn/win_prn1.c b/harbour/contrib/hbwin/win_prn1.c similarity index 99% rename from harbour/contrib/hbwinprn/win_prn1.c rename to harbour/contrib/hbwin/win_prn1.c index b58322dd12..22c40e90fa 100644 --- a/harbour/contrib/hbwinprn/win_prn1.c +++ b/harbour/contrib/hbwin/win_prn1.c @@ -1,5 +1,5 @@ /* - * $Id: win_prn1.c 10694 2009-03-25 15:34:09Z vszakats $ + * $Id$ */ /* diff --git a/harbour/contrib/hbwinprn/win_prn2.c b/harbour/contrib/hbwin/win_prn2.c similarity index 99% rename from harbour/contrib/hbwinprn/win_prn2.c rename to harbour/contrib/hbwin/win_prn2.c index 2a588df6f1..2d3e98794e 100644 --- a/harbour/contrib/hbwinprn/win_prn2.c +++ b/harbour/contrib/hbwin/win_prn2.c @@ -1,5 +1,5 @@ /* - * $Id: win_prn2.c 10669 2009-03-21 15:04:43Z druzus $ + * $Id$ */ /* diff --git a/harbour/contrib/hbwinprn/win_tprn.prg b/harbour/contrib/hbwin/win_tprn.prg similarity index 99% rename from harbour/contrib/hbwinprn/win_tprn.prg rename to harbour/contrib/hbwin/win_tprn.prg index b99f8e4856..eb8ed93462 100644 --- a/harbour/contrib/hbwinprn/win_tprn.prg +++ b/harbour/contrib/hbwin/win_tprn.prg @@ -1,5 +1,5 @@ /* - * $Id: win_tprn.prg 10694 2009-03-25 15:34:09Z vszakats $ + * $Id$ */ /* diff --git a/harbour/contrib/hbwinprn/Makefile b/harbour/contrib/hbwinprn/Makefile deleted file mode 100644 index a8e26d017d..0000000000 --- a/harbour/contrib/hbwinprn/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# $Id: Makefile 10777 2009-04-03 13:47:54Z vszakats $ -# - -ROOT = ../../ - -LIBNAME=hbwinprn - -ifeq ($(HB_WITH_HBWINPRN),) -ifeq ($(HB_ARCHITECTURE),win) -HB_WITH_HBWINPRN=yes -endif -ifeq ($(HB_ARCHITECTURE),wce) -HB_WITH_HBWINPRN=yes -endif -endif - -ifeq ($(HB_WITH_HBWINPRN),yes) - -C_SOURCES = \ - win_prn1.c \ - win_prn2.c \ - -PRG_SOURCES = \ - win_tprn.prg \ - -include $(TOP)$(ROOT)config/header.cf -INSTALL_RULE_HEADERS := $(INSTALL_RULE) -include $(TOP)$(ROOT)config/lib.cf - -install:: - $(INSTALL_RULE_HEADERS) - -else -include $(TOP)$(ROOT)config/none.cf -endif diff --git a/harbour/contrib/hbwinprn/tests/hbwinprn.hbp b/harbour/contrib/hbwinprn/tests/hbwinprn.hbp deleted file mode 100644 index 862b92cdfe..0000000000 --- a/harbour/contrib/hbwinprn/tests/hbwinprn.hbp +++ /dev/null @@ -1,5 +0,0 @@ -# -# $Id: hbwin.hbp 10704 2009-03-27 00:55:52Z vszakats $ -# - -{win}libs=hbwinprn diff --git a/harbour/doc/dirstruc.txt b/harbour/doc/dirstruc.txt index 5cd39ea9d4..0dea7ab021 100644 --- a/harbour/doc/dirstruc.txt +++ b/harbour/doc/dirstruc.txt @@ -237,10 +237,6 @@ track of all files (read the FAQ if you don't know what SVN is). | | | | | +---tests - Test programs. | | -| +---hbwinprn - WIN_PRN Class, specific to printing on Windows -| | | -| | +---tests - Test programs. -| | | +---hbziparc - Compatibility interface with ZipArchive general | | | purpose compression library to work with ZIP files. | | | diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt index e4689610cb..f93a3aa4b8 100644 --- a/harbour/doc/whatsnew.txt +++ b/harbour/doc/whatsnew.txt @@ -306,7 +306,6 @@ Core Contrib ============================= -- WIN_PRN printing class moved out of hbwin lib and placed in hbwinprn lib - hbblat new Blat interface class for Windows (Contributed by Francesco Saverio Giudice). - hbmzip fixed GPF in HB_ZIPDELETEFILE() when file has comment. diff --git a/harbour/harbour-wce-spec b/harbour/harbour-wce-spec index 0483209c57..4f5eb4c748 100644 --- a/harbour/harbour-wce-spec +++ b/harbour/harbour-wce-spec @@ -115,7 +115,7 @@ export HB_XBUILD=wce export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbwinprn 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 HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin 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 HB_EXTERNALLIBS=no make %{?_smp_mflags} @@ -145,7 +145,7 @@ export HB_XBUILD=wce export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbwinprn 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 HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin 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 HB_EXTERNALLIBS=no export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL @@ -347,7 +347,6 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libxhb.a %{_libdir}/%{name}/librddado.a %{_libdir}/%{name}/libhbwin.a -%{_libdir}/%{name}/libhbwinprn.a %{_libdir}/%{name}/libhbvpdf.a %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a diff --git a/harbour/harbour-win-spec b/harbour/harbour-win-spec index 16e93b1fdd..2c284e5b06 100644 --- a/harbour/harbour-win-spec +++ b/harbour/harbour-win-spec @@ -115,7 +115,7 @@ export HB_XBUILD=win export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbwinprn 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 HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin 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 HB_EXTERNALLIBS=no make %{?_smp_mflags} @@ -145,7 +145,7 @@ export HB_XBUILD=win export HB_BIN_INSTALL=%{_bindir} export HB_INC_INSTALL=%{_includedir}/%{name} export HB_LIB_INSTALL=%{_libdir}/%{name} -export HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin hbwinprn 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 HB_CONTRIBLIBS="gtwvg hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbtip hbvpdf hbwin 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 HB_EXTERNALLIBS=no export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL @@ -347,7 +347,6 @@ rm -fR $RPM_BUILD_ROOT %{_libdir}/%{name}/libxhb.a %{_libdir}/%{name}/librddado.a %{_libdir}/%{name}/libhbwin.a -%{_libdir}/%{name}/libhbwinprn.a %{_libdir}/%{name}/libhbvpdf.a %{_libdir}/%{name}/libhbgt.a %{_libdir}/%{name}/libhbbmcdx.a diff --git a/harbour/utils/hbmk2/examples/contribf.hbp b/harbour/utils/hbmk2/examples/contribf.hbp index 89888985cf..873839bf6f 100644 --- a/harbour/utils/hbmk2/examples/contribf.hbp +++ b/harbour/utils/hbmk2/examples/contribf.hbp @@ -15,7 +15,7 @@ libs=hbcurl hbfbird hbgd hbmsql hbmysql hbpgsql sddfb sddmy sddpg {!pocc&!xcc&!dmc&!owatcom}libs=gtalleg {!dos}libs=hbapollo hbfimage hbhpdf hbssl hbtip rddads {linux|win|os2}libs=hbtpathy -{win}libs=gtwvg hbblat hbgfwin hbole hbwin hbwinprn rddado +{win}libs=gtwvg hbblat hbgfwin hbole hbwin rddado {win&!dmc}libs=hbwhat {linux}libs=hbgfgtk {os2}libs=hbgfos2 diff --git a/harbour/utils/hbmk2/examples/fwh.hbp b/harbour/utils/hbmk2/examples/fwh.hbp index 223341b19a..18a06255d1 100644 --- a/harbour/utils/hbmk2/examples/fwh.hbp +++ b/harbour/utils/hbmk2/examples/fwh.hbp @@ -13,4 +13,4 @@ {win}libs=fiveh fivehc {win}libs=nddeapi iphlpapi rasapi32 odbc32 -{win}libs=hbwin hbwinprn +{win}libs=hbwin diff --git a/harbour/utils/hbmk2/examples/hmg.hbp b/harbour/utils/hbmk2/examples/hmg.hbp index fe650267a3..7756870111 100644 --- a/harbour/utils/hbmk2/examples/hmg.hbp +++ b/harbour/utils/hbmk2/examples/hmg.hbp @@ -19,6 +19,6 @@ # contribs {win}libs=crypt edit editex graph ini report # Harbour contribs -{win}libs=hbmzip hbwin hbwinprn +{win}libs=hbmzip hbwin # system {win}libs=vfw32