2010-06-29 08:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL + Added HB_QT_UIC_BIN. * utils/hbmk2/hbmk2.prg ! Fixed to call 'pre_prg' plugin state from a better position, so that it works in incremental mode. * contrib/hbqt/hbmk2_plugin_ui.prg * Variable name cleanup. * Marked parameters passed by reference. * contrib/Makefile * Finalizing GNU Make -> hbmk2 job transfer. * contrib/makefile.prg * Finalizing clean/install/make job control. * contrib/hbide/hbide.hbp + Use explicit .ui input file list instead of using wildcards. * contrib/hbide/setup.ui ! Fixed mixed-case hbide.ini filename on UI. ! Fixed .exe extension (and mixed case) on UI.
2010-06-29 06:47:23 +00:00
parent bf251d5bd7
commit 796a93512c
8 changed files with 89 additions and 36 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,31 @@
   The license applies to all entries newer than 2009-04-28.
 */

+2010-06-29 08:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    + Added HB_QT_UIC_BIN.
+
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed to call 'pre_prg' plugin state from a better
+      position, so that it works in incremental mode.
+
+  * contrib/hbqt/hbmk2_plugin_ui.prg
+    * Variable name cleanup.
+    * Marked parameters passed by reference.
+
+  * contrib/Makefile
+    * Finalizing GNU Make -> hbmk2 job transfer.
+
+  * contrib/makefile.prg
+    * Finalizing clean/install/make job control.
+
+  * contrib/hbide/hbide.hbp
+    + Use explicit .ui input file list instead of using wildcards.
+
+  * contrib/hbide/setup.ui
+    ! Fixed mixed-case hbide.ini filename on UI.
+    ! Fixed .exe extension (and mixed case) on UI.
+
 2010-06-28 19:04 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
  * contrib/hbxbp/xbpbrowse.prg
    % Rearrangement of code. Was calculating rows console based.
@@ -28,7 +53,7 @@
                   wrapped inside splitters.
                   Multiple tables are presented in vertical splitters
                   and form view is presented in horizontal splitter.
-      ; NOTE: still work in progress. But proof of concept is 
+      ; NOTE: still work in progress. But proof of concept is
              already working.

 2010-06-28 21:37 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -337,8 +337,9 @@ HARBOUR
   with 3rd party components:
      HB_QT_STATIC=yes (only meaningful on Windows platform)

-   You can override automatic detection of QT 'moc' tool, f.e.:
+   You can override automatic detection of QT 'moc' and 'uic' tools, f.e.:
      HB_QT_MOC_BIN=/opt/qt46/bin/moc
+      HB_QT_UIC_BIN=/opt/qt46/bin/uic

   NOTES: - You need to use native path format to your shell/OS.
          - Spaces in directory names aren't currently supported.
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -79,5 +79,11 @@ else
   include $(TOP)$(ROOT)config/none.mk
 endif

+clean::
+	$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/makefile.prg clean test,)
+
+install::
+	$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/makefile.prg install test,)
+
 all:
-	$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/makefile.prg TEST,)
+	$(if $(wildcard $(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT)),+$(HB_HOST_BIN_DIR)/hbrun$(HB_HOST_BIN_EXT) --hb:gtcgi $(TOP)$(ROOT)contrib/makefile.prg all test,)
--- a/harbour/contrib/hbide/hbide.hbp
+++ b/harbour/contrib/hbide/hbide.hbp
@@ -51,4 +51,25 @@ ideplugins.prg
 idedict.prg
 idebrowse.prg

-pi=*.ui
+-pi=docviewgenerator.ui
+-pi=docwriter.ui
+-pi=environ.ui
+-pi=environments.ui
+-pi=finddialog.ui
+-pi=findinfiles.ui
+-pi=findinfilesex.ui
+-pi=findsource.ui
+-pi=funclist.ui
+-pi=mainwindow.ui
+-pi=projectpropertiesex.ui
+-pi=searchreplace.ui
+-pi=searchreplacepanel.ui
+-pi=selectionlist.ui
+-pi=selectproject.ui
+-pi=setup.ui
+-pi=shortcuts.ui
+-pi=skeletons.ui
+-pi=themes.ui
+-pi=themesex.ui
+-pi=toolsutilities.ui
+-pi=updown.ui
--- a/harbour/contrib/hbide/setup.ui
+++ b/harbour/contrib/hbide/setup.ui
@@ -832,7 +832,7 @@
       </rect>
      </property>
      <property name="text">
