diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 23b10f4959..cf1da2f5b8 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,30 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-11-04 12:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * contrib/rddsql/mysqldd.c + ! Excluded sizeof() in #ifdef to compile with MinGW. + + * contrib/hbhpdf/make_gcc.sh + ! Fixed missing quote char. + + * contrib/mtpl_gcc.mak + ! Fixed to create its own OBJ dir. Not the ultimate + solution, pls enhance if you think. + + * source/codepage/cpeswinm.c + * source/codepage/cpeswin.c + ! Fixed linked codepage to be Windows-1252 instead of + ISO-8859-1. For the ISO versions, pls see ESISO variants. + + * source/codepage/cpes850.c + * source/codepage/cpesisom.c + * Comments. + + * contrib/make_gcc_all.sh + ! Fixed to not include externally dependent contribs, + when HB_CONTRIBLIBS is specified by user. + 2008-11-04 09:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbextern.ch + Added HB_CODEPAGE_SVISO. diff --git a/harbour/contrib/hbhpdf/make_gcc.sh b/harbour/contrib/hbhpdf/make_gcc.sh index 3370d33eca..ea325c5222 100755 --- a/harbour/contrib/hbhpdf/make_gcc.sh +++ b/harbour/contrib/hbhpdf/make_gcc.sh @@ -7,7 +7,7 @@ if [ "${HB_INC_LIBHARU}" = "" ] then echo "---------------------------------------------------------------" - echo "IMPORTANT: You will need Haru Free PDF Library (libharu) DLL + echo "IMPORTANT: You will need Haru Free PDF Library (libharu) DLL" echo " package installed and this envvar to be set to" echo " successfully build this library:" echo " export HB_INC_LIBHARU=C:/libharu/include" diff --git a/harbour/contrib/make_gcc_all.sh b/harbour/contrib/make_gcc_all.sh index 5bc4be9ba5..36bbd4ddc5 100755 --- a/harbour/contrib/make_gcc_all.sh +++ b/harbour/contrib/make_gcc_all.sh @@ -45,11 +45,22 @@ else case "$HB_ARCHITECTURE" in w32|cyg|os2) - _HB_DIRS_ADD="gtwvg hbole hbodbc hbwin hbwhat rddado" + _HB_DIRS="${_HB_DIRS} gtwvg hbole hbodbc hbwin hbwhat rddado" ;; *) - _HB_DIRS_ADD=;; esac + + if [ "${HB_INC_ALLEGRO}" != "" ]; then _HB_DIRS="${_HB_DIRS} gtalleg" ; fi; + if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi; + if [ "${HB_INC_CURL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbcurl" ; fi; + if [ "${HB_INC_FIREBIRD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird" ; fi; + if [ "${HB_INC_FREEIMAGE}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfimage"; fi; + if [ "${HB_INC_GD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbgd" ; fi; + if [ "${HB_INC_LIBHARU}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf" ; fi; + if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql" ; fi; + if [ "${HB_INC_PGSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql" ; fi; + if [ "${HB_INC_ADS}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads" ; fi; + if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddsql" ; fi; fi # Revert Cygwin architecture to w32. @@ -59,19 +70,7 @@ then export HB_ARCHITECTURE=w32 fi -if [ "${HB_INC_ALLEGRO}" != "" ]; then _HB_DIRS="${_HB_DIRS} gtalleg" ; fi; -if [ "${HB_INC_APOLLO}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbapollo"; fi; -if [ "${HB_INC_CURL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbcurl" ; fi; -if [ "${HB_INC_FIREBIRD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfbird" ; fi; -if [ "${HB_INC_FREEIMAGE}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbfimage"; fi; -if [ "${HB_INC_GD}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbgd" ; fi; -if [ "${HB_INC_LIBHARU}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbhpdf" ; fi; -if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbmysql" ; fi; -if [ "${HB_INC_PGSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} hbpgsql" ; fi; -if [ "${HB_INC_ADS}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddads" ; fi; -if [ "${HB_INC_MYSQL}" != "" ]; then _HB_DIRS="${_HB_DIRS} rddsql" ; fi; - -_HB_DIRS="${_HB_DIRS} ${_HB_DIRS_ADD} ${HB_CONTRIB_ADDONS}" +_HB_DIRS="${_HB_DIRS} ${HB_CONTRIB_ADDONS}" #************************************************************** diff --git a/harbour/contrib/mtpl_gcc.mak b/harbour/contrib/mtpl_gcc.mak index 8be582fa1f..86fd3d191b 100644 --- a/harbour/contrib/mtpl_gcc.mak +++ b/harbour/contrib/mtpl_gcc.mak @@ -133,14 +133,17 @@ LDFLAGS := $(LDFLAGS) #********************************************************** # General *.c --> *.obj COMPILE rule for STATIC Libraries $(OBJ_DIR)%$(OBJEXT) : %.c + @if [ ! -f "$(OBJ_DIR)" ]; then mkdir -p $(OBJ_DIR); fi $(CC) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.cpp --> *.obj COMPILE rule for STATIC Libraries $(OBJ_DIR)%$(OBJEXT) : %.cpp + @if [ ! -d "$(OBJ_DIR)" ]; then mkdir -p $(OBJ_DIR); fi $(CXX) $(CLIBFLAGS) -o$@ $< #********************************************************** # General *.prg --> *.obj COMPILE rule for STATIC Libraries $(OBJ_DIR)%$(OBJEXT) : %.prg + @if [ ! -d "$(OBJ_DIR)" ]; then mkdir -p $(OBJ_DIR); fi $(HB) $(HARBOURFLAGS) -o$(OBJ_DIR)/ $< $(CC) $(CLIBFLAGS) -o$@ $(OBJ_DIR)/$( * www - http://www.harbour-project.org diff --git a/harbour/source/codepage/cpesisom.c b/harbour/source/codepage/cpesisom.c index baec65fbbf..9a9fed7d04 100644 --- a/harbour/source/codepage/cpesisom.c +++ b/harbour/source/codepage/cpesisom.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * National Collation Support Module (ESISOM - Spanish Modern) + * National Collation Support Module (ESISOM - Modern Spanish) * * Copyright 2002 Alexander S.Kresin * www - http://www.harbour-project.org diff --git a/harbour/source/codepage/cpeswin.c b/harbour/source/codepage/cpeswin.c index f96c9badb3..8630a3f682 100644 --- a/harbour/source/codepage/cpeswin.c +++ b/harbour/source/codepage/cpeswin.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * National Collation Support Module ( Spanish WIN ) + * National Collation Support Module (ESWIN - Spanish) * * Copyright 2002 Alexander S.Kresin * www - http://www.harbour-project.org @@ -53,7 +53,7 @@ /* Language name: Spanish */ /* ISO language code (2 chars): ES (please look it up in /doc/lang_id.txt) */ -/* Codepage: ISO-8859-1 */ +/* Codepage: Windows-1252 */ #include #include "hbapi.h" @@ -85,7 +85,7 @@ */ static HB_CODEPAGE s_codepage = { "ESWIN", - HB_CPID_8859_1, HB_UNITB_8859_1, NUMBER_OF_CHARACTERS, + HB_CPID_1252, HB_UNITB_1252, NUMBER_OF_CHARACTERS, "AÁBCDEÉFGHIÍJKLMNÑOÓPQRSTUÚÜVWXYZ", "aábcdeéfghiíjklmnñoópqrstuúüvwxyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL }; diff --git a/harbour/source/codepage/cpeswinm.c b/harbour/source/codepage/cpeswinm.c index c997bc37f4..59b64b7e1b 100644 --- a/harbour/source/codepage/cpeswinm.c +++ b/harbour/source/codepage/cpeswinm.c @@ -4,7 +4,7 @@ /* * Harbour Project source code: - * National Collation Support Module ( Spanish Modern WIN ) + * National Collation Support Module (ESWIN - Modern Spanish) * * Copyright 2002 Alexander S.Kresin * www - http://www.harbour-project.org @@ -53,7 +53,7 @@ /* Language name: Spanish (Modern)*/ /* ISO language code (2 chars): ES */ -/* Codepage: ISO-8859-1 */ +/* Codepage: Windows-1252 */ #include #include "hbapi.h" @@ -85,7 +85,7 @@ */ static HB_CODEPAGE s_codepage = { "ESWINM", - HB_CPID_8859_1, HB_UNITB_8859_1, NUMBER_OF_CHARACTERS, + HB_CPID_1252, HB_UNITB_1252, NUMBER_OF_CHARACTERS, "AÁÀÄBCÇDEÉÈËFGHIÍÌÏJKLMNÑOÓÒÖPQRSTUÚÙÜVWXYZ", "aáàäbcçdeéèëfghiíìïjklmnñoóòöpqrstuúùüvwxyz", IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };