2012-02-29 09:58 UTC+0100 Viktor Szakats (harbour syenar.net)

* utils/hbmk2/hbmk2.prg
    + show .hbp file reference when .hbc is not found

  * config/postinst.hbs
    * corrected double dirseps in one case.

  * contrib/hbqt/qtgui/hbqtgui.hbx
  * contrib/hbqt/qtgui/qth/filelist.hbm
    ! disabled QDeclarative* wrappers until reported link
      problems are fixed.
      This allows HB_BUILD_CONTRIB_DYN=yes to work again.

  * contrib/hbqt/hbqt.hbc
  * contrib/hbqt/hbqt_all.hbp
    ! disabled hbqtsql until link problems (missing functions
      and wrappers) are fixed.
      This allows HB_BUILD_CONTRIB_DYN=yes to work again.

harbour/ChangeLog

@@ -16,6 +16,25 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-02-29 09:58 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * utils/hbmk2/hbmk2.prg
+    + show .hbp file reference when .hbc is not found
+
+  * config/postinst.hbs
+    * corrected double dirseps in one case.
+
+  * contrib/hbqt/qtgui/hbqtgui.hbx
+  * contrib/hbqt/qtgui/qth/filelist.hbm
+    ! disabled QDeclarative* wrappers until reported link
+      problems are fixed.
+      This allows HB_BUILD_CONTRIB_DYN=yes to work again.
+
+  * contrib/hbqt/hbqt.hbc
+  * contrib/hbqt/hbqt_all.hbp
+    ! disabled hbqtsql until link problems (missing functions
+      and wrappers) are fixed.
+      This allows HB_BUILD_CONTRIB_DYN=yes to work again.
+
 2012-02-28 20:59 UTC+0100 Viktor Szakats (harbour syenar.net)
   * config/global.mk
     + display HB_BUILD_CONTRIB_DYN setting in make output.

harbour/config/postinst.hbs

@@ -365,7 +365,7 @@ STATIC FUNCTION mk_hbd_core( cDirSource, cDirDest )
    NEXT
 
    IF ! Empty( aEntry )
-      cName := PathSepToSelf( cDirDest ) + hb_ps() + cName + ".hbd"
+      cName := hb_DirSepAdd( PathSepToSelf( cDirDest ) ) + cName + ".hbd"
       IF __hbdoc_SaveHBD( cName, aEntry )
          OutStd( "! Created " + cName + " <= " + cDirSource + hb_eol() )
          RETURN .T.

harbour/contrib/hbqt/hbqt.hbc

@@ -12,5 +12,5 @@ libs=hbqtcore.hbc
 libs=hbqtgui.hbc
 libs=hbqtnetwork.hbc
 # libs=hbqtwebkit.hbc
-libs=hbqtsql.hbc
+# libs=hbqtsql.hbc
 libs=gtqtc.hbc

harbour/contrib/hbqt/hbqt_all.hbp

@@ -15,5 +15,5 @@ hbqtdesigner.hbc
 hbqtgui.hbc
 hbqtnetwork.hbc
 hbqtwebkit.hbc
-hbqtsql.hbc
+# hbqtsql.hbc
 gtqtc.hbc

harbour/contrib/hbqt/qtgui/hbqtgui.hbx

@@ -76,20 +76,7 @@ DYNAMIC HB_QCONTEXTMENUEVENT
 DYNAMIC HB_QCURSOR
 DYNAMIC HB_QDATEEDIT
 DYNAMIC HB_QDATETIMEEDIT
-DYNAMIC HB_QDECLARATIVECOMPONENT
-DYNAMIC HB_QDECLARATIVECONTEXT
-DYNAMIC HB_QDECLARATIVEENGINE
-DYNAMIC HB_QDECLARATIVEERROR
-DYNAMIC HB_QDECLARATIVEEXPRESSION
-DYNAMIC HB_QDECLARATIVEIMAGEPROVIDER
-DYNAMIC HB_QDECLARATIVEITEM
-DYNAMIC HB_QDECLARATIVELISTREFERENCE
 DYNAMIC HB_QDECLARATIVEPARSERSTATUS
-DYNAMIC HB_QDECLARATIVEPROPERTY
-DYNAMIC HB_QDECLARATIVEPROPERTYMAP
-DYNAMIC HB_QDECLARATIVEPROPERTYVALUESOURCE
-DYNAMIC HB_QDECLARATIVESCRIPTSTRING
-DYNAMIC HB_QDECLARATIVEVIEW
 DYNAMIC HB_QDESKTOPSERVICES
 DYNAMIC HB_QDESKTOPWIDGET
 DYNAMIC HB_QDIAL
@@ -351,20 +338,7 @@ DYNAMIC QCONTEXTMENUEVENT
 DYNAMIC QCURSOR
 DYNAMIC QDATEEDIT
 DYNAMIC QDATETIMEEDIT
-DYNAMIC QDECLARATIVECOMPONENT
-DYNAMIC QDECLARATIVECONTEXT
-DYNAMIC QDECLARATIVEENGINE
-DYNAMIC QDECLARATIVEERROR
-DYNAMIC QDECLARATIVEEXPRESSION
-DYNAMIC QDECLARATIVEIMAGEPROVIDER
-DYNAMIC QDECLARATIVEITEM
-DYNAMIC QDECLARATIVELISTREFERENCE
 DYNAMIC QDECLARATIVEPARSERSTATUS
-DYNAMIC QDECLARATIVEPROPERTY
-DYNAMIC QDECLARATIVEPROPERTYMAP
-DYNAMIC QDECLARATIVEPROPERTYVALUESOURCE
-DYNAMIC QDECLARATIVESCRIPTSTRING
-DYNAMIC QDECLARATIVEVIEW
 DYNAMIC QDESKTOPSERVICES
 DYNAMIC QDESKTOPWIDGET
 DYNAMIC QDIAL

harbour/contrib/hbqt/qtgui/qth/filelist.hbm

@@ -40,8 +40,6 @@ QColor.qth
 QColorDialog.qth
 QComboBox.qth
 QCommandLinkButton.qth
-QDeclarativePropertyValueSource.qth
-QDeclarativeScriptString.qth
 QCommonStyle.qth
 QCompleter.qth
 QConicalGradient.qth
@@ -49,18 +47,20 @@ QContextMenuEvent.qth
 QCursor.qth
 QDateEdit.qth
 QDateTimeEdit.qth
-QDeclarativeComponent.qth
-QDeclarativeContext.qth
-QDeclarativeEngine.qth
-QDeclarativeError.qth
-QDeclarativeExpression.qth
-QDeclarativeImageProvider.qth
-QDeclarativeItem.qth
-QDeclarativeListReference.qth
+# QDeclarativeComponent.qth
+# QDeclarativeContext.qth
+# QDeclarativeEngine.qth
+# QDeclarativeError.qth
+# QDeclarativeExpression.qth
+# QDeclarativeImageProvider.qth
+# QDeclarativeItem.qth
+# QDeclarativeListReference.qth
 QDeclarativeParserStatus.qth
-QDeclarativeProperty.qth
-QDeclarativePropertyMap.qth
-QDeclarativeView.qth
+# QDeclarativeProperty.qth
+# QDeclarativePropertyMap.qth
+# QDeclarativePropertyValueSource.qth
+# QDeclarativeScriptString.qth
+# QDeclarativeView.qth
 QDesktopServices.qth
 QDesktopWidget.qth
 QDial.qth

harbour/utils/hbmk2/hbmk2.prg

@@ -2971,7 +2971,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
 
                HBC_ProcessOne( hbmk, cParam, 1 )
             ELSE
-               hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s" ), cParam ) )
+               IF Empty( aParam[ _PAR_cFileName ] )
+                  hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s" ), cParam ) )
+               ELSE
+                  hbmk_OutErr( hbmk, hb_StrFormat( I_( "Warning: Cannot find %1$s (referenced from %2$s)" ), cParam, aParam[ _PAR_cFileName ] ) )
+               ENDIF
             ENDIF
          ENDIF