2009-03-03 10:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* INSTALL
    - Bison requirement moved next to the parser related option, 
      to not cause any unnecessary confusion.

  * utils/hbmk2/hbmk2.prg
    * Made -hbcc and -hbcmp to behave the same. They'll no both 
      generate objects.
This commit is contained in:
Viktor Szakats
2009-03-03 09:27:13 +00:00
parent 6ebdb01ff5
commit eba703e134
3 changed files with 23 additions and 9 deletions

View File

@@ -8,6 +8,15 @@
2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
*/
2009-03-03 10:26 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* INSTALL
- Bison requirement moved next to the parser related option,
to not cause any unnecessary confusion.
* utils/hbmk2/hbmk2.prg
* Made -hbcc and -hbcmp to behave the same. They'll no both
generate objects.
2009-03-02 23:59 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
* debian/rules
+ doc/man/hbmk.1

View File

@@ -20,7 +20,6 @@ HOW TO BUILD AND INSTALL HARBOUR
* Supported C compiler
* GNU Make
* GNU Bison 1.28 or upper (optional)
Linux/Darwin/BSD/HP-UX/Solaris
------------------------------
@@ -214,10 +213,12 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR
left empty.
- HB_CONTRIB_ADDONS=<list> Build additional libraries stored
in the contrib directory.
- HB_REBUILD_PARSER=yes To rebuild the language parsers.
This requires GNU Bison.
- HB_VISUALC_VER_PRE80=yes Set this if you're using a pre-8.0
(= pre-MSVS 2005) version of MSVC compiler.
- HB_REBUILD_PARSER=yes To rebuild the language parsers. Typically
you only need this if your are Harbour core
developer modifying the parser.
This requires GNU Bison 1.28 or upper.
Cross building
--------------

View File

@@ -302,7 +302,7 @@ FUNCTION Main( ... )
CASE cParamL == "-quiet" ; t_lQuiet := .T. ; t_lInfo := .F.
CASE Left( cParamL, 6 ) == "-comp=" ; t_cCOMP := SubStr( cParam, 7 )
CASE Left( cParamL, 6 ) == "-arch=" ; t_cARCH := SubStr( cParam, 7 )
CASE cParamL == "-hbcmp" ; t_lQuiet := .T. ; t_lInfo := .F. ; lStopAfterHarbour := .T.
CASE cParamL == "-hbcmp" ; t_lQuiet := .T. ; t_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T.
CASE cParamL == "-hbcc" ; t_lQuiet := .T. ; t_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T.
CASE cParamL == "-hblnk" ; t_lQuiet := .T. ; t_lInfo := .F.
CASE cParamL == "-info" ; t_lInfo := .T.
@@ -314,6 +314,12 @@ FUNCTION Main( ... )
PauseForKey()
RETURN 9
CASE cParamL == "--version"
ShowHeader()
PauseForKey()
RETURN 0
ENDCASE
NEXT
@@ -321,7 +327,7 @@ FUNCTION Main( ... )
DO CASE
CASE Right( tmp, 5 ) == "hbcmp" .OR. ;
Left( tmp, 5 ) == "hbcmp"
t_lQuiet := .T. ; t_lInfo := .F. ; lStopAfterHarbour := .T.
t_lQuiet := .T. ; t_lInfo := .F. ; lStopAfterHarbour := .F. ; lStopAfterCComp := .T.
IF t_lInfo
OutStd( "hbmk: Enabled -hbcmp option." + hb_osNewLine() )
ENDIF
@@ -2754,10 +2760,8 @@ STATIC PROCEDURE ShowHelp( lLong )
" -[no]trace show commands executed" ,;
" -[no]run run/don't run the created executable" ,;
" -nohbp do not process .hbp files in current directory" ,;
" -hbcmp stop after creating the .c Harbour output files" ,;
" create link/copy/rename hbmk to hbcc for the same effect" ,;
" -hbcc stop after creating the object files" ,;
" create link/copy/rename hbmk to hbcc for the same effect" ,;
" -hbcc, -hbcmp stop after creating the object files" ,;
" create link/copy hbmk to hbcc/hbcmp for the same effect" ,;
" -hblnk act as linker. Currently this is the same as -q" ,;
" -arch=<arch> assume specific architecure. Same as HB_ARCHITECTURE envvar" ,;
" -comp=<comp> use specific compiler. Same as HB_COMPILER envvar" ,;