2009-02-18 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* ChangeLog
  * utils/hbmk/hbmk2.prg
    * TODOs moved to source file.
    + Added hbp comment syntax to help screen.

  * config/win/install.cf
    ! Reverted previous fix (with xcopy) and replaced with
      official method to suppress return value.

harbour/ChangeLog

@@ -8,6 +8,16 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-02-18 22:00 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * ChangeLog
+  * utils/hbmk/hbmk2.prg
+    * TODOs moved to source file.
+    + Added hbp comment syntax to help screen.
+
+  * config/win/install.cf
+    ! Reverted previous fix (with xcopy) and replaced with
+      official method to suppress return value.
+
 2009-02-18 20:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbthread.h
   * harbour/source/vm/thread.c
@@ -42,7 +52,7 @@
 2009-02-18 16:21 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk/hbmk2.prg
     * '-l-' is now passed to Harbour instead of being considered
-      as a lib spec.
+      a lib spec.
     * Arch/comp is now case-insensitive in filters too.
     * Removed GTSTD usage.
       It caused a stall at startup for BCC, and Ctrl+C had
@@ -142,7 +152,7 @@
              to replace expressions:
              '( key == K_MM*DOWN )' with the compatible:
              '( key == K_MOUSEMOVE .AND. M*DOWN() )' to prepare
-             for the fix.
+             for the fix. [DONE]
 
 2009-02-18 12:17 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbapi.h
@@ -950,30 +960,32 @@
       - details of *NIX stuff, systems libs, switches,
         etc, etc.
       - -fullstatic not yet supported. [DONE]
-      - fmstat/nofmstat. It would be good to find a
-        more easily manageable way to influence that.
-        Current one is make system dependent and a bit hackish.
       - handling 3rd party libs. These should be supported
         by supplying proper parameter, and we can provide
         example scripts for these libs. Hard-wiring them
-        into core Harbour is quite dangerous.
-      - "MAIN" function override. I'd rather leave this out,
-        and clear up the situation with entry procs.
-      - gtsln and gtcrs support.
-      - Watcom, OS/2, *NIX not tested.
+        into core Harbour is quite dangerous. [DONE]
       - Built-in support for our contribs. For clear
         separation of components contribs shouldn't be
-        referred to in this core component.
+        referred to in this core component. [DONE]
       - Filtering foreign system libs passed on the command
         line for platforms not needing them. The goal is to
         be able to use as simple and _portable_ hbmk command
         lines as possible. [DONE]
+      - "MAIN" function override. I'd rather leave this out,
+        and clear up the situation with entry procs.
+      - fmstat/nofmstat. It would be good to find a
+        more easily manageable way to influence that.
+        Current one is make system dependent and a bit hackish.
+        [MOVED TO hbmk2.prg]
+      - gtsln and gtcrs support. [MOVED TO hbmk2.prg]
+      - Watcom, OS/2, *NIX not tested.
       - Support for POCC, DM.
     ; TODO:
       - Switch to portable command lines in hbmk.bat files. [DONE]
         (Win9x will be supported again). [DONE]
       - Remove bin/hbmk*.bat, bin/hbmk*.cmd, util/hbmake/*. [DONE]
       - Cleanup on variable names in hbmk.prg.
+        [MOVED TO hbmk2.prg]
 
   * tests/testid.prg
     * Minor cleanup.

harbour/config/win/install.cf

@@ -15,7 +15,7 @@ INSTALL_LIST = $(subst /,\,$(INSTALL_OBJS))
 ifeq ($(CMD_EXE),yes)
 # cmd.exe no command line size limit
 INSTALL_RULE = \
-	$(COMSPEC) /c for %f in ($(INSTALL_LIST)) do xcopy /d /y %f $(subst /,\,$(INSTALL_DIR))
+	-$(COMSPEC) /c for %f in ($(INSTALL_LIST)) do copy %f $(subst /,\,$(INSTALL_DIR))
 else
 # We have to use script to overcome the DOS limit of max 128 characters
 # NOTE: The empty line directly before 'endef' HAVE TO exist!

harbour/utils/hbmk/hbmk2.prg

@@ -60,8 +60,12 @@
 /* TODO: Add support for more hbmk script features. */
 /* TODO: Add support for Windows resource files. */
 /* TODO: Add support for library creation. */
+/* TODO: Add support for gtsln and gtcrs. */
+/* TODO: Add support for fmstat and nofmstat. Possibly we need something
+         cleaner than in hbmk (script). */
 /* TODO: msvc/bcc32: Use separate link phase. This allows incremental links. */
 /* TODO: Support for more compilers/platforms. */
+/* TODO: Cleanup on variable names. */
 
 REQUEST hbm_ARCH
 REQUEST hbm_COMP
@@ -1148,14 +1152,6 @@ STATIC FUNCTION AAddNotEmpty( aArray, xItem )
 
    RETURN aArray
 
-STATIC FUNCTION DirAdaptPathSep( cFileName )
-
-   IF t_cARCH $ "win|dos|os2" .AND. !( t_cCOMP == "mingw" )
-      RETURN StrTran( cFileName, "/", "\" )
-   ENDIF
-
-   RETURN StrTran( cFileName, "\", "/" )
-
 /* Append optional prefix and optional extension to all members */
 STATIC FUNCTION ListCook( array, cPrefix, cExt )
    LOCAL tmp
@@ -1198,6 +1194,14 @@ STATIC FUNCTION ListToArray( cList )
 
    RETURN array
 
+STATIC FUNCTION DirAdaptPathSep( cFileName )
+
+   IF t_cARCH $ "win|dos|os2" .AND. !( t_cCOMP == "mingw" )
+      RETURN StrTran( cFileName, "/", "\" )
+   ENDIF
+
+   RETURN StrTran( cFileName, "\", "/" )
+
 STATIC FUNCTION DirAddPathSep( cDir )
 
    IF ! Empty( cDir ) .AND. !( Right( cDir, 1 ) == hb_osPathSeparator() )
@@ -1572,6 +1576,7 @@ STATIC PROCEDURE ShowHelp()
       "    libs=[<libname[s]>], gt=[gtname], prgflags=[Harbour flags]" ,;
       "    cflags=[C compiler flags], ldflags=[Linker flags], libpaths=[lib paths]" ,;
       "    gui|mt|shared|nulrdd|debug|map|strip|run=[yes|no]" ,;
+      "    Lines starting with '#' char are ignored" ,;
       "  - Platform filters are accepted in each .hbp line and with -l options." ,;
       "    Filter format: {[!][<arch|comp>]}. Filters can be combined " ,;
       "    using '&', '|' operators and grouped by parantheses." ,;