2009-05-12 15:49 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com)

+ contrib/hbwinprn + contrib/hbwinprn/Makefile + contrib/hbwinprn/tests + contrib/hbwinprn/tests/hbwinprn.hbp + contrib/hbwinprn/tests/testprn.prg + contrib/hbwinprn/win_prn1.c + contrib/hbwinprn/win_prn2.c + contrib/hbwinprn/win_tprn.prg - contrib/hbwin/tests/testprn.prg - contrib/hbwin/win_prn1.c - contrib/hbwin/win_prn2.c - contrib/hbwin/win_tprn.prg * bin/hb-func.sh * contrib/hbwin/Makefile * contrib/Makefile * doc/dirstruc.txt * doc/whatsnew.txt * harbour-wce-spec * harbour-win-spec * utils/hbmk2/examples/contribf.hbp * utils/hbmk2/examples/fwh.hbp * utils/hbmk2/examples/hmg.hbp * WIN_PRN windows printing class moved out of "hbwin" lib to a new "hbwinprn" lib
2009-05-12 20:46:24 +00:00
parent 6c4206dd57
commit 626f993574
17 changed files with 87 additions and 15 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -7,6 +7,32 @@
   2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)

   This work is licensed under the Creative Commons Attribution-ShareAlike
+
+2009-05-12 15:49 UTC-0500 Teo Fonrouge (teo/at/windtelsoft/dot/com)
+  + contrib/hbwinprn
+  + contrib/hbwinprn/Makefile
+  + contrib/hbwinprn/tests
+  + contrib/hbwinprn/tests/hbwinprn.hbp
+  + contrib/hbwinprn/tests/testprn.prg
+  + contrib/hbwinprn/win_prn1.c
+  + contrib/hbwinprn/win_prn2.c
+  + contrib/hbwinprn/win_tprn.prg
+  - contrib/hbwin/tests/testprn.prg
+  - contrib/hbwin/win_prn1.c
+  - contrib/hbwin/win_prn2.c
+  - contrib/hbwin/win_tprn.prg
+  * bin/hb-func.sh
+  * contrib/hbwin/Makefile
+  * contrib/Makefile
+  * doc/dirstruc.txt
+  * doc/whatsnew.txt
+  * harbour-wce-spec
+  * harbour-win-spec
+  * utils/hbmk2/examples/contribf.hbp
+  * utils/hbmk2/examples/fwh.hbp
+  * 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,
--- 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 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 hbwinprn gtwvg gtalleg hbsqlit3 hbbtree $HB_USER_LIBS"
        #"hbgf hbgt hbbmcdx hbmisc hbole hbtpathy hbwhat hbziparc hbmsql"
    else
        echo "$@"
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -25,6 +25,7 @@ DIRS=\
 	hbtpathy \
 	hbvpdf \
 	hbwin \
+	hbwinprn \
 	hbziparc \
 	rddado \
 	xhb \
--- a/harbour/contrib/hbwin/Makefile
+++ b/harbour/contrib/hbwin/Makefile
@@ -22,8 +22,6 @@ 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 \
@@ -34,7 +32,6 @@ PRG_SOURCES = \
 	win_os.prg \
 	win_reg.prg \
 	win_tole.prg \
-	win_tprn.prg \
 	win_tprt.prg \

 C_HEADERS = \
--- a/harbour/contrib/hbwinprn/Makefile
+++ b/harbour/contrib/hbwinprn/Makefile
@@ -0,0 +1,36 @@
+#
+# $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
--- a/harbour/contrib/hbwinprn/tests/hbwinprn.hbp
+++ b/harbour/contrib/hbwinprn/tests/hbwinprn.hbp
@@ -0,0 +1,5 @@
+#
+# $Id: hbwin.hbp 10704 2009-03-27 00:55:52Z vszakats $
+#
+
+{win}libs=hbwinprn
--- a/harbour/contrib/hbwinprn/tests/testprn.prg
+++ b/harbour/contrib/hbwinprn/tests/testprn.prg
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: testprn.prg 10170 2009-02-04 08:49:22Z vszakats $
 */

 #define FORM_A4 9
--- a/harbour/contrib/hbwinprn/win_prn1.c
+++ b/harbour/contrib/hbwinprn/win_prn1.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: win_prn1.c 10694 2009-03-25 15:34:09Z vszakats $
 */

 /*
--- a/harbour/contrib/hbwinprn/win_prn2.c
+++ b/harbour/contrib/hbwinprn/win_prn2.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: win_prn2.c 10669 2009-03-21 15:04:43Z druzus $
 */

 /*
--- a/harbour/contrib/hbwinprn/win_tprn.prg
+++ b/harbour/contrib/hbwinprn/win_tprn.prg
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: win_tprn.prg 10694 2009-03-25 15:34:09Z vszakats $
 */

 /*
--- a/harbour/doc/dirstruc.txt
+++ b/harbour/doc/dirstruc.txt
@@ -237,6 +237,10 @@ 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.
 |   |   |
--- a/harbour/doc/whatsnew.txt
+++ b/harbour/doc/whatsnew.txt
@@ -306,6 +306,7 @@ 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.
--- 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 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 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_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 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 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_EXTERNALLIBS=no

 export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL
@@ -347,6 +347,7 @@ 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
--- 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 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 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_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 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 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_EXTERNALLIBS=no

 export _DEFAULT_BIN_DIR=$HB_BIN_INSTALL
@@ -347,6 +347,7 @@ 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
--- 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 rddado
+{win}libs=gtwvg hbblat hbgfwin hbole hbwin hbwinprn rddado
 {win&!dmc}libs=hbwhat
 {linux}libs=hbgfgtk
 {os2}libs=hbgfos2
--- 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
+{win}libs=hbwin hbwinprn
--- 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
+{win}libs=hbmzip hbwin hbwinprn
 # system
 {win}libs=vfw32