2011-03-10 07:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbgs/hbgs.hbp + Added autodetection path [Tamas Tevesz] - contrib/hbmlzo/3rd/minilzo/minilzo.hbx - Deleted .hbx file (always empty, not needed for 3rd libs) * contrib/hbmlzo/3rd/minilzo/minilzo.hbp - Deleted commented/empty option. * contrib/hbqt/hbmk2_qt.hbs * contrib/hbqt/qtcore/hbqt_pointer.cpp * contrib/hbqt/qtcore/hbqt.h * Formatting. * config/global.mk + Attempt to add better LIBRARY_PATH envvar support for beos. Please test.
2011-03-10 06:55:02 +00:00
parent 35dfc7eb60
commit 37c7665abf
8 changed files with 37 additions and 50 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,21 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2011-03-10 07:53 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbgs/hbgs.hbp
+    + Added autodetection path [Tamas Tevesz]
+  - contrib/hbmlzo/3rd/minilzo/minilzo.hbx
+    - Deleted .hbx file (always empty, not needed for 3rd libs)
+  * contrib/hbmlzo/3rd/minilzo/minilzo.hbp
+    - Deleted commented/empty option.
+  * contrib/hbqt/hbmk2_qt.hbs
+  * contrib/hbqt/qtcore/hbqt_pointer.cpp
+  * contrib/hbqt/qtcore/hbqt.h
+    * Formatting.
+  * config/global.mk
+    + Attempt to add better LIBRARY_PATH envvar support for beos.
+      Please test.
+
 2011-03-10 00:56 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/src/lang/msgbgiso.c
    ! fixed typo in lang module name: "BGWIN" -> "BGISO"
--- a/harbour/config/global.mk
+++ b/harbour/config/global.mk
@@ -1134,6 +1134,12 @@ else
   HB_PLATFORM_UNIX := yes
 endif

+ifeq ($(HB_PLATFORM),beos)
+   HB_LD_LIBRARY_PATH = LIBRARY_PATH
+else
+   HB_LD_LIBRARY_PATH = LD_LIBRARY_PATH
+endif
+
 PLAT_COMP := $(HB_PLATFORM)/$(HB_COMPILER)$(subst \,/,$(HB_BUILD_NAME))

 OBJ_DIR := obj/$(PLAT_COMP)
@@ -1152,13 +1158,13 @@ else
   endif
   ifeq ($(HB_LD_PATH_SET),)
      ifneq ($(HB_SRC_ROOTPATH),)
-         export LD_LIBRARY_PATH := $(HB_SRC_ROOTPATH)lib/$(PLAT_COMP):$(LD_LIBRARY_PATH)
+         export $(HB_LD_LIBRARY_PATH) := $(HB_SRC_ROOTPATH)lib/$(PLAT_COMP):$($(HB_LD_LIBRARY_PATH))
      else
-         export LD_LIBRARY_PATH := $(abspath $(DYN_DIR)):$(LD_LIBRARY_PATH)
+         export $(HB_LD_LIBRARY_PATH) := $(abspath $(DYN_DIR)):$($(HB_LD_LIBRARY_PATH))
      endif
      export HB_LD_PATH_SET := yes
-      ifneq ($(LD_LIBRARY_PATH),)
-         $(info ! LD_LIBRARY_PATH: $(LD_LIBRARY_PATH))
+      ifneq ($($(HB_LD_LIBRARY_PATH)),)
+         $(info ! $(HB_LD_LIBRARY_PATH): $($(HB_LD_LIBRARY_PATH)))
      endif
   endif
 endif
@@ -1611,12 +1617,12 @@ endif

 ifeq ($(HB_SYSLOC),)
   ifeq ($(HB_PLATFORM),beos)
