diff --git a/harbour/ChangeLog b/harbour/ChangeLog index dc3f990047..58daaa642f 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,26 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ +2008-07-07 06:57 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * make_deb.sh + + Added libgpm-dev to mouse test. Thanks Guy. + + - doc/simplex.txt + * doc/Makefile + - Removed obsolete file. + + * doc/linux1st.txt + + Added libgpm*-dev requirements. + + * contrib/hbtpathy/Makefile + * contrib/hbziparch/Makefile + ! Fixed referring to win32 archictecture as 'win32' + (should be 'w32'). Recently introduced bugs. + + * contrib/hbfimage/fi_winfu.c + * contrib/hbfimage/fi_wrp.c + ! Fixed for POCC, XCC compilers. + 2008-07-06 23:01 UTC+0200 Viktor Szakats (harbour.01 syenar hu) * include/hbundoc.api ! Casting in _tctemp() diff --git a/harbour/contrib/hbfimage/fi_winfu.c b/harbour/contrib/hbfimage/fi_winfu.c index dda5a44eea..5820b0e4f6 100644 --- a/harbour/contrib/hbfimage/fi_winfu.c +++ b/harbour/contrib/hbfimage/fi_winfu.c @@ -59,7 +59,7 @@ #include "hbapifs.h" #include "hbvm.h" -#if defined(HB_OS_WIN_32) && defined(__GNUC__) && !defined(_WINDOWS_) +#if defined(HB_OS_WIN_32) && !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) #define _WINDOWS_ #endif diff --git a/harbour/contrib/hbfimage/fi_wrp.c b/harbour/contrib/hbfimage/fi_wrp.c index fd4219eadf..2d07e25c81 100644 --- a/harbour/contrib/hbfimage/fi_wrp.c +++ b/harbour/contrib/hbfimage/fi_wrp.c @@ -59,7 +59,7 @@ #include "hbapifs.h" #include "hbvm.h" -#if defined(HB_OS_WIN_32) && defined(__GNUC__) && !defined(_WINDOWS_) +#if defined(HB_OS_WIN_32) && !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) #define _WINDOWS_ #endif diff --git a/harbour/contrib/hbtpathy/Makefile b/harbour/contrib/hbtpathy/Makefile index d5d6730a65..3e52450dd9 100644 --- a/harbour/contrib/hbtpathy/Makefile +++ b/harbour/contrib/hbtpathy/Makefile @@ -14,7 +14,7 @@ C_SOURCES=\ tpcommon.c \ endif -ifeq ($(HB_ARCHITECTURE),win32) +ifeq ($(HB_ARCHITECTURE),w32) C_SOURCES=\ tpwin32.c \ tpcommon.c \ diff --git a/harbour/contrib/hbziparch/Makefile b/harbour/contrib/hbziparch/Makefile index 56733adaf9..73a2979f48 100644 --- a/harbour/contrib/hbziparch/Makefile +++ b/harbour/contrib/hbziparch/Makefile @@ -56,7 +56,7 @@ CPP_SOURCES = \ # ZipFile_mfc.cpp \ -ifeq ($(HB_ARCHITECTURE),win32) +ifeq ($(HB_ARCHITECTURE),w32) CPP_SOURCES += \ ZipPathComponent_win.cpp \ ZipPlatform_win.cpp \ diff --git a/harbour/doc/Makefile b/harbour/doc/Makefile index ae65982971..615f934d16 100644 --- a/harbour/doc/Makefile +++ b/harbour/doc/Makefile @@ -29,7 +29,6 @@ DOC_FILES=\ pcode.txt \ pragma.txt \ readme.txt \ - simplex.txt \ statics.txt \ tracing.txt \ transfrm.txt \ diff --git a/harbour/doc/linux1st.txt b/harbour/doc/linux1st.txt index 14251462a7..67c6219830 100644 --- a/harbour/doc/linux1st.txt +++ b/harbour/doc/linux1st.txt @@ -20,7 +20,12 @@ sudo apt-get install libslang2-dev For GTXWC terminal lib: sudo apt-get install libx11-dev -For Contrib/ODBC lib: +For mouse support: +sudo apt-get install libgpmg1-dev +or +sudo apt-get install libgpm-dev + +For contrib/hbodbc lib: sudo apt-get install unixodbc-dev DEBIAN distro @@ -98,7 +103,3 @@ folks can clean it up a bit and add/remove things that are important. At least this worked on my particular Debian system. Your mileage may vary and other distributions will probably have their own setups and issues. - - - - diff --git a/harbour/doc/simplex.txt b/harbour/doc/simplex.txt deleted file mode 100644 index 91ccad62f7..0000000000 --- a/harbour/doc/simplex.txt +++ /dev/null @@ -1,64 +0,0 @@ -/* - * $Id$ - */ - -Overview: - -SimpLex uses high-level definitions, which for many programmers might be -more readable, than equivalent Flex definitions. SimpLex Language -Definitions are divided into 6 main sections: - -1. Delimiters. There are 3 kinds of Lexical Delimiters: - - a. Ignorable. Typical example of such delimiters is "white space", i.e. - space and tab. - - b. Returnable. Typical examples of such delimiters are commas, - parenthesis, and math operators. - - c. Appendables. While I don't have any examples in mind, I suspect there - might be a need for such delimiters. This kind of delimiters should be - appended to the preceding token, in effect making such delimiter a - terminator character. - -2. Streams. These are also referred to as "pairs". Stream or Pair, as the - name may suggest, is any sequence (or stream) of characters, enclosed - within a STARTing character[s] and an ENDing character[s] (the pair). - Typical example of such lexical element is a LITERAL string, i.e. "Hello - World". - -3. Self Contained Words. These are a specific set of reserved words, which - do NOT require ANY delimiters. These words might be viewed as a form of - Meta Delimiters. These words will be extracted from the input stream, - regardless of any preceding, or succeeding characters. Typical example of - such tokens are the dBase' .AND. .OR. .NOT. logical operators, the C - language inline assignment operators += *= etc., as well as pre and post - increment/decrement operators -- and ++. The unique attribute of such - elements is the fact that these elements do NOT require preceding or - succeeding delimiters. - -4. Keywords. These are specific set of reserved words, which have lexical - significance in the defined language, when appearing as the FIRST token - in a given source line. Keywords may be constructed of multiple words with - separating white space (ignorable delimiters), when using the predefined - match pattern {WS}. - -5. Words. These are specific set of reserved words, which have lexical - significance in the defined language, when appearing ANYWHERE in a given - source line. Words may be constructed of multiple words with separating white - space (ignorable delimiters), when using the predefined match pattern {WS}. - -6. Rules. There are 2 kinds of rules: - - a. Reduction Rules. These kind of rules defines the translation of a 1 or - more tokens into 1 or more other tokens (or custom actions). Reductions - are infinitely recursive, which means that the Reduction Results, are - pushed back onto the evaluation stack, incase they might in turn be part - of yet another rule. To eliminate such recursive cycle, Reduction Result - may be in the form of N + DONT_REDUCE, thus passing through the resulted - token, without further evaluation. - - b. Pass Through (Left Associate). This kind of rules directs the Lexer to - accept such token[s] as a valid form. - -For a real-life language definition example, please refer to harbour.slx. \ No newline at end of file diff --git a/harbour/make_deb.sh b/harbour/make_deb.sh index c5a1d187b9..bf88c3dbcf 100755 --- a/harbour/make_deb.sh +++ b/harbour/make_deb.sh @@ -26,7 +26,7 @@ then export HB_GPM_MOUSE=no export HB_WITHOUT_GTSLN=yes else - if [ -z "$HB_GPM_MOUSE" ] && test_reqpkg libgpmg1-dev + if [ -z "$HB_GPM_MOUSE" ] && ( test_reqpkg libgpmg1-dev || test_reqpkg libgpm-dev ) then export HB_GPM_MOUSE=yes fi