-       <string>hbMK2.exe</string>
+       <string>hbmk2 executable</string>
      </property>
     </widget>
     <widget class="QLineEdit" name="editPathHbmk2">
@@ -901,7 +901,7 @@
       </rect>
      </property>
      <property name="text">
-       <string>hbIDE.ini</string>
+       <string>hbide.ini</string>
      </property>
     </widget>
     <widget class="QLineEdit" name="editPathIni">
--- a/harbour/contrib/hbqt/hbmk2_plugin_ui.prg
+++ b/harbour/contrib/hbqt/hbmk2_plugin_ui.prg
@@ -507,7 +507,7 @@ STATIC FUNCTION hbq_pullToolTip( cCmd )

   RETURN cString

-STATIC PROCEDURE hbq_replaceConstants( cString )
+STATIC PROCEDURE hbq_replaceConstants( /* @ */ cString )
   LOCAL aResult
   LOCAL cConst
   LOCAL cCmdB
@@ -571,24 +571,24 @@ STATIC FUNCTION hbq_setObjects( cCmd, aWidgets )
   RETURN cCmd

 STATIC FUNCTION hbq_pullText( aLines, nFrom )
-   LOCAL s := ""
+   LOCAL cString := ""
   LOCAL nLen := Len( aLines )
   LOCAL aKeyword := { "setText(", "setPlainText(", "setStyleSheet(", "setWhatsThis(" }

   IF AScan( aKeyword, {| tmp | tmp $ aLines[ nFrom ] } ) > 0
-      s := aLines[ nFrom ]
+      cString := aLines[ nFrom ]
      nFrom++
      DO WHILE nFrom <= nLen
         IF !( Left( aLines[ nFrom ], 1 ) == '"' )
            EXIT
         ENDIF
-         s += aLines[ nFrom ]
+         cString += aLines[ nFrom ]
         aLines[ nFrom ] := ""
         nFrom++
      ENDDO
   ENDIF

-   RETURN s
+   RETURN cString

 STATIC FUNCTION hbq_pullSetToolTip( aLines, nFrom )
   LOCAL cString := ""
@@ -608,7 +608,7 @@ STATIC FUNCTION hbq_pullSetToolTip( aLines, nFrom )

   RETURN cString

-STATIC FUNCTION hbq_stripFront( cString, cTkn )
+STATIC FUNCTION hbq_stripFront( /* @ */ cString, cTkn )
   LOCAL n
   LOCAL nLen := Len( cTkn )

@@ -619,7 +619,7 @@ STATIC FUNCTION hbq_stripFront( cString, cTkn )

   RETURN .F.

-STATIC FUNCTION hbq_stripRear( cString, cTkn )
+STATIC FUNCTION hbq_stripRear( /* @ */ cString, cTkn )
   LOCAL n

   IF ( n := RAt( cTkn, cString ) ) > 0
--- a/harbour/contrib/makefile.prg
+++ b/harbour/contrib/makefile.prg
@@ -148,10 +148,10 @@ PROCEDURE Main( ... )
   LOCAL aParams := hb_AParams()
   LOCAL tmp

-   IF Len( aParams ) == 1 .AND. aParams[ 1 ] == "TEST"
-      OutStd( "! New contrib make orchestrator test run: OK" + hb_osNewLine() )
-      ErrorLevel( 0 )
-      RETURN
+   s_lTest := AScan( aParams, "test" ) > 0
+
+   IF s_lTest
+      OutStd( "! New contrib make orchestrator test run." + iif( AScan( aParams, "clean" ) > 0, " CLEAN", "" ) + iif( AScan( aParams, "install" ) > 0, " INSTALL", "" ) + hb_osNewLine() )
   ENDIF

   IF Empty( GetEnv( "HB_PLATFORM" ) ) .OR. ;
@@ -189,8 +189,6 @@ PROCEDURE Main( ... )
      tmp := Lower( tmp )
   NEXT

-   s_lTest := AScan( aParams, "test" ) > 0
-
   /* Parse filter */

   aFilter := iif( Empty( cFilter ), {}, hb_ATokens( cFilter,, .T. ) )
@@ -225,38 +223,38 @@ PROCEDURE Main( ... )
               CASE "lib"
               CASE "implib"
                  cTargetDir := "lib/${hb_plat}/${hb_comp}" + iif( lBuildName, "/${hb_build}", "" )
