2009-06-09 10:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* INSTALL
    * Minor simplification.

  * make_gnu.bat
    * Minor cleanup.
    - Deleted 'don't modify, this is a template' text.

  * utils/hbmk2/hbmk2.prg
    + Targets will now get an alternate workdir by default
      on win/wce platforms when using -hbdyn.
    ; TOFIX: ? HB_DYNLIB usage should be cleaned and synced with
             GNU Make system.
             Current HB_DYNLIB usage:
                GNU Make system: ( win or wce ) and non-gcc
                hbmk2: ( win or wce )

  * contrib/Makefile
  - contrib/hbmsql
  + examples/hbmsql
    * Moved hbmsql to examples.

  - examples/hbmsql/Makefile
  + examples/hbmsql/hbmsql.hbp
    + Changed GNU Make file to hbmk2 make file.

  * examples/hbmake/hbmake.hbp
    * Minor to comment.

harbour/ChangeLog

@@ -17,6 +17,35 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-09 10:51 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * INSTALL
+    * Minor simplification.
+
+  * make_gnu.bat
+    * Minor cleanup.
+    - Deleted 'don't modify, this is a template' text.
+
+  * utils/hbmk2/hbmk2.prg
+    + Targets will now get an alternate workdir by default
+      on win/wce platforms when using -hbdyn.
+    ; TOFIX: ? HB_DYNLIB usage should be cleaned and synced with
+             GNU Make system.
+             Current HB_DYNLIB usage:
+                GNU Make system: ( win or wce ) and non-gcc
+                hbmk2: ( win or wce )
+
+  * contrib/Makefile
+  - contrib/hbmsql
+  + examples/hbmsql
+    * Moved hbmsql to examples.
+
+  - examples/hbmsql/Makefile
+  + examples/hbmsql/hbmsql.hbp
+    + Changed GNU Make file to hbmk2 make file.
+
+  * examples/hbmake/hbmake.hbp
+    * Minor to comment.
+
 2009-06-09 10:54 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/do.c
     ! fixed mistake in previous commit

harbour/INSTALL

@@ -296,7 +296,6 @@ EXAMPLES
                Don't use spaces in dirs.
              - '%1 %2' can be empty, 'clean', 'install' or 'clean install'
                depending on what you want to do.
-             - Windows implib creation setup may change in the future.
              - Cross build setup (HB_BIN_COMPILE, HB_COMP_PATH, HB_PPGEN_PATH)
                is tentative.
 
@@ -547,8 +546,8 @@ TROUBLESHOOTING
      to get the source.
    - Keep you PATH clean from old, mixed compiler tools or other Harbour
      versions when building Harbour. The surest way to achieve this is to
-     leave only GNU Make directory and compiler directory in PATH (order
-     significant):  set PATH=C:\<makedir>;C:\<compilerdir>
+     leave only compiler directory in PATH:
+        set PATH=C:\<compilerdir>
    - Remove all old, unnecessary environment variables from your environment.
      Use only those documented in this file.
    - Try to do no or only small modifications at once to command examples

harbour/contrib/Makefile

@@ -38,7 +38,6 @@ DIRS +=\
 	hbfimage \
 	hbgd \
 	hbhpdf \
-	hbmsql \
 	hbmysql \
 	hbpgsql \
 	hbqt \

harbour/contrib/hbmsql/Makefile

@@ -1,23 +0,0 @@
-#
-# $Id$
-#
-
-ROOT = ../../
-
-LIBNAME=hbmsql
-
-C_SOURCES=\
-	msql.c \
-
-PRG_SOURCES=\
-	tmsql.prg \
-
-PRG_HEADERS=\
-	msql.ch \
-
-include $(TOP)$(ROOT)config/header.cf
-INSTALL_RULE_HEADERS := $(INSTALL_RULE)
-include $(TOP)$(ROOT)config/lib.cf
-
-install::
-	$(INSTALL_RULE_HEADERS)

harbour/examples/hbmake/hbmake.hbp

@@ -2,10 +2,10 @@
 # $Id$
 #
 
-# To build 'hbmake', type: 'hbmk2 hbmake.hbp'
+# To build hbmake, type: 'hbmk2 hbmake.hbp'
 
 hbmake.prg
 hbmakec.c
 
-# Copy to Harbour binary directory for convenience:
+# Copy to Harbour binary directory for convenience
 -instpath=${HB_BIN}/

harbour/examples/hbmsql/hbmsql.hbp

@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+-hblib
+
+-ohbmsql
+
+msql.c
+tmsql.prg

harbour/make_gnu.bat

@@ -5,26 +5,16 @@
 @echo off
 
 rem ---------------------------------------------------------------
-rem This is a generic template file, if it doesn't fit your own needs
-rem please DON'T MODIFY IT.
-rem
-rem Instead, make a local copy and modify that one, or make a call to
-rem this batch file from your customized one. [vszakats]
-rem ---------------------------------------------------------------
-
-rem ---------------------------------------------------------------
-rem Template to initialize the environment before starting
-rem the GNU make system for Harbour
-rem
-rem For further information about the GNU make system please
-rem check doc/gmake.txt
-rem
 rem Copyright 1999-2009 Viktor Szakats (harbour.01 syenar.hu)
 rem See COPYING for licensing terms.
+rem
+rem Initialize environment for GNU Make system to build Harbour
+rem
+rem For further information about the GNU Make system please
+rem check doc/gmake.txt
 rem ---------------------------------------------------------------
 
-rem Setup defaults.
-
+rem Setup defaults
 if "%HB_ARCHITECTURE%" == "" if not "%WINDIR%" == "" set HB_ARCHITECTURE=win
 if "%HB_ARCHITECTURE%" == ""                         set HB_ARCHITECTURE=dos
 if "%HB_COMPILER%"     == "" if not "%WINDIR%" == "" goto WIN_AUTODETECT
@@ -34,7 +24,7 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
 
    if "%HB_INSTALL_PREFIX%" == "" if "%OS%" == "Windows_NT" set HB_INSTALL_PREFIX=%~dp0
 
-   rem Set to constant value to be consistent with the non-GNU make files.
+   rem Set to constant value.
    if "%HB_BIN_INSTALL%" == "" set HB_BIN_INSTALL=%HB_INSTALL_PREFIX%\bin
    if "%HB_LIB_INSTALL%" == "" set HB_LIB_INSTALL=%HB_INSTALL_PREFIX%\lib
    if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=%HB_INSTALL_PREFIX%\include
@@ -46,8 +36,6 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    if not exist %HB_INC_INSTALL%\*.* md %HB_INC_INSTALL%
    if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL%
 
-:START
-
    if "%HB_ARCHITECTURE%" == "" goto BAD_ARCH
    if "%HB_COMPILER%" == "" goto BAD_COMP
 
@@ -145,7 +133,7 @@ if "%HB_COMPILER%"     == ""                         set HB_COMPILER=djgpp
    set _HB_PATH=
 
    rem ---------------------------------------------------------------
-   rem Start the GNU make system
+   rem Start the GNU Make system
 
    rem ---------------------------------------------------------------
    rem Special build mode when HB_BUILD_DLL=yes on Windows platform.

harbour/utils/hbmk2/hbmk2.prg

@@ -1813,7 +1813,14 @@ FUNCTION hbmk( aArgs, /* @ */ lPause, /* @ */ lUTF8 )
    /* Decide about working dir */
    IF ! lStopAfterInit
       IF hbmk[ _HBMK_lINC ]
-         DEFAULT cWorkDir TO FN_DirGet( s_cPROGNAME ) + _WORKDIR_DEF_
+         /* NOTE: We store -hbdyn objects in different dirs by default as - for Windows
+                  platforms - they're always built using different compilation options
+                  than normal targets. [vszakats] */
+         IF lCreateDyn .AND. hbmk[ _HBMK_cARCH ] $ "win|wce"
+            DEFAULT cWorkDir TO FN_DirGet( s_cPROGNAME ) + _WORKDIR_DEF_ + hb_osPathSeparator() + "hbdyn"
+         ELSE
+            DEFAULT cWorkDir TO FN_DirGet( s_cPROGNAME ) + _WORKDIR_DEF_
+         ENDIF
          AAdd( hbmk[ _HBMK_aOPTPRG ], "-o" + cWorkDir + hb_osPathSeparator() ) /* NOTE: Ending path sep is important. */
          IF ! DirBuild( cWorkDir )
             hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Working directory cannot be created: %1$s" ), cWorkDir ) )