diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 46133db650..2ec3635365 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-06-03 17:19 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/rddads/tests/datad.prg + ! fixed 'field -> id' index expr which wasn't recognized by ADS + * contrib/rddads/tests/datad.prg + * contrib/rddads/tests/testmg.prg + ! use hb_libpostfix() + * contrib/hbide/idemain.prg + ! use hb_libpostfix() which fixes loading rddads on non-win + systems (untested, I can't wait for HBQT build to finish) + 2011-06-03 14:09 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL + added TROUBLESHOOTING/11: diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg index bd8949c821..7d0e7f10d6 100644 --- a/harbour/contrib/hbide/idemain.prg +++ b/harbour/contrib/hbide/idemain.prg @@ -125,9 +125,8 @@ PROCEDURE Main( ... ) SET EPOCH TO 1970 #ifdef __HBDYNLOAD__RDDADS__ - /* TOFIX: Get the name right for other platforms than Windows. */ - IF hb_FileExists( tmp := ( hb_dirBase() + "rddads-" + hb_ntos( hb_version( HB_VERSION_MAJOR ) ) + hb_ntos( hb_version( HB_VERSION_MINOR ) ) + hb_libExt() ) ) - hRDDADS := hb_libLoad( hb_libName( tmp ) ) + IF hb_FileExists( tmp := hb_dirBase() + hb_libName( "rddads" + hb_libPostfix() ) ) + hRDDADS := hb_libLoad( tmp ) IF ! Empty( hRDDADS ) hbide_setAdsAvailable( .t. ) hb_rddadsRegister() diff --git a/harbour/contrib/rddads/tests/datad.prg b/harbour/contrib/rddads/tests/datad.prg index ecf77d4b2f..d96ae8f03d 100644 --- a/harbour/contrib/rddads/tests/datad.prg +++ b/harbour/contrib/rddads/tests/datad.prg @@ -6,7 +6,6 @@ Demo of ADS Connection handling and Data Dictionaries */ - #include "ads.ch" REQUEST ADS @@ -22,7 +21,7 @@ PROCEDURE MAIN() LOCAL hConnection1 #if defined( __HBDYNLOAD__RDDADS__ ) - LOCAL l := hb_libLoad( hb_libName( "rddads" ) ) + LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) ) hb_rddadsRegister() @@ -63,11 +62,11 @@ PROCEDURE MAIN() dbCreate( "Table2", aStru ) //now create an index USE table1 NEW - INDEX ON FIELD -> id TAG codigo + INDEX ON FIELD->id TAG codigo USE USE table2 NEW - INDEX ON FIELD -> id TAG codigo + INDEX ON FIELD->id TAG codigo USE ENDIF diff --git a/harbour/contrib/rddads/tests/testmg.prg b/harbour/contrib/rddads/tests/testmg.prg index 761ea73913..9b094f1511 100644 --- a/harbour/contrib/rddads/tests/testmg.prg +++ b/harbour/contrib/rddads/tests/testmg.prg @@ -66,7 +66,7 @@ PROCEDURE Main() LOCAL aRay #if defined( __HBDYNLOAD__RDDADS__ ) - LOCAL l := hb_libLoad( hb_libName( "rddads" ) ) + LOCAL l := hb_libLoad( hb_libName( "rddads" + hb_libPostfix() ) ) hb_rddadsRegister()