-                  cInstallDirVar := "HB_LIB_INSTALL_"
+                  cInstallDirVar := "HB_LIB_INSTALL"
                  EXIT
               CASE "bin"
                  cTargetDir := "bin/${hb_plat}/${hb_comp}" + iif( lBuildName, "/${hb_build}", "" )
-                  cInstallDirVar := "HB_BIN_INSTALL_"
+                  cInstallDirVar := "HB_BIN_INSTALL"
                  EXIT
               ENDSWITCH

               IF AScan( aParams, "clean" ) > 0
                  call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -clean", .F. )
-               ENDIF
-               IF AScan( aParams, "install" ) > 0 .AND. ;
-                  ! Empty( GetEnv( cInstallDirVar ) ) .AND. ;
-                  ( ! ( cType == "implib" ) .OR. GetEnv( "HB_BUILD_IMPLIB" ) == "yes" )
-                  call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -instpath=${" + cInstallDirVar + "}", .F. )
-               ELSEIF !( Len( aParams ) == 1 .AND. aParams[ 1 ] == "clean" )
+               ELSEIF AScan( aParams, "install" ) > 0
+                  IF ! Empty( GetEnv( cInstallDirVar ) ) .AND. ;
+                     ( ! ( cType == "implib" ) .OR. GetEnv( "HB_BUILD_IMPLIB" ) == "yes" )
+                     call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -instpath=${" + cInstallDirVar + "}", .F. )
+                  ENDIF
+               ELSE
                  call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -inc", .F. )
               ENDIF

               IF cType == "lib" .AND. GetEnv( "HB_BUILD_CONTRIB_DLL" ) == "yes" .AND. ;
                  hb_FileExists( FN_ExtSet( cBase + cProject, ".hbc" ) )

-                  cInstallDirVar := "HB_BIN_INSTALL_"
+                  cInstallDirVar := "HB_BIN_INSTALL"

                  IF AScan( aParams, "clean" ) > 0
                     call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -clean", .T. )
-                  ENDIF
-                  IF AScan( aParams, "install" ) > 0 .AND. ;
-                     ! Empty( GetEnv( cInstallDirVar ) ) .AND. ;
-                     ( ! ( cType == "implib" ) .OR. GetEnv( "HB_BUILD_IMPLIB" ) == "yes" )
-                     call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -instpath=${" + cInstallDirVar + "}", .T. )
-                  ELSEIF !( Len( aParams ) == 1 .AND. aParams[ 1 ] == "clean" )
+                  ELSEIF AScan( aParams, "install" ) > 0
+                     IF ! Empty( GetEnv( cInstallDirVar ) ) .AND. ;
+                        ( ! ( cType == "implib" ) .OR. GetEnv( "HB_BUILD_IMPLIB" ) == "yes" )
+                        call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -instpath=${" + cInstallDirVar + "}", .T. )
+                     ENDIF
+                  ELSE
                     call_hbmk2( cBase + cProject, cTargetDir, cOptions + " -inc", .T. )
                  ENDIF
               ENDIF
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -4086,6 +4086,10 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
   IF ( ! lSkipBuild .AND. ! lStopAfterInit .AND. ! lStopAfterHarbour .AND. hbmk[ _HBMK_nHBMODE ] != _HBMODE_RAW_C ) .OR. ;
      ( nHarbourPPO >= 2 .AND. lStopAfterHarbour ) /* or in preprocessor mode */

+      IF ! hbmk[ _HBMK_lCLEAN ]
+         PlugIn_Execute( hbmk, "pre_prg" )
+      ENDIF
+
      /* Incremental */

      IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lREBUILD ]
@@ -4155,8 +4159,6 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )

   IF ! lSkipBuild .AND. ! lStopAfterInit .AND. Len( l_aPRG_TODO ) > 0 .AND. ! hbmk[ _HBMK_lCLEAN ] .AND. hbmk[ _HBMK_nHBMODE ] != _HBMODE_RAW_C

-      PlugIn_Execute( hbmk, "pre_prg" )
-
      IF hbmk[ _HBMK_lINC ] .AND. ! hbmk[ _HBMK_lQuiet ]
         hbmk_OutStd( hbmk, I_( "Compiling Harbour sources..." ) )
      ENDIF