2010-05-31 15:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

+ contrib/gtalleg/gtalleg.hbp + contrib/gtalleg/gtallegs.hbp + contrib/hbcurl/hbcurl.hbp + contrib/hbcurl/hbcurls.hbp + contrib/hbssl/hbssl.hbp + contrib/hbssl/hbssls.hbp + Added .hbp files for some thougher libs. * contrib/hbqt/hbqt_common.hbm * contrib/hbqt/hbqt.hbp * contrib/hbqt/hbqts.hbp * contrib/hbqt/hbqtcore.hbp * contrib/hbqt/hbqtcores.hbp * contrib/hbqt/hbqtgui.hbp * contrib/hbqt/hbqtguis.hbp * contrib/hbqt/hbqtnetwork.hbp * contrib/hbqt/hbqtnetworks.hbp * contrib/hbfbird/hbfbird.hbp * contrib/hbxbp/hbxbp.hbp * contrib/hbcomm/hbcomm.hbp * contrib/hbsms/hbsms.hbp + Added -nohbc. ! Fixed QT hbmk2 files to use different working dir for static and dynamic builds. ! Fixed QT hbmk2 files to create static libs with proper name. * contrib/hbcurl/hbcurls/Makefile ! Minor cleanup. * utils/hbmk2/hbmk2.prg + Will now also parse '#include <name>' style header dependencies. * contrib/hbqt/detect.mk * Synced key header name with .hbp. * contrib/hbcomm/hbcomm.hbp + Added missing -w3 -es2. * contrib/hbqt/hbqt.h - Deleted mild hack no more necessary.
2010-05-31 13:56:40 +00:00
parent 85ede0ab14
commit cdca660e6d
24 changed files with 210 additions and 14 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,49 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2010-05-31 15:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/gtalleg/gtalleg.hbp
+  + contrib/gtalleg/gtallegs.hbp
+  + contrib/hbcurl/hbcurl.hbp
+  + contrib/hbcurl/hbcurls.hbp
+  + contrib/hbssl/hbssl.hbp
+  + contrib/hbssl/hbssls.hbp
+    + Added .hbp files for some thougher libs.
+
+  * contrib/hbqt/hbqt_common.hbm
+  * contrib/hbqt/hbqt.hbp
+  * contrib/hbqt/hbqts.hbp
+  * contrib/hbqt/hbqtcore.hbp
+  * contrib/hbqt/hbqtcores.hbp
+  * contrib/hbqt/hbqtgui.hbp
+  * contrib/hbqt/hbqtguis.hbp
+  * contrib/hbqt/hbqtnetwork.hbp
+  * contrib/hbqt/hbqtnetworks.hbp
+  * contrib/hbfbird/hbfbird.hbp
+  * contrib/hbxbp/hbxbp.hbp
+  * contrib/hbcomm/hbcomm.hbp
+  * contrib/hbsms/hbsms.hbp
+    + Added -nohbc.
+    ! Fixed QT hbmk2 files to use different working dir for
+      static and dynamic builds.
+    ! Fixed QT hbmk2 files to create static libs with proper
+      name.
+
+  * contrib/hbcurl/hbcurls/Makefile
+    ! Minor cleanup.
+
+  * utils/hbmk2/hbmk2.prg
+    + Will now also parse '#include <name>' style header dependencies.
+
+  * contrib/hbqt/detect.mk
+    * Synced key header name with .hbp.
+
+  * contrib/hbcomm/hbcomm.hbp
+    + Added missing -w3 -es2.
+
+  * contrib/hbqt/hbqt.h
+    - Deleted mild hack no more necessary.
+
 2010-05-31 13:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  + contrib/hbwin/tests/oletst2.vbs
  + contrib/hbwin/tests/oletst2.js
--- a/harbour/contrib/gtalleg/gtalleg.hbp
+++ b/harbour/contrib/gtalleg/gtalleg.hbp
@@ -0,0 +1,23 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-stop{pocc|pocc64|poccarm|xcc|dmc|watcom|mingwarm|msvcarm}
+
+-reqheader=allegro.h
+
+-inctrypath=${HB_WITH_ALLEGRO}
+-inctrypath=/usr/include
+-inctrypath=/opt/local/include
+
+gtalleg.c
+ssf.c
--- a/harbour/contrib/gtalleg/gtallegs.hbp
+++ b/harbour/contrib/gtalleg/gtallegs.hbp
@@ -0,0 +1,10 @@
+#
+# $Id$
+#
+
+gtalleg.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DALLEGRO_STATICLINK
--- a/harbour/contrib/hbcomm/hbcomm.hbp
+++ b/harbour/contrib/hbcomm/hbcomm.hbp
@@ -4,7 +4,10 @@

 -hblib
 -inc
+-nohbc

 -o${hb_name}

+-w3 -es2
+
 hbcomm.prg
--- a/harbour/contrib/hbcurl/hbcurl.hbp
+++ b/harbour/contrib/hbcurl/hbcurl.hbp
@@ -0,0 +1,19 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-reqheader=curl/curl.h
+
+-inctrypath=${HB_WITH_CURL}
+-inctrypath=/usr/include
+
+hbcurl.c
--- a/harbour/contrib/hbcurl/hbcurls.hbp
+++ b/harbour/contrib/hbcurl/hbcurls.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!(win|wce)}
+
+hbcurl.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-cflag=-DCURL_STATICLIB
--- a/harbour/contrib/hbcurl/hbcurls/Makefile
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -16,7 +16,7 @@ C_SOURCES := \
 _DET_DSP_NAME := libcurl
 _DET_VAR_INC_ := HB_INC_CURL
 _DET_VAR_HAS_ := HB_HAS_CURL
-_DET_FLT_PLAT := !dos
+_DET_FLT_PLAT :=
 _DET_FLT_COMP :=
 _DET_INC_DEFP := /usr/include
 _DET_INC_HEAD := /curl/curl.h
--- a/harbour/contrib/hbfbird/hbfbird.hbp
+++ b/harbour/contrib/hbfbird/hbfbird.hbp
@@ -4,6 +4,7 @@

 -hblib
 -inc
+-nohbc

 -o${hb_name}

--- a/harbour/contrib/hbqt/detect.mk
+++ b/harbour/contrib/hbqt/detect.mk
@@ -16,7 +16,7 @@ _DET_VAR_HAS_ := HB_HAS_QT
 _DET_FLT_PLAT := !dos
 _DET_FLT_COMP := !mingw64 !watcom !bcc !pocc !pocc64 !poccarm !msvcia64
 _DET_INC_DEFP := /usr/include/qt4 /usr/lib/qt4/include /usr/include /Developer/qt/include
-_DET_INC_HEAD := /QtCore/qglobal.h
+_DET_INC_HEAD := /QtCore/QObject
 include $(TOP)$(ROOT)config/detfun.mk

 _QT_DARWIN :=
--- a/harbour/contrib/hbqt/hbqt.h
+++ b/harbour/contrib/hbqt/hbqt.h
@@ -67,7 +67,6 @@
 #endif

 #include <QtCore/qglobal.h>
-/* For hbmk2: #include "QtCore/QObject" */

 #if !( QT_VERSION >= 0x040500 )
   #error QT library version 4.5.0 or upper is required for hbqt.
--- a/harbour/contrib/hbqt/hbqt.hbp
+++ b/harbour/contrib/hbqt/hbqt.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm

 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 hbqt_base.cpp
 hbqt_destruct.cpp
--- a/harbour/contrib/hbqt/hbqt_common.hbm
+++ b/harbour/contrib/hbqt/hbqt_common.hbm
@@ -4,6 +4,7 @@

 -hblib
 -inc
+-nohbc

 -w3 -es2

