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

2012-11-29 01:20 UTC+0100 Viktor Szakats (harbour syenar.net)

Browse Source 
* contrib/rddads/ads.ch
    ! added missing self-guard

  * contrib/hbmagic/tests/hbmagit.prg
  * contrib/hbmxml/tests/custom.prg
  * contrib/hbmxml/tests/reminder.prg
  * contrib/hbmxml/tests/testmxml.prg
    % no longer use #include to include standard
      package headers. Rely on autoload triggered
      by .hbc file or #require directive.
      (missed from prev)

  * contrib/rddads/tests/datad.prg
  * contrib/rddads/tests/testmg.prg
    ! fixed to run properly as scripts
      (need to register RDDs manually in such scenario,
      maybe this could be automatized?)

  * contrib/hbwin/hbwin.hbc
  * contrib/rddads/rddads.hbc
    + set hbwin.ch and ads.ch as standard headers

  ; NOTE: Seems that hbct, hbxpp and xhb contribs
          do not have such what could be called
          common standard headers.
          For gtwvg I cannot tell, but probably
          all three .ch files should be standard.

  * contrib/hbwin/tests/testax.prg
  * contrib/hbwin/tests/testcom1.prg
  * contrib/hbwin/tests/testcom2.prg
  * contrib/hbwin/tests/testcopy.prg
  * contrib/hbwin/tests/testevnt.prg
  * contrib/hbwin/tests/testgdi.prg
  * contrib/hbwin/tests/testmapi.prg
  * contrib/hbwin/tests/testprn.prg
  * contrib/hbwin/tests/testreg.prg
  * contrib/hbwin/tests/testsvc.prg
  * contrib/hbzebra/tests/testwin.prg
  * contrib/rddads/tests/datad.prg
  * contrib/rddads/tests/testmg.prg
    % no longer use #include to include standard
      package headers. Rely on autoload triggered
      by .hbc file or #require directive.

  ; WARNING: The autoload feature for standard package
             headers should be generally harmless, but
             it might as well pose an INCOMPATIBILITY
             if user code redefines or simply uses
             macro names/commands in user code that
             collide with the ones defined in these
             standard headers.
             If this comes up, avoid using .hbc files,
             until your code is changed/fixed to avoid
             name collisions either by renames or 
             undeffing the standard ones.
             As consequence it's even more important
             to pay attention to macro namespaces used
             in package headers to avoid accidental
             collision with user code. This was standard
             practice for function/class names, now it
             is extended for macros/user commands.
This commit is contained in:
Viktor Szakats
2012-11-29 00:30:07 +00:00
parent b1bfe8f54b
commit 7c8fcec7f3
21 changed files with 81 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
harbour/ChangeLog.txt
View File

@@ -10,6 +10,70 @@
* Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
*/
2012-11-29 01:20 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/rddads/ads.ch
! added missing self-guard
* contrib/hbmagic/tests/hbmagit.prg
* contrib/hbmxml/tests/custom.prg
* contrib/hbmxml/tests/reminder.prg
* contrib/hbmxml/tests/testmxml.prg
% no longer use #include to include standard
package headers. Rely on autoload triggered
by .hbc file or #require directive.
(missed from prev)
* contrib/rddads/tests/datad.prg
* contrib/rddads/tests/testmg.prg
! fixed to run properly as scripts
(need to register RDDs manually in such scenario,
maybe this could be automatized?)
* contrib/hbwin/hbwin.hbc
* contrib/rddads/rddads.hbc
+ set hbwin.ch and ads.ch as standard headers
; NOTE: Seems that hbct, hbxpp and xhb contribs
do not have such what could be called
common standard headers.
For gtwvg I cannot tell, but probably
all three .ch files should be standard.
* contrib/hbwin/tests/testax.prg
* contrib/hbwin/tests/testcom1.prg
* contrib/hbwin/tests/testcom2.prg
* contrib/hbwin/tests/testcopy.prg
* contrib/hbwin/tests/testevnt.prg
* contrib/hbwin/tests/testgdi.prg
* contrib/hbwin/tests/testmapi.prg
* contrib/hbwin/tests/testprn.prg
* contrib/hbwin/tests/testreg.prg
* contrib/hbwin/tests/testsvc.prg
* contrib/hbzebra/tests/testwin.prg
* contrib/rddads/tests/datad.prg
* contrib/rddads/tests/testmg.prg
% no longer use #include to include standard
package headers. Rely on autoload triggered
by .hbc file or #require directive.
; WARNING: The autoload feature for standard package
headers should be generally harmless, but
it might as well pose an INCOMPATIBILITY
if user code redefines or simply uses
macro names/commands in user code that
collide with the ones defined in these
standard headers.
If this comes up, avoid using .hbc files,
until your code is changed/fixed to avoid
name collisions either by renames or
undeffing the standard ones.
As consequence it's even more important
to pay attention to macro namespaces used
in package headers to avoid accidental
collision with user code. This was standard
practice for function/class names, now it
is extended for macros/user commands.
2012-11-29 00:49 UTC+0100 Viktor Szakats (harbour syenar.net)
* contrib/hbwin/hbole.ch
! missing svn props

2
harbour/contrib/hbmagic/tests/hbmagit.prg
View File

@@ -52,8 +52,6 @@
#require "hbmagic"
#include "hbmagic.ch"
#xcommand T( <(title)>, <(subject)> ) => ;
magic_setflags( hMagic, MAGIC_NONE ) ;;
OutStd( hb_StrFormat( <title> + ": t: [%s] ", magic_buffer( hMagic, <subject> ) ) ) ;;

2
harbour/contrib/hbmxml/tests/custom.prg
View File

@@ -6,8 +6,6 @@
#xtranslate _ENCODE( <xData> ) => ( hb_base64Encode( hb_Serialize( mxmlGetCustom( <xData> ) ) ) )
#include "hbmxml.ch"
PROCEDURE Main()
LOCAL tree, node

2
harbour/contrib/hbmxml/tests/reminder.prg
View File

@@ -4,8 +4,6 @@
#require "hbmxml"
#include "hbmxml.ch"
STATIC s_mxml_error := .F.
STATIC s_mxml_error_msg := ""

1
harbour/contrib/hbmxml/tests/testmxml.prg
View File

@@ -21,7 +21,6 @@
#require "hbmxml"
#include "hbmxml.ch"
#include "simpleio.ch"
REQUEST HB_GT_CGI_DEFAULT

2
harbour/contrib/hbwin/hbwin.hbc
View File

@@ -8,6 +8,8 @@ skip={!allwin}
incpaths=.
headers=${hb_name}.ch
libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
libs=png
{wce}libs=sms CellCore

1
harbour/contrib/hbwin/tests/testax.prg
View File

@@ -6,7 +6,6 @@
#include "hbgtinfo.ch"
#include "hbclass.ch"
#include "hbwin.ch"
#if ! defined( __HBSCRIPT__HBSHELL )
REQUEST HB_GT_WVT_DEFAULT

2
harbour/contrib/hbwin/tests/testcom1.prg
View File

@@ -52,8 +52,6 @@
#require "hbwin"
#include "hbwin.ch"
PROCEDURE Main( cPortName )
LOCAL oWinPort := win_com():Init( cPortName, WIN_CBR_9600, WIN_NOPARITY, 8, WIN_ONESTOPBIT )

2
harbour/contrib/hbwin/tests/testcom2.prg
View File

@@ -52,8 +52,6 @@
#require "hbwin"
#include "hbwin.ch"
PROCEDURE Main( cPortName )
LOCAL oWinPort

2
harbour/contrib/hbwin/tests/testcopy.prg
View File

@@ -12,8 +12,6 @@
#require "hbwin"
#include "hbwin.ch"
#include "simpleio.ch"
PROCEDURE Main()

