diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3b8dfebd6e..c858e222a2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,25 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-08 06:30 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * INSTALL + + Added minimum tested version of MinGW. + + * make_gnu.bat + + Added echo to display errorlevel after running GNU Make + if it's not zero. Eventually I'd like to add proper + error display in case GNU Make returned with error + (not that GNU Make doesn't display it), but first I'd + like to inspect how it works (there is no documentation + about returned errorlevels). + + * config/win/mingw.cf + ! Fixed 'del' command receiving wrongly formed path seps + in non-msys mode when lib creation failed. + + * ChangeLog + ! Typo in one yesterday's entry. + 2009-06-07 16:14 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * harbour/contrib/hbqt/generator/hbqtgen.prg * harbour/contrib/hbqt/generator/qt45.qtp @@ -63,7 +82,7 @@ + Added new classes, fixed some default parameter issues. + Added QListView() and managed how to use QStringList() class. - + 2009-06-07 19:26 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + Added support to redefine .prg level __ARCH*__ and __*_ENDIAN__ @@ -76,7 +95,7 @@ 2009-06-07 15:43 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL - + Documentated HB_*_STATIC options. + + Documented HB_*_STATIC options. * external/sqlite3/sqlite3.c * external/sqlite3/sqlite3.h diff --git a/harbour/INSTALL b/harbour/INSTALL index ee4a73f2fc..2722f71daf 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -200,7 +200,7 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS Windows (recommended) ------- - mingw - MinGW GNU C + mingw - MinGW GNU C 3.4.2 and above mingw64 - MinGW GNU C x86-64 msvc - Microsoft Visual C++ msvc64 - Microsoft Visual C++ x86-64 @@ -213,7 +213,7 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS icc - Intel(R) C/C++ iccia64 - Intel(R) C/C++ IA-64 pocc - Pelles C 4.5 and above - pocc64 - Pelles C 5.0 x86-64 and above + pocc64 - Pelles C x86-64 5.0 and above xcc - Pelles C for xhb cygwin - Cygwin GNU C @@ -221,7 +221,7 @@ SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS ---------- mingwarm - MinGW GNU C ARM msvcarm - Microsoft Visual C++ ARM - poccarm - Pelles C 5.0 ARM and above + poccarm - Pelles C ARM 5.0 and above DOS (32-bit) --- diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf index cb0ee127af..23bfe3a2af 100644 --- a/harbour/config/win/mingw.cf +++ b/harbour/config/win/mingw.cf @@ -150,7 +150,12 @@ endif endif ifeq ($(AR_RULE),) -AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR)/$@ +ifeq ($(SHLVL),) # COMMAND.COM +LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@ +else +LIB_DIR_DOS_ = $(LIB_DIR)/$@ +endif +AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_DOS_) # our libs have a lot of cross referenced now and we have to group them # until we won't have cleaned them LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS) diff --git a/harbour/make_gnu.bat b/harbour/make_gnu.bat index d6ac8ada5b..84fad5e711 100644 --- a/harbour/make_gnu.bat +++ b/harbour/make_gnu.bat @@ -138,6 +138,7 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL% set HB_EXTERNALLIBS=no set HB_EXTERNAL_ADDONS= %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% set HB_DYNLIB=no set HB_CONTRIBLIBS=%_HB_CONTRIBLIBS% set HB_CONTRIB_ADDONS=%_HB_CONTRIB_ADDONS% @@ -148,17 +149,20 @@ if not exist %HB_DOC_INSTALL%\*.* md %HB_DOC_INSTALL% set _HB_EXTERNALLIBS= set _HB_EXTERNAL_ADDONS= %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :DO_GCC set HB_DYNLIB=no %_HB_MAKE% clean install %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :SKIP_WINDLL %_HB_MAKE% %HB_USER_MAKEFLAGS% %1 %2 %3 %4 %5 %6 %7 %8 %9 + if errorlevel 1 echo GNU Make returned: %ERRORLEVEL% goto MAKE_DONE :MAKE_DONE