2008-02-06 11:08 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)

+ harbour/contrib/gtwvg/make_gcc.sh
  + harbour/contrib/hbapollo/make_gcc.sh
  + harbour/contrib/hbclipsm/make_gcc.sh
  + harbour/contrib/hbct/make_gcc.sh
  + harbour/contrib/hbfbird/make_gcc.sh
  + harbour/contrib/hbfimage/make_gcc.sh
  + harbour/contrib/hbgd/make_gcc.sh
  + harbour/contrib/hbgt/make_gcc.sh
  + harbour/contrib/hbmisc/make_gcc.sh
  + harbour/contrib/hbmsql/make_gcc.sh
  + harbour/contrib/hbmysql/make_gcc.sh
  + harbour/contrib/hbnf/make_gcc.sh
  + harbour/contrib/hbodbc/make_gcc.sh
  + harbour/contrib/hbole/make_gcc.sh
  + harbour/contrib/hbpgsql/make_gcc.sh
  + harbour/contrib/hbtip/make_gcc.sh
  + harbour/contrib/hbtpathy/make_gcc.sh
  + harbour/contrib/hbw32/make_gcc.sh
  + harbour/contrib/hbw32ddr/make_gcc.sh
  + harbour/contrib/hbwhat32/make_gcc.sh
  + harbour/contrib/hbziparch/make_gcc.sh
  + harbour/contrib/hbzlib/make_gcc.sh
  + harbour/contrib/rddads/make_gcc.sh
  + harbour/contrib/xhb/make_gcc.sh
    + Added missing files to allow compilation using non standard
      build system. Please note that some contribs require external
      packages, so to succesfuully compile them you will have to
      set a proper environment variable, pointing to a list of
      directories, containig required package header files. Those
      envvars are listed below :
         APOLLO_INC
         FIREBIRD_INC
         FREEIMAGE_INC
         GD_INC
         MYSQL_INC
         PGSQL_INC
         ZLIB_INC
         ADS_INC
      Note that those envvars may contain list of directories,
      for example :
         export ADS_INC="/usr/include include ."
      Also note that on Windows systems, using MingW or Cygwin, you will
      have to generate a proper import files from dlls, available in those
      packages - using MingW or Cygwin dlltool - to build end user programs,
      utilizing those packages.

  * harbour/contrib/mtpl_gcc.mak
  * harbour/contrib/mtpl_gcc.sh
  * harbour/contrib/make_gcc_all.sh
    + Added the rest of contrib libs to compile

  * harbour/contrib/hbtpathy/tplinux.c
  * harbour/contrib/hbtpathy/tpos2.c
  * harbour/contrib/hbtpathy/tpwin32.c
    + Added an operating system guard around the content of
      thses files to allow including all three files in a
      library.

harbour/ChangeLog

@@ -8,6 +8,65 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-06 11:08 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  + harbour/contrib/gtwvg/make_gcc.sh
+  + harbour/contrib/hbapollo/make_gcc.sh
+  + harbour/contrib/hbclipsm/make_gcc.sh
+  + harbour/contrib/hbct/make_gcc.sh
+  + harbour/contrib/hbfbird/make_gcc.sh
+  + harbour/contrib/hbfimage/make_gcc.sh
+  + harbour/contrib/hbgd/make_gcc.sh
+  + harbour/contrib/hbgt/make_gcc.sh
+  + harbour/contrib/hbmisc/make_gcc.sh
+  + harbour/contrib/hbmsql/make_gcc.sh
+  + harbour/contrib/hbmysql/make_gcc.sh
+  + harbour/contrib/hbnf/make_gcc.sh
+  + harbour/contrib/hbodbc/make_gcc.sh
+  + harbour/contrib/hbole/make_gcc.sh
+  + harbour/contrib/hbpgsql/make_gcc.sh
+  + harbour/contrib/hbtip/make_gcc.sh
+  + harbour/contrib/hbtpathy/make_gcc.sh
+  + harbour/contrib/hbw32/make_gcc.sh
+  + harbour/contrib/hbw32ddr/make_gcc.sh
+  + harbour/contrib/hbwhat32/make_gcc.sh
+  + harbour/contrib/hbziparch/make_gcc.sh
+  + harbour/contrib/hbzlib/make_gcc.sh
+  + harbour/contrib/rddads/make_gcc.sh
+  + harbour/contrib/xhb/make_gcc.sh
+    + Added missing files to allow compilation using non standard
+      build system. Please note that some contribs require external
+      packages, so to succesfuully compile them you will have to
+      set a proper environment variable, pointing to a list of
+      directories, containig required package header files. Those
+      envvars are listed below :
+         APOLLO_INC
+         FIREBIRD_INC
+         FREEIMAGE_INC
+         GD_INC
+         MYSQL_INC
+         PGSQL_INC
+         ZLIB_INC
+         ADS_INC
+      Note that those envvars may contain list of directories,
+      for example :
+         export ADS_INC="/usr/include include ."
+      Also note that on Windows systems, using MingW or Cygwin, you will
+      have to generate a proper import files from dlls, available in those
+      packages - using MingW or Cygwin dlltool - to build end user programs,
+      utilizing those packages.
+
+  * harbour/contrib/mtpl_gcc.mak
+  * harbour/contrib/mtpl_gcc.sh
+  * harbour/contrib/make_gcc_all.sh
+    + Added the rest of contrib libs to compile
+
+  * harbour/contrib/hbtpathy/tplinux.c
+  * harbour/contrib/hbtpathy/tpos2.c
+  * harbour/contrib/hbtpathy/tpwin32.c
+    + Added an operating system guard around the content of
+      thses files to allow including all three files in a
+      library.
+
 2008-02-08 15:58 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/include/hbcomp.h
   * harbour/include/hbmacro.h
@@ -38,7 +97,7 @@
   * harbour/source/compiler/harbour.y
   * harbour/source/compiler/harbour.yyc
     ! added protection against bug in bison destructors which might cause
-      multiple free the same memory block on syntax error due to 
+      multiple free the same memory block on syntax error due to
 
   * harbour/source/rdd/dbf1.c
     ! added missing binary flag for daytime fields

harbour/contrib/gtwvg/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbapollo/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${APOLLO_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need Apollo package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export APOLLO_INC=C:/Apollo/include"
+    echo "           or"
+    echo "           export APOLLO_INC=/usr/include/apollo"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${APOLLO_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbclipsm/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbct/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbfbird/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${FIREBIRD_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You'll need Firebird package and this envvar"
+    echo "           to be set to successfully build this library:"
+    echo "           export FIREBIRD_INC=C:/Firebird/include"
+    echo "           or"
+    echo "           export FIREBIRD_INC=/usr/include/firebird"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${FIREBIRD_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbfimage/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${FREEIMAGE_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need FreeImage package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export FREEIMAGE_INC=C:/Apollo/include"
+    echo "           or"
+    echo "           export FREEIMAGE_INC=/usr/include/freeimage"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${APOLLO_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbgd/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${GD_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need GD package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export GD_INC=c:/gd/include"
+    echo "           or"
+    echo "           export GD_INC=/usr/include/gd"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=
+for I in ${GD_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbgt/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbmisc/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbmsql/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbmysql/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${MYSQL_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need MYSQL package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export MYSQL_INC=C:/Mysql/include"
+    echo "           or"
+    echo "           export MYSQL_INC=/usr/include/mysql"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${MYSQL_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbnf/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbodbc/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbole/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbpgsql/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${PGSQL_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need PostgreSQL package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export PGSQL_INC=C:/Posgres/include"
+    echo "           or"
+    echo "           export PGSQL_INC=/usr/include/postgres"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${PGSQL_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbtip/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbtpathy/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbtpathy/tplinux.c

@@ -54,6 +54,8 @@
  *
  */
 
+#ifdef HB_OS_UNIX
+
 #define _CLIPDEFS_H
 
 #include <stdio.h>   /* Standard input/output definitions */
@@ -410,3 +412,4 @@ HB_FUNC( P_CTRLCTS ) {
    hb_retni( curvalue ? 1 : 0 );
 
 }
+#endif // HB_OS_UNIX

harbour/contrib/hbtpathy/tpos2.c

@@ -51,6 +51,8 @@
  *
  */
 
+#ifdef HB_OS_OS2
+
 #define _CLIPDEFS_H
 
 #define INCL_BASE
@@ -276,3 +278,4 @@ HB_FUNC( P_CTRLCTS ) {
    hb_retni( 0 );
 
 }
+#endif // HB_OS_OS2

harbour/contrib/hbtpathy/tpwin32.c

@@ -51,6 +51,8 @@
  *
  */
 
+#ifdef HB_OS_WIN_32
+
 #define _CLIPDEFS_H
 
 #include <windows.h>
@@ -133,3 +135,4 @@ HB_FUNC( P_WRITEPORT ) {
       hb_retnl( -1 );
    }
 }
+#endif // HB_OS_WIN_32

harbour/contrib/hbw32/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbw32ddr/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbwhat32/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9

harbour/contrib/hbziparch/make_gcc.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+export CFLAGS=-I./include
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/hbzlib/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${ZLIB_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need ZLib package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export ZLIB_INC=C:/Zlib/include"
+    echo "           or"
+    echo "           export ZLIB_INC=/usr/include"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${ZLIB_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/make_gcc_all.sh

@@ -22,7 +22,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then
          *bsd)                        hb_arch="bsd" ;;
       esac
    fi
-   export HB_ARCHITECTURE="$hb_arch" HB_ARCH_SAVED=1
+   export HB_ARCHITECTURE="$hb_arch" _HB_ARCH_SAVED=1
 fi
 
 #**************************************************************
@@ -33,19 +33,35 @@ if [ -z "$HB_CC_NAME" ]; then
       dos) HB_CC_NAME="djgpp" ;;
       *)   HB_CC_NAME="gcc" ;;
    esac
-   export HB_CC_NAME HB_CC_NAME_SAVED=1
+   export HB_CC_NAME _HB_CC_NAME_SAVED=1
 fi
 
 #**************************************************************
 
-export _HB_DIRS_1="hbbmcdx rddado"
-export _HB_DIRS_2="hbbtree"
+_HB_DIRS="hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmsql hbnf hbtip hbtpathy hbzlib xhb"
 
-#echo ${_HB_DIRS_1} ${_HB_DIRS_2}
+case "$HB_ARCHITECTURE" in
+   w32|cyg|os2)
+        _HB_DIRS_ADD="gtwvg hbole hbodbc hbw32 hbw32ddr hbwhat32 hbziparch rddado"
+        ;;
+   *)
+        _HB_DIRS_ADD=;;
+esac
+
+if [ "${APOLLO_INC}"    != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi;
+if [ "${FIREBIRD_INC}"  != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird "; fi;
+if [ "${FREEIMAGE_INC}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfimage"; fi;
+if [ "${GD_INC}"        != "" ]; then _HB_DIRS="${_HB_DIRS} hbgd    "; fi;
+if [ "${MYSQL_INC}"     != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql "; fi;
+if [ "${PGSQL_INC}"     != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql "; fi;
+if [ "${ZLIB_INC}"      != "" ]; then _HB_DIRS="${_HB_DIRS} hbzlib  "; fi;
+if [ "${ADS_INC}"       != "" ]; then _HB_DIRS="${_HB_DIRS} rddads  "; fi;
+
+_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD}"
 
 #**************************************************************
 
-for n in ${_HB_DIRS_1} ${_HB_DIRS_2}; do
+for n in ${_HB_DIRS}; do
   if [ -d $n ]; then
     echo Entering $n ... \( $1 $2 $3 $4 $5\)
     cd $n
@@ -56,7 +72,5 @@ done
 
 #**************************************************************
 
-unset _HB_DIRS_1 _HB_DIRS_2
-
-if [ -n "$HB_CC_NAME_SAVED" ]; then unset HB_CC_NAME HB_CC_NAME_SAVED;   fi
-if [ -n "$HB_ARCH_SAVED" ];    then unset HB_ARCHITECTURE HB_ARCH_SAVED; fi
+if [ -n "$_HB_CC_NAME_SAVED" ]; then unset HB_CC_NAME _HB_CC_NAME_SAVED;   fi
+if [ -n "$_HB_ARCH_SAVED" ];    then unset HB_ARCHITECTURE _HB_ARCH_SAVED; fi

harbour/contrib/mtpl_gcc.mak

@@ -98,7 +98,7 @@ INCLUDE_DIR = $(HB_ROOT)/include
 # Macros to access Harbour executable and other goodies
 #**********************************************************
 
-HARBOUR_EXE = $(BIN_DIR)harbour.exe
+HARBOUR_EXE = $(BIN_DIR)harbour
 
 #**********************************************************
 # C compiler definition and C flags. These should never have to change.

harbour/contrib/mtpl_gcc.sh

@@ -36,8 +36,8 @@ if [ -z "$_HB_CC_NAME" ]; then
       *)                           _HB_CC_NAME="gcc" ;;
    esac
    export _HB_CC_NAME
-   unset hb_arch
 fi
+
 if [ -z "${_HB_MAKE_PROGRAM}" ]; then export _HB_MAKE_PROGRAM=make; fi
 if [ -z "${_HB_MAKEFILE}" ];     then export _HB_MAKEFILE=../mtpl_gcc.mak; fi
 

harbour/contrib/rddads/make_gcc.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+if [ "${ADS_INC}" == "" ]
+then
+    echo "---------------------------------------------------------------"
+    echo "IMPORTANT: You will need Advantage package installed and this"
+    echo "           envvar to be set to successfully build this library:"
+    echo "           export ADS_INC=C:/Ads/include"
+    echo "           or"
+    echo "           export ADS_INC=/usr/include/ads"
+    echo "---------------------------------------------------------------"
+    exit 1
+fi
+
+export CFLAGS=""
+for I in ${ADS_INC}; do
+    CFLAGS="${CFLAGS} -I${I}"
+done
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9
+unset CFLAGS

harbour/contrib/xhb/make_gcc.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+#
+# $Id$
+#
+
+../mtpl_gcc.sh $1 $2 $3 $4 $5 $6 $7 $8 $9