2
harbour/contrib/hbwin/tests/testevnt.prg
View File

@@ -12,8 +12,6 @@
#require "hbwin"
#include "hbwin.ch"
PROCEDURE Main()
? win_ReportEvent( NIL, "Application", WIN_EVENTLOG_SUCCESS, 0, 0, "hello" )

2
harbour/contrib/hbwin/tests/testgdi.prg
View File

@@ -15,8 +15,6 @@
#include "simpleio.ch"
#include "hbwin.ch"
PROCEDURE Main()
LOCAL cPrinterName := "Microsoft XPS Document Writer"

2
harbour/contrib/hbwin/tests/testmapi.prg
View File

@@ -6,8 +6,6 @@
#include "simpleio.ch"
#include "hbwin.ch"
PROCEDURE Main()
LOCAL cSubject := "Test subject"

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

@@ -4,8 +4,6 @@
#require "hbwin"
#include "hbwin.ch"
PROCEDURE Main( cPar1 )
LOCAL nPrn := 1

2
harbour/contrib/hbwin/tests/testreg.prg
View File

@@ -4,8 +4,6 @@
#require "hbwin"
#include "hbwin.ch"
#define KEY_WOW64_64KEY 0x0100
#define KEY_WOW64_32KEY 0x0200

2
harbour/contrib/hbwin/tests/testsvc.prg
View File

@@ -52,8 +52,6 @@
#if ! defined( __HBSCRIPT__HBSHELL )
#include "hbwin.ch"
#define _SERVICE_NAME "Harbour_Test_Service"
PROCEDURE Main( cMode )

2
harbour/contrib/hbzebra/tests/testwin.prg
View File

@@ -13,8 +13,6 @@
#require "hbzebra"
#require "hbwin"
#include "hbwin.ch"
PROCEDURE Main()
LOCAL hDC

5
harbour/contrib/rddads/ads.ch
View File

@@ -70,6 +70,9 @@
-DADS_LIB_VERSION=500
*/
#ifndef ADS_CH_
#define ADS_CH_
/* Supported file types */
#define ADS_NTX 1
#define ADS_CDX 2
@@ -321,3 +324,5 @@
[; dbSetIndex( <(index1)> )] ;
[; dbSetIndex( <(indexn)> )] ;
; END
#endif

2
harbour/contrib/rddads/rddads.hbc
View File

@@ -11,6 +11,8 @@ skip={!(linux|win)}
incpaths=.
headers=ads.ch
{HB_DYNLOAD_RDDADS}prgflags=-D__HBDYNLOAD__RDDADS__
# Dynamic loading requires -shared executable, but
# let's leave enabling that to the host project.

5
harbour/contrib/rddads/tests/datad.prg
View File

@@ -8,7 +8,6 @@
#require "rddads"
#include "ads.ch"
REQUEST ADS
#if defined( __HBDYNLOAD__RDDADS__ )
@@ -22,6 +21,10 @@ PROCEDURE Main()
LOCAL aStru := { { "ID", "A", 1, 0 }, { "Name", "C", 50, 0 }, { "address", "C", 50, 0 }, { "city", "C", 30, 0 }, { "Age", "n", 3, 0 } }
LOCAL hConnection1
#if defined( __HBSCRIPT__HBSHELL )
rddRegister( "ADSADT" )
#endif
#if defined( __HBDYNLOAD__RDDADS__ )
LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) )

5
harbour/contrib/rddads/tests/testmg.prg
View File

@@ -53,7 +53,6 @@
#require "rddads"
#include "ord.ch"
#include "ads.ch"
REQUEST ADS
@@ -66,6 +65,10 @@ PROCEDURE Main()
LOCAL i
LOCAL aRay
#if defined( __HBSCRIPT__HBSHELL )
rddRegister( "ADS" )
#endif
#if defined( __HBDYNLOAD__RDDADS__ )
LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) )