2009-03-25 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* doc/en/Makefile
  * doc/Makefile
  - doc/en
  + doc/en-EN
    * Renamed.

  + man
  + man/nfdoc
  + man/manpages
    + Added new dir for Harbour manuals.
    ; TODO: Move files here from /doc.

  * contrib/hbtpathy/tests/testtp.prg
    * Applied update/fix by Barry Jackson.

  * utils/hbmk2/hbmk2.prg
    + Added autodetection of MinGW compiler if installed in the
      Harbour directory tree in the mingw dir.
      This way it's possible to create a fully setup-free
      install kit, which is able to produce Harbour executables
      right after unzip by simply issuing command: hbmk2 hello.prg

harbour/ChangeLog

@@ -8,6 +8,29 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-25 15:47 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * doc/en/Makefile
+  * doc/Makefile
+  - doc/en
+  + doc/en-EN
+    * Renamed.
+
+  + man
+  + man/nfdoc
+  + man/manpages
+    + Added new dir for Harbour manuals.
+    ; TODO: Move files here from /doc.
+
+  * contrib/hbtpathy/tests/testtp.prg
+    * Applied update/fix by Barry Jackson.
+
+  * utils/hbmk2/hbmk2.prg
+    + Added autodetection of MinGW compiler if installed in the
+      Harbour directory tree in the mingw dir.
+      This way it's possible to create a fully setup-free
+      install kit, which is able to produce Harbour executables
+      right after unzip by simply issuing command: hbmk2 hello.prg
+
 2009-03-26 14:10 UTC+0200 Mindaugas Kavaliauskas (dbtopas/at/dbtopas.lt)
   * harbour/contrib/hbole/olecore.c
     * fixed compile time warning

harbour/contrib/hbtpathy/tests/testtp.prg

@@ -67,12 +67,10 @@
 */
 
 function main
-   ?
-   ?
    ? tp_open( 1,, 9600, 8, "N", 1 )
-   //tp_send( 1, "Hi there bob" )
+   tp_send( 1, "Hi there Bob", 1 )    // One second timeout
    tp_inkey( .5 )
-   //? tp_recv( 1 )
+   ? tp_recv( 1 )
    ?
    tp_Close( 1 )
 return nil

harbour/doc/Makefile

@@ -35,7 +35,7 @@ DOC_FILES=\
 	windll.txt \
 
 DIRS=\
-	en \
+	en-EN \
 
 include $(TOP)$(ROOT)config/doc.cf
 include $(TOP)$(ROOT)config/dir.cf

harbour/doc/en-EN/Makefile

@@ -4,7 +4,7 @@
 
 ROOT = ../../
 
-DOC_SUBDIR=/en
+DOC_SUBDIR=/en-EN
 
 DOC_FILES=\
 	array.txt \

harbour/utils/hbmk2/hbmk2.prg

@@ -62,7 +62,7 @@
  * See COPYING for licensing terms.
  *
  */