-      ifneq ($(strip $(foreach dir,/boot/common /boot/system /boot/home/config $(subst :, ,$(LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
+      ifneq ($(strip $(foreach dir,/boot/common /boot/system /boot/home/config $(subst :, ,$($(HB_LD_LIBRARY_PATH))),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
         HB_SYSLOC := yes
      endif
   else
   ifneq ($(HB_PLATFORM_UNIX),)
-      ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin $(subst :, ,$(LD_LIBRARY_PATH)),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
+      ifneq ($(strip $(foreach dir,/usr/local/bin /usr/bin $(subst :, ,$($(HB_LD_LIBRARY_PATH))),$(findstring |$(dir),|$(HB_INSTALL_PREFIX)))),)
         HB_SYSLOC := yes
      endif
   endif
--- a/harbour/contrib/hbgs/hbgs.hbp
+++ b/harbour/contrib/hbgs/hbgs.hbp
@@ -14,6 +14,7 @@
 -depkeyhead=gs:iapi.h
 -depcontrol=gs:${HB_WITH_GS}
 -depincpath=gs:/usr/include
+-depincpath=gs:/usr/include/ghostscript
 -depincpath=gs:/opt/local/include/ghostscript
 -depimplibs=gs:${HB_WITH_GS_BIN}/gsdll32.dll{win&&x86}
 -depimplibs=gs:${HB_WITH_GS_BIN}/gsdll64.dll{win&&x86_64}
--- a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
+++ b/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbp
@@ -9,14 +9,12 @@

 -warn=low

-#-cflag=
-
 minilzo.c

 # ORIGIN http://www.oberhumer.com/opensource/lzo/
 # VER    2.04
 # URL    http://www.oberhumer.com/opensource/lzo/download/minilzo-2.04.tar.gz
-# DIFF   
+# DIFF
 #
 # MAP    COPYING
 # MAP    lzoconf.h
--- a/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbx
+++ b/harbour/contrib/hbmlzo/3rd/minilzo/minilzo.hbx
@@ -1,33 +0,0 @@
-/*
- * $Id$
- */
-
-/* -------------------------------------------------------------------- */
-/* NOTE: You can add manual override which functions to include or      */
-/*       exclude from automatically generated EXTERNAL/DYNAMIC list.    */
-/*          Syntax: // HB_FUNC_INCLUDE <func>                           */
-/*                  // HB_FUNC_EXCLUDE <func>                           */
-/* -------------------------------------------------------------------- */
-
-/* -------------------------------------------------------------------- */
-/* WARNING: Automatically generated code below. DO NOT EDIT!            */
-/*          Regenerate using hbmk2 '-hbx=' option.                      */
-/* -------------------------------------------------------------------- */
-
-#ifndef __HBEXTERN_CH__MINILZO__
-#define __HBEXTERN_CH__MINILZO__
-
-#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__MINILZO__ANNOUNCE )
-   ANNOUNCE __HBEXTERN__MINILZO__
-#endif
-
-#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__MINILZO__REQUEST )
-   #command DYNAMIC <fncs,...> => EXTERNAL <fncs>
-#endif
-
-
-#if defined( __HBEXTREQ__ ) .OR. defined( __HBEXTERN__MINILZO__REQUEST )
-   #uncommand DYNAMIC <fncs,...> => EXTERNAL <fncs>
-#endif
-
-#endif
--- a/harbour/contrib/hbqt/hbmk2_qt.hbs
+++ b/harbour/contrib/hbqt/hbmk2_qt.hbs
@@ -1153,7 +1153,7 @@ METHOD HbQtSource:new( cQtModule, cQtVer, cQTHFileName, cCPPFileName, cPRGFileNa
   aadd( ::new_, ::cFunc )
   FOR i := n + 1 TO len( ::code_ )
      aadd( ::new_, ::code_[ i ] )
-      IF trim( ::code_[ i ] ) == "}"
+      IF RTrim( ::code_[ i ] ) == "}"
         n1 := i
         EXIT
      ENDIF
@@ -1643,9 +1643,9 @@ METHOD HbQtSource:getConstructor( nClsType )
         IF !( left( ltrim( ::new_[ i ] ), 2 ) == "//" )
            IF "__HB_RETPTRGC__(" $ ::new_[ i ]
               s := ::new_[ i ]
-               s := trim( strtran( s, "__HB_RETPTRGC__(", "pObj =" ) )
-               s := strtran( s, ");", ";" )
-               s := strtran( s, "( "+ ::cQtObject + "* )" )
+               s := RTrim( strtran( s, "__HB_RETPTRGC__(", "pObj =" ) )
+               s := RTrim( strtran( s, ");" ) ) + ";"
+               s := strtran( s, "( " + ::cQtObject + "* )" )
               aadd( aLine, s )
            ELSE
               aadd( aLine, ::new_[ i ] )
--- a/harbour/contrib/hbqt/qtcore/hbqt.h
+++ b/harbour/contrib/hbqt/qtcore/hbqt.h
@@ -99,7 +99,7 @@ extern HB_EXPORT const HB_GC_FUNCS * hbqt_gcFuncs( void );
 extern HB_EXPORT void * hbqt_pPtrFromObj( int iParam );
 extern HB_EXPORT int hbqt_isObjectType( int iParam, HB_U32 iType ); /* check if parameter iParam is EXACTLY of type iType */
 extern HB_EXPORT void hbqt_errRT_ARG( void );
-extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char* szParentClsStr );
+extern HB_EXPORT PHB_ITEM hbqt_defineClassBegin( const char * szClsName, PHB_ITEM s_oClass, const char * szParentClsStr );
 extern HB_EXPORT void hbqt_defineClassEnd( PHB_ITEM s_oClass, PHB_ITEM oClass );
 extern HB_EXPORT void * hbqt_getqtptr( void );
 extern HB_EXPORT PHB_ITEM hbqt_create_object( void * pObject, const char * pszObjectName );
--- a/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
+++ b/harbour/contrib/hbqt/qtcore/hbqt_pointer.cpp
@@ -198,7 +198,7 @@ void * hbqt_pPtrFromObj( int iParam )
      pointer = hbqt_gcpointer( -1 );

      if( iParam == 0 && ! pointer )
-          hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
+         hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );

      return pointer;
   }
@@ -208,7 +208,7 @@ void * hbqt_pPtrFromObj( int iParam )
      pointer = hbqt_gcpointer( iParam );

      if( iParam == 0 && ! pointer )
-          hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
+         hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );

      return pointer;
   }
@@ -216,7 +216,7 @@ void * hbqt_pPtrFromObj( int iParam )
   {
      HB_TRACE( HB_TR_DEBUG, ( "hbqt_pPtrFromObj(): returns NULL" ) );
      if( iParam == 0 )
-          hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
+         hb_errRT_BASE( EG_ARG, 9999, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
      return NULL; /* TODO: Still better if RTE. */
   }
 }