2009-09-20 15:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* external/pcre/config.h * Restored original only differing in whitespace. - external/pcre/ChangeLog - Deleted. Content is obsolete. + external/pcre/pcre.dif + Added .dif file. * config/darwin/gcc.mk * config/darwin/clang.mk * config/darwin/icc.mk + Finished dylib link generation for darwin.
2009-09-20 13:33:58 +00:00
parent ba63822d51
commit f7e2480bcc
7 changed files with 57 additions and 59 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-09-20 15:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * external/pcre/config.h
+    * Restored original only differing in whitespace.
+
+  - external/pcre/ChangeLog
+    - Deleted. Content is obsolete.
+
+  + external/pcre/pcre.dif
+    + Added .dif file.
+
+  * config/darwin/gcc.mk
+  * config/darwin/clang.mk
+  * config/darwin/icc.mk
+    + Finished dylib link generation for darwin.
+
 2009-09-20 15:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
  * config/global.mk
    * Changed to install libs by default to lib/<plat>/<comp> on *nixes too.
@@ -40,9 +55,10 @@
  * config/dyn.mk
    + Attempt to add link creation for dynlibs.
      Not tested yet.
-    ; TODO: darwin needs even more sopthistication.
+    ; TODO: darwin needs even more sopthistication. [DONE]
    ; TODO: clean support is missing yet.
    ; TODO: add this to rest of targets.
+    ; TODO: install support?

  * source/vm/vmmt/Makefile
    ! Disabled HB_HVM_ALL for linux-icc, because it causes compiler internal
--- a/harbour/config/darwin/clang.mk
+++ b/harbour/config/darwin/clang.mk
@@ -62,6 +62,6 @@ DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))

-DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS)
+DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) && $(LN) $(DYN_DIR)/$@ $(DYN_FILE2) && $(LN) $(DYN_DIR)/$@ $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR)$(DYN_EXT)

 include $(TOP)$(ROOT)config/rules.mk
--- a/harbour/config/darwin/gcc.mk
+++ b/harbour/config/darwin/gcc.mk
@@ -62,6 +62,6 @@ DFLAGS := -dynamic -flat_namespace -undefined warning -multiply_defined suppress
 DY_OUT := -o$(subst x,x, )
 DLIBS := $(foreach lib,$(SYSLIBS),-l$(lib))

-DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) && $(LN) $(DYN_DIR)/$@ $(DYN_FILE2)
+DY_RULE = $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ $^ $(DLIBS) && $(LN) $(DYN_DIR)/$@ $(DYN_FILE2) && $(LN) $(DYN_DIR)/$@ $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR)$(DYN_EXT)

 include $(TOP)$(ROOT)config/rules.mk
--- a/harbour/config/darwin/icc.mk
+++ b/harbour/config/darwin/icc.mk
@@ -60,6 +60,8 @@ define create_dynlib
   $(if $(wildcard __dyn__.tmp),@$(RM) __dyn__.tmp,)
   $(foreach file,$^,$(dyn_object))
   $(DY) $(DFLAGS) -install_name "harbour$(DYN_EXT)" -compatibility_version $(HB_VER_MAJOR).$(HB_VER_MINOR) -current_version $(HB_VER_MAJOR).$(HB_VER_MINOR).$(HB_VER_RELEASE) $(HB_USER_DFLAGS) $(DY_OUT)$(DYN_DIR)/$@ -filelist __dyn__.tmp $(DLIBS)
+   $(LN) $(DYN_DIR)/$@ $(DYN_FILE2)
+   $(LN) $(DYN_DIR)/$@ $(DYN_DIR)/$(DYN_PREF)$(DYNNAME2).$(HB_VER_MAJOR)$(DYN_EXT)
 endef

 DY_RULE = $(create_dynlib)
--- a/harbour/external/pcre/ChangeLog
+++ b/harbour/external/pcre/ChangeLog
@@ -1,56 +0,0 @@
-/*
- * $Id$
- */
-
-/*
- * Harbour Project - http://www.harbour-project.org
- * xHarbour Project - http://www.xharbour.org
- *
- * Please left here information about any modifications to original
- * PCRE files. It will make upgrading PCRE library much more easier
- * and safer in the future.
- *
- *
- * Use this format for the entry headers:
- * YYYY-MM-DD HH:MM UTC[-|+]hhmm Your Full Name <your_email@address>
- * For example:
- * 2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
- *
- */
-
-2007-12-02 04:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  * harbour/source/hbpcre/pcrecomp.c
-    * minor modification to pacify MSVC warnings
-
-2007-05-31 17:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  * harbour/source/hbpcre/pcredfa.c
-  * harbour/source/hbpcre/pcreexec.c
-  * harbour/source/hbpcre/pcrefind.c
-  * harbour/source/hbpcre/pcreprni.c
-  * harbour/source/hbpcre/pcrestud.c
-  * harbour/source/hbpcre/pcretryf.c
-    * cleaned some warnings
-
-2007-05-31 15:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  * initial upload to Harbour CVS
-  * filenames changed to keep 8.3 DOS format
-
-2006-01-31 22:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  * Makefile
-  * config.h
-    * moved SUPPORT_UCP and SUPPORT_UTF8 setting to reduce command line
-      overhead in DOS builds
-
-2005-09-27 10:50 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  * pcreglob.c
-    * minor modification to avoid G++ warning messages
-
-2005-09-01 12:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
-  + ChangeLog
-    + added change log for PCRE files
-  * pcredfa.c
-    * removed unused variables: is_repeated, endcode
-  * chartabs.c
-  * dftables.c
-    * add extern declaration for _pcre_default_tables - some C++ compilers
-      may need it
--- a/harbour/external/pcre/config.h
+++ b/harbour/external/pcre/config.h
@@ -1,6 +1,7 @@
 /* config.h.  Generated from config.h.in by configure.  */
 /* config.h.in.  Generated from configure.ac by autoheader.  */

+
 /* On Unix-like systems config.h.in is converted by "configure" into config.h.
 Some other environments also support the use of "configure". PCRE is written in
 Standard C, but there are a few non-standard things it can cope with, allowing
--- a/harbour/external/pcre/pcre.dif
+++ b/harbour/external/pcre/pcre.dif
@@ -0,0 +1,35 @@
+diff -u ori_src\pcre_globals.c ori_dst\pcre_globals.c
+--- ori_src\pcre_globals.c	Sun Jan 20 19:59:36 2008
+++ ori_dst\pcre_globals.c	Sun Sep 20 12:53:37 2009
+@@ -53,11 +53,17 @@
+ #include "pcre_internal.h"
+ 
+ #ifndef VPCOMPAT
+#if defined( __cplusplus ) && !defined( __IBMCPP__ )
+extern "C" {
+#endif
+ PCRE_EXP_DATA_DEFN void *(*pcre_malloc)(size_t) = malloc;
+ PCRE_EXP_DATA_DEFN void  (*pcre_free)(void *) = free;
+ PCRE_EXP_DATA_DEFN void *(*pcre_stack_malloc)(size_t) = malloc;
+ PCRE_EXP_DATA_DEFN void  (*pcre_stack_free)(void *) = free;
+ PCRE_EXP_DATA_DEFN int   (*pcre_callout)(pcre_callout_block *) = NULL;
+#if defined( __cplusplus ) && !defined( __IBMCPP__ )
+}
+#endif
+ #endif
+ 
+ /* End of pcre_globals.c */
+diff -u ori_src\pcre_internal.h ori_dst\pcre_internal.h
+--- ori_src\pcre_internal.h	Sat Apr 11 09:21:18 2009
+++ ori_dst\pcre_internal.h	Thu Sep 10 13:25:46 2009
+@@ -598,9 +598,9 @@
+ environments where these macros are defined elsewhere. Unfortunately, there
+ is no way to do the same for the typedef. */
+ 
+-typedef int BOOL;
+ 
+ #ifndef FALSE
+typedef int BOOL;
+ #define FALSE   0
+ #define TRUE    1
+ #endif