-
+#pragma linenumber=on
 /*
    Man page HOWTO:
       http://www.schweikhardt.net/man_page_howto.html
@@ -486,7 +486,7 @@ FUNCTION Main( ... )
       cOptPrefix := "-/"
    CASE t_cARCH == "win"
       /* Order is significant.
-         owatcom also keeps a cl.exe in it's binary dir. */
+         owatcom also keeps a cl.exe in its binary dir. */
       aCOMPDET := { { {|| FindInPath( t_cCCPREFIX + "gcc" ) != NIL }, "mingw"   },; /* TODO: Add full support for g++ */
                     { {|| FindInPath( "wpp386"   ) != NIL .AND. ;
                           ! Empty( GetEnv( "WATCOM" ) ) }, "owatcom" },; /* TODO: Add full support for wcc386 */
@@ -521,64 +521,7 @@ FUNCTION Main( ... )
    /* Setup GUI state for Harbour default */
    SetupForGT( t_cGTDEFAULT, NIL, @s_lGUI )
 
-   /* Autodetect compiler */
-
-   IF lStopAfterHarbour
-      /* If we're just compiling .prg to .c we don't need a C compiler. */
-      t_cCOMP := ""
-   ELSE
-      IF Empty( t_cCOMP ) .OR. t_cCOMP == "bld"
-         IF Len( aCOMPSUP ) == 1
-            t_cCOMP := aCOMPSUP[ 1 ]
-         ELSEIF t_cARCH == "linux" .OR. t_cCOMP == "bld"
-            t_cCOMP := cSelfCOMP
-            IF AScan( aCOMPSUP, {|tmp| tmp == t_cCOMP } ) == 0
-               t_cCOMP := NIL
-            ENDIF
-         ELSEIF ! Empty( aCOMPDET )
-            /* Look for this compiler first */
-            FOR tmp := 1 TO Len( aCOMPDET )
-               IF aCOMPDET[ tmp ][ 2 ] == cSelfCOMP .AND. Eval( aCOMPDET[ tmp ][ 1 ] )
-                  t_cCOMP := aCOMPDET[ tmp ][ 2 ]
-                  EXIT
-               ENDIF
-            NEXT
-            IF Empty( t_cCOMP )
-               /* Check the rest of compilers */
-               FOR tmp := 1 TO Len( aCOMPDET )
-                  IF !( aCOMPDET[ tmp ][ 2 ] == cSelfCOMP ) .AND. Eval( aCOMPDET[ tmp ][ 1 ] )
-                     t_cCOMP := aCOMPDET[ tmp ][ 2 ]
-                     EXIT
-                  ENDIF
-               NEXT
-            ENDIF
-         ENDIF
-         IF ! Empty( t_cCOMP )
-            IF t_lInfo
-               OutStd( "hbmk: Autodetected compiler: " + t_cCOMP + hb_osNewLine() )
-            ENDIF
-         ELSE
-            IF Empty( aCOMPDET )
-               OutErr( "hbmk: Please choose a compiler by using -comp= option or envvar HB_COMPILER." + hb_osNewLine() )
-               OutErr( "      You have the following choices on your platform:" + hb_osNewLine() )
-               OutErr( "      " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() )
-            ELSE
-               OutErr( "hbmk: Harbour Make couldn't detect any supported C compiler in your PATH." + hb_osNewLine() )
-               OutErr( "      Please setup one or set -comp= option or envvar HB_COMPILER" + hb_osNewLine() )
-               OutErr( "      to one of these values:" + hb_osNewLine() )
-               OutErr( "      " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() )
-            ENDIF
-            PauseForKey()
-            RETURN 2
-         ENDIF
-      ELSE
-         IF AScan( aCOMPSUP, {|tmp| tmp == t_cCOMP } ) == 0
-            OutErr( "hbmk: Error: Compiler value unknown: " + t_cCOMP + hb_osNewLine() )
-            PauseForKey()
-            RETURN 2
-         ENDIF
-      ENDIF
-   ENDIF
+   /* Autodetect Harbour environment */
 
    /* Detect system locations to enable shared library option by default */
    lSysLoc := hb_DirBase() == "/usr/local/bin/" .OR. ;
@@ -586,15 +529,11 @@ FUNCTION Main( ... )
               hb_DirBase() == "/opt/harbour/" .OR. ;
               hb_DirBase() == "/opt/bin/"
 
-   /* Autodetect Harbour environment */
+   s_cHB_BIN_INSTALL := PathSepToSelf( GetEnv( "HB_BIN_INSTALL" ) )
+   s_cHB_LIB_INSTALL := PathSepToSelf( GetEnv( "HB_LIB_INSTALL" ) )
+   s_cHB_INC_INSTALL := PathSepToSelf( GetEnv( "HB_INC_INSTALL" ) )
 
-   s_aLIBPATH := {}
-
-   s_cHB_BIN_INSTALL := PathSepToTarget( GetEnv( "HB_BIN_INSTALL" ) )
-   s_cHB_LIB_INSTALL := PathSepToTarget( GetEnv( "HB_LIB_INSTALL" ) )
-   s_cHB_INC_INSTALL := PathSepToTarget( GetEnv( "HB_INC_INSTALL" ) )
-
-   s_cHB_INSTALL_PREFIX := PathSepToTarget( GetEnv( "HB_INSTALL_PREFIX" ) )
+   s_cHB_INSTALL_PREFIX := PathSepToSelf( GetEnv( "HB_INSTALL_PREFIX" ) )
    IF Empty( s_cHB_INSTALL_PREFIX )
       DO CASE
       CASE hb_FileExists( DirAddPathSep( hb_DirBase() ) + cBin_CompPRG )
@@ -645,6 +584,82 @@ FUNCTION Main( ... )
       OutStd( "hbmk: Using Harbour: " + s_cHB_BIN_INSTALL + " " + s_cHB_INC_INSTALL + " " + s_cHB_LIB_INSTALL + hb_osNewLine() )
    ENDIF
 
+   /* Autodetect compiler */
+
+   IF lStopAfterHarbour
+      /* If we're just compiling .prg to .c we don't need a C compiler. */
+      t_cCOMP := ""
+   ELSE
+      IF Empty( t_cCOMP ) .OR. t_cCOMP == "bld"
+         IF Len( aCOMPSUP ) == 1
+            t_cCOMP := aCOMPSUP[ 1 ]
+         ELSEIF t_cARCH == "linux" .OR. t_cCOMP == "bld"
+            t_cCOMP := cSelfCOMP
+            IF AScan( aCOMPSUP, {|tmp| tmp == t_cCOMP } ) == 0
+               t_cCOMP := NIL
+            ENDIF
+         ELSE
+            #if defined( __PLATFORM__WINDOWS )
+               IF Empty( t_cCCPATH )
+                  tmp := PathNormalize( s_cHB_INSTALL_PREFIX ) + "mingw" + hb_osPathSeparator() + "bin"
+                  IF hb_FileExists( tmp + hb_osPathSeparator() + "gcc.exe" )
+                     t_cCOMP := "mingw"
+                     t_cCCPATH := tmp
+                  ENDIF
+               ENDIF
+            #endif
+            IF Empty( t_cCOMP ) .AND. ! Empty( aCOMPDET )
+               /* Look for this compiler first */
+               FOR tmp := 1 TO Len( aCOMPDET )
+                  IF aCOMPDET[ tmp ][ 2 ] == cSelfCOMP .AND. Eval( aCOMPDET[ tmp ][ 1 ] )
+                     t_cCOMP := aCOMPDET[ tmp ][ 2 ]
+                     EXIT
+                  ENDIF
+               NEXT
+               IF Empty( t_cCOMP )
+                  /* Check the rest of compilers */
+                  FOR tmp := 1 TO Len( aCOMPDET )
+                     IF !( aCOMPDET[ tmp ][ 2 ] == cSelfCOMP ) .AND. Eval( aCOMPDET[ tmp ][ 1 ] )
+                        t_cCOMP := aCOMPDET[ tmp ][ 2 ]
+                        EXIT
+                     ENDIF
+                  NEXT
+               ENDIF
+            ENDIF
+         ENDIF
+         IF ! Empty( t_cCOMP )
+            IF t_lInfo
+               OutStd( "hbmk: Autodetected compiler: " + t_cCOMP + hb_osNewLine() )
+            ENDIF
+         ELSE
+            IF Empty( aCOMPDET )
+               OutErr( "hbmk: Please choose a compiler by using -comp= option or envvar HB_COMPILER." + hb_osNewLine() )
+               OutErr( "      You have the following choices on your platform:" + hb_osNewLine() )
+               OutErr( "      " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() )
+            ELSE
+               OutErr( "hbmk: Harbour Make couldn't detect any supported C compiler in your PATH." + hb_osNewLine() )
+               OutErr( "      Please setup one or set -comp= option or envvar HB_COMPILER" + hb_osNewLine() )
+               OutErr( "      to one of these values:" + hb_osNewLine() )
+               OutErr( "      " + ArrayToList( aCOMPSUP, ", " ) + hb_osNewLine() )
+            ENDIF
+            PauseForKey()
+            RETURN 2
+         ENDIF
+      ELSE
+         IF AScan( aCOMPSUP, {|tmp| tmp == t_cCOMP } ) == 0
+            OutErr( "hbmk: Error: Compiler value unknown: " + t_cCOMP + hb_osNewLine() )
+            PauseForKey()
+            RETURN 2
+         ENDIF
+      ENDIF
+   ENDIF
+
+   s_cHB_BIN_INSTALL := PathSepToTarget( s_cHB_BIN_INSTALL )
+   s_cHB_LIB_INSTALL := PathSepToTarget( s_cHB_LIB_INSTALL )
+   s_cHB_INC_INSTALL := PathSepToTarget( s_cHB_INC_INSTALL )
+
+   s_aLIBPATH := {}
+
    /* Add main Harbour library dir to lib path list */
    AAddNotEmpty( s_aLIBPATH, s_cHB_LIB_INSTALL )