--- a/harbour/contrib/hbqt/hbqtcore.hbp
+++ b/harbour/contrib/hbqt/hbqtcore.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm

 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 qtcore/*.cpp
 qtcore/*.prg
--- a/harbour/contrib/hbqt/hbqtcores.hbp
+++ b/harbour/contrib/hbqt/hbqtcores.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #

-@hbqtcore.hbp
+hbqtcore.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqtgui.hbp
+++ b/harbour/contrib/hbqt/hbqtgui.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm

 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 qtgui/*.cpp
 qtgui/*.prg
--- a/harbour/contrib/hbqt/hbqtguis.hbp
+++ b/harbour/contrib/hbqt/hbqtguis.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #

-@hbqtgui.hbp
+hbqtgui.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqtnetwork.hbp
+++ b/harbour/contrib/hbqt/hbqtnetwork.hbp
@@ -5,6 +5,7 @@
 hbqt_common.hbm

 -o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 qtnetwork/*.cpp
 qtnetwork/*.prg
--- a/harbour/contrib/hbqt/hbqtnetworks.hbp
+++ b/harbour/contrib/hbqt/hbqtnetworks.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #

-@hbqtnetwork.hbp
+hbqtnetwork.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbqt/hbqts.hbp
+++ b/harbour/contrib/hbqt/hbqts.hbp
@@ -2,6 +2,9 @@
 # $Id$
 #

-@hbqt.hbp
+hbqt.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}

 -cflag=-DQT_NODLL
--- a/harbour/contrib/hbsms/hbsms.hbp
+++ b/harbour/contrib/hbsms/hbsms.hbp
@@ -4,6 +4,7 @@

 -hblib
 -inc
+-nohbc

 -o${hb_name}

--- a/harbour/contrib/hbssl/hbssl.hbp
+++ b/harbour/contrib/hbssl/hbssl.hbp
@@ -0,0 +1,50 @@
+#
+# $Id$
+#
+
+-stop{wce}
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+-reqheader=openssl/ssl.h
+
+-inctrypath=${HB_WITH_OPENSSL}
+-inctrypath=/usr/include
+-inctrypath=/usr/local/include
+-inctrypath=/usr/local/ssl/include
+-inctrypath=/boot/common/include
+
+{darwin}-cflag=-DOPENSSL_NO_SHA256
+{darwin}-cflag=-DOPENSSL_NO_SHA512
+{darwin}-cflag=-DOPENSSL_NO_CAMELLIA
+{darwin}-cflag=-DOPENSSL_NO_SEED
+{darwin}-cflag=-DOPENSSL_NO_DGRAM
+{darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
+
+{win|wce}-cflag=-DOPENSSL_OPT_WINDLL
+
+# Patent will expire in 2010/2011
+-cflag=-DOPENSSL_NO_IDEA
+
+hbssl.c
+bio.c
+err.c
+evp.c
+evpciph.c
+evpenc.c
+evpmd.c
+evppkey.c
+pem.c
+rand.c
+ssl.c
+sslciph.c
+sslctx.c
+sslsess.c
+x509.c
--- a/harbour/contrib/hbssl/hbssls.hbp
+++ b/harbour/contrib/hbssl/hbssls.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+-stop{!(win|wce)}
+
+hbssl.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+{win|wce}-cflag=-UOPENSSL_OPT_WINDLL
--- a/harbour/contrib/hbxbp/hbxbp.hbp
+++ b/harbour/contrib/hbxbp/hbxbp.hbp
@@ -4,6 +4,7 @@

 -hblib
 -inc
+-nohbc

 -o${hb_name}

--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -5472,8 +5472,9 @@ STATIC FUNCTION SetupForGT( cGT_New, /* @ */ cGT, /* @ */ lGUI )
   root file. It won't attempt to parse all possible #include syntaxes
   and source code formats, won't try to interpret comments, line
   continuation, different keyword and filename cases, etc, etc. In
-   order to work, it will need #include "filename" format in source.
-   If this isn't enough for your needs, feel free to update the code.
+   order to work, it will need #include "filename" and #include
+   <filename> format in source. If this isn't enough for your needs,
+   feel free to update the code.
   [vszakats] */

 #define _HEADSTATE_hFiles       1
@@ -5676,11 +5677,15 @@ STATIC FUNCTION FindNewerHeaders( hbmk, cFileName, cParentDir, tTimeParent, lInc
      cHeader := NIL
      nPos := 1
      DO WHILE .T.
-
-         IF ( tmp := hb_At( '#include "', cFile, nPos ) ) > 0
-            nPos := tmp + Len( '#include "' )
-            IF ( tmp := hb_At( '"', cFile, nPos ) ) > 0
-               cHeader := SubStr( cFile, nPos, tmp - nPos )
+         IF ( tmp := hb_At( '#include ', cFile, nPos ) ) > 0
+            nPos := tmp + Len( '#include ' )
+            tmp := SubStr( cFile, nPos, 1 )
+            ++nPos
+            IF tmp $ '"<'
+               IF ( tmp := hb_At( iif( tmp == "<", ">", '"' ), cFile, nPos ) ) > 0
+                  cHeader := SubStr( cFile, nPos, tmp - nPos )
+                  nPos := tmp
+               ENDIF
            ENDIF
         ELSE
            EXIT