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

2010-09-15 16:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/hbclass.ch
    % small modification to reduce lock time

  * harbour/src/common/hbdate.c
    ! fixed hb_timeUTCOffset() in MS-Windows builds to work in some
      countries/windows versions where GetTimeZoneInformation() returns
      TIME_ZONE_ID_INVALID but sets correct tzInfo.StandardBias field.

  * harbour/package/mpkg_ver.sh
    ! fixed to set correctly root path after moving build scripts to
      ./package subdirectory

  * harbour/utils/Makefile
    ! do not build executable files when HB_BUILD_PARTS is set to 'lib'
This commit is contained in:
Przemyslaw Czerpak
2010-09-15 14:04:26 +00:00
parent 5b86defbe1
commit e78cb0e549
5 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
harbour/ChangeLog
View File

@@ -16,6 +16,22 @@
The license applies to all entries newer than 2009-04-28.
*/
2010-09-15 16:04 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/include/hbclass.ch
% small modification to reduce lock time
* harbour/src/common/hbdate.c
! fixed hb_timeUTCOffset() in MS-Windows builds to work in some
countries/windows versions where GetTimeZoneInformation() returns
TIME_ZONE_ID_INVALID but sets correct tzInfo.StandardBias field.
* harbour/package/mpkg_ver.sh
! fixed to set correctly root path after moving build scripts to
./package subdirectory
* harbour/utils/Makefile
! do not build executable files when HB_BUILD_PARTS is set to 'lib'
2010-09-14 15:15 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbqt/tests/testbrow.prg
* contrib/hbqt/tests/testqaim.prg

8
harbour/include/hbclass.ch
View File

@@ -279,13 +279,13 @@ DECLARE HBClass ;
#xcommand ENDCLASS [<lck: LOCK, LOCKED>] => ;
oClass:Create() ; [<-lck-> __clsLock( oClass:hClass ) ] ;;
oInstance := oClass:Instance() ;;
if __ObjHasMsg( oInstance, "InitClass" ) ;;
oInstance:InitClass( HB_CLS_PARAM_LIST ) ;;
end ;;
always ;;
__clsUnlockDef( @s_oClass, oClass ) ;;
end sequence ;;
oInstance := oClass:Instance() ;;
if __ObjHasMsg( oInstance, "InitClass" ) ;;
oInstance:InitClass( HB_CLS_PARAM_LIST ) ;;
end ;;
return oInstance ;;
end ;;
return s_oClass:Instance() AS CLASS _CLASS_NAME_ ;;

4
harbour/package/mpkg_ver.sh
View File

@@ -13,7 +13,7 @@
get_hbver()
{
hb_rootdir="${1-.}"
hb_rootdir="${1-..}"
FVER="${hb_rootdir}/include/hbver.h"
MAJOR=`sed -e '/HB_VER_MAJOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
MINOR=`sed -e '/HB_VER_MINOR/ !d' -e 's/[^0-9]*\([^ ]*\).*/\1/g' "${FVER}"`
@@ -23,7 +23,7 @@ get_hbver()
get_hbverstat()
{
hb_rootdir="${1-.}"
hb_rootdir="${1-..}"
FVER="${hb_rootdir}/include/hbver.h"
VERSTAT=`sed -e '/HB_VER_STATUS/ !d' -e 's/[^\"]*\"\([^\"]*\).*/\1/g' "${FVER}"`
echo "${VERSTAT}"

18
harbour/src/common/hbdate.c
View File

@@ -903,12 +903,24 @@ long hb_timeUTCOffset( void ) /* in seconds */
#if defined( HB_OS_WIN )
{
TIME_ZONE_INFORMATION tzInfo;
DWORD retval = GetTimeZoneInformation( &tzInfo );
DWORD retval;
memset( &tzInfo, 0, sizeof( tzInfo ) );
retval = GetTimeZoneInformation( &tzInfo );
/* disabled because users reported that in some
* countries/windows versions GetTimeZoneInformation()
* returns TIME_ZONE_ID_INVALID but sets correct
* tzInfo.StandardBias field.
*/
#if 0
if( retval == TIME_ZONE_ID_INVALID )
return 0;
else
return -( tzInfo.Bias + ( retval == TIME_ZONE_ID_STANDARD ? tzInfo.StandardBias : tzInfo.DaylightBias ) ) * 60;
#endif
return -( tzInfo.Bias +
( retval == TIME_ZONE_ID_DAYLIGHT ? tzInfo.DaylightBias :
/*TIME_ZONE_ID_STANDARD*/ tzInfo.StandardBias ) ) * 60;
}
#else
{

10
harbour/utils/Makefile
View File

@@ -4,6 +4,8 @@
ROOT := ../
ifneq ($(HB_BUILD_PARTS),lib)
DIRS := \
hbrun \
hbmk2 \
@@ -17,4 +19,10 @@ ifneq ($(HB_BUILD_PARTS),compiler)
endif
include $(ROOT)config/dir.mk
endif
ifneq ($(DIRS),)
include $(ROOT)config/dir.mk
else
include $(ROOT)config/none.mk
endif