fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-05-13 07:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu)

Browse Source 
* 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.
This commit is contained in:
Viktor Szakats
2009-05-13 05:47:20 +00:00
parent e19f745dc0
commit dcae25d6f6
17 changed files with 44 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
harbour/ChangeLog
View File

@@ -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

2
harbour/bin/hb-func.sh
View File

@@ -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 "$@"

1
harbour/contrib/Makefile
View File

@@ -25,7 +25,6 @@ DIRS=\
hbtpathy \
hbvpdf \
hbwin \
hbwinprn \
hbziparc \
rddado \
xhb \

3
harbour/contrib/hbwin/Makefile
View File

@@ -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 = \

2
harbour/contrib/hbwinprn/tests/testprn.prg → harbour/contrib/hbwin/tests/testprn.prg
View File

@@ -1,5 +1,5 @@
/*
* $Id: testprn.prg 10170 2009-02-04 08:49:22Z vszakats $
* $Id$
*/
#define FORM_A4 9

2
harbour/contrib/hbwinprn/win_prn1.c → harbour/contrib/hbwin/win_prn1.c
View File

@@ -1,5 +1,5 @@
/*
* $Id: win_prn1.c 10694 2009-03-25 15:34:09Z vszakats $
* $Id$
*/
/*

2
harbour/contrib/hbwinprn/win_prn2.c → harbour/contrib/hbwin/win_prn2.c
View File

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

2
harbour/contrib/hbwinprn/win_tprn.prg → harbour/contrib/hbwin/win_tprn.prg
View File

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

36
harbour/contrib/hbwinprn/Makefile
View File

@@ -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

5
harbour/contrib/hbwinprn/tests/hbwinprn.hbp
View File

@@ -1,5 +0,0 @@
#
# $Id: hbwin.hbp 10704 2009-03-27 00:55:52Z vszakats $
#
{win}libs=hbwinprn

4
harbour/doc/dirstruc.txt
View File

@@ -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.
| | |

1
harbour/doc/whatsnew.txt
View File

@@ -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.

5
harbour/harbour-wce-spec
View File

@@ -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

5
harbour/harbour-win-spec
View File

@@ -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

2
harbour/utils/hbmk2/examples/contribf.hbp
View File

@@ -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

2
harbour/utils/hbmk2/examples/fwh.hbp
View File

@@ -13,4 +13,4 @@
{win}libs=fiveh fivehc
{win}libs=nddeapi iphlpapi rasapi32 odbc32
{win}libs=hbwin hbwinprn
{win}libs=hbwin

2
harbour/utils/hbmk2/examples/hmg.hbp
View File

@@ -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