fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2011-09-13 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* utils/hbmk2/hbmk2.*.po
  * utils/hbmk2/hbmk2.prg
    + added support for path lists separated by ';' character in -L and
      -i/-I options. It's not very elegant (and thus it's not documented)
      so please don't use it in Harbour SVN hbmk2 files. I decided to
      implement it because -depincpath* options already had it.
    * do not document ';' delimited path list for -depincpath* options
    * minor change in one help line
This commit is contained in:
Viktor Szakats
2011-09-13 08:19:30 +00:00
parent 9377fc138b
commit 8009662b26
5 changed files with 34 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
harbour/ChangeLog
View File

@@ -16,6 +16,16 @@
The license applies to all entries newer than 2009-04-28.
*/
2011-09-13 10:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.*.po
* utils/hbmk2/hbmk2.prg
+ added support for path lists separated by ';' character in -L and
-i/-I options. It's not very elegant (and thus it's not documented)
so please don't use it in Harbour SVN hbmk2 files. I decided to
implement it because -depincpath* options already had it.
* do not document ';' delimited path list for -depincpath* options
* minor change in one help line
2011-09-12 17:41 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/rtl/filesys.c
* harbour/src/rtl/hbproces.c

14
harbour/utils/hbmk2/hbmk2.es_PE.po
View File

@@ -468,8 +468,8 @@ msgstr "comprime executable/librería dinamica (necesita UPX)\\n<lev> puede ser:
#: hbmk2.prg:7960 hbmk2.prg:11650
#, c-format
msgid "Multiple -l, -L and <script> parameters are accepted."
msgstr "Múltiples parámetros son aceptados -l, -L y <script>."
msgid "Multiple -l, -L, -i and <script> parameters are accepted."
msgstr "Múltiples parámetros son aceptados -l, -L, -i y <script>."
#: hbmk2.prg:7960 hbmk2.prg:11650
#, c-format
@@ -1231,16 +1231,6 @@ msgstr ""
msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <i> to the header detection path list"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <dll> to the import library source list. May be ';' delimited list of paths."
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Set generated import library name to <lib>"

14
harbour/utils/hbmk2/hbmk2.hu_HU.po
View File

@@ -509,8 +509,8 @@ msgstr "Az alapértelmezések és az egyes kapcsolók támogatása platformonké
#: hbmk2.prg:7959 hbmk2.prg:11650
#, c-format
msgid "Multiple -l, -L and <script> parameters are accepted."
msgstr "Több -l, -L és <parancsállomány> kapcsoló/paraméter is megengedett."
msgid "Multiple -l, -L, -i and <script> parameters are accepted."
msgstr "Több -l, -L, -i és <parancsállomány> kapcsoló/paraméter is megengedett."
#: hbmk2.prg:3540 hbmk2.prg:4846
#, c-format
@@ -1227,16 +1227,6 @@ msgstr ""
msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <i> to the header detection path list"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <dll> to the import library source list. May be ';' delimited list of paths."
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Set generated import library name to <lib>"

28
harbour/utils/hbmk2/hbmk2.prg
View File

@@ -2508,10 +2508,14 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, 3 ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
cParam := hb_DirSepDel( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ) )
IF ( _MACRO_LATE_PREFIX + _MACRO_OPEN ) $ cParam .OR. hb_DirExists( cParam )
AAdd( hbmk[ _HBMK_aLIBPATH ], cParam )
ENDIF
FOR EACH tmp IN hb_ATokens( cParam, ";" ) /* intentionally not using hb_osPathListSeparator() to keep value portable */
IF ! Empty( tmp )
tmp := hb_DirSepDel( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) )
IF ( _MACRO_LATE_PREFIX + _MACRO_OPEN ) $ tmp .OR. hb_DirExists( tmp )
AAdd( hbmk[ _HBMK_aLIBPATH ], tmp )
ENDIF
ENDIF
NEXT
ENDIF
CASE Left( cParamL, Len( "-instfile=" ) ) == "-instfile="
@@ -2565,7 +2569,11 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, 3 ), aParam[ _PAR_cFileName ] )
IF ! Empty( cParam )
AAddNew( hbmk[ _HBMK_aINCPATH ], hb_DirSepDel( hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( cParam ), aParam[ _PAR_cFileName ] ) ) ) )
FOR EACH tmp IN hb_ATokens( cParam, ";" ) /* intentionally not using hb_osPathListSeparator() to keep value portable */
IF ! Empty( tmp )
AAddNew( hbmk[ _HBMK_aINCPATH ], hb_DirSepDel( hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp ), aParam[ _PAR_cFileName ] ) ) ) )
ENDIF
NEXT
ENDIF
CASE Left( cParamL, Len( "-stop" ) ) == "-stop"
@@ -2810,7 +2818,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-depincpath=" ) + 1 ), aParam[ _PAR_cFileName ] )
IF dep_split_arg( hbmk, cParam, @cParam, @tmp )
FOR EACH tmp1 IN hb_ATokens( tmp, ";" )
FOR EACH tmp1 IN hb_ATokens( tmp, ";" ) /* intentionally not using hb_osPathListSeparator() to keep value portable */
AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aINCPATH ], hb_PathNormalize( PathMakeAbsolute( PathSepToSelf( tmp1 ), aParam[ _PAR_cFileName ] ) ) )
NEXT
ENDIF
@@ -2826,7 +2834,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
cParam := MacroProc( hbmk, SubStr( cParam, Len( "-depimplibs=" ) + 1 ), aParam[ _PAR_cFileName ] )
IF dep_split_arg( hbmk, cParam, @cParam, @tmp )
FOR EACH tmp1 IN hb_ATokens( tmp, ";" )
FOR EACH tmp1 IN hb_ATokens( tmp, ";" ) /* intentionally not using hb_osPathListSeparator() to keep value portable */
AAddNew( hbmk[ _HBMK_hDEP ][ cParam ][ _HBMKDEP_aIMPLIBSRC ], PathSepToSelf( tmp1 ) )
NEXT
ENDIF
@@ -12264,9 +12272,9 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
{ "-depoptional=<d:f>" , I_( "<d> is the name of the dependency. <f> can be 'yes' or 'no', specifies whether the dependency is optional. Default: no" ) },;
{ "-depcontrol=<d:v>" , I_( "<d> is the name of the dependency. <v> is a value that controls how detection is done. Accepted values: no, yes, force, nolocal, local. Default: content of envvar HBMK2_WITH_<d>" ) },;
{ "-depincroot=<d:r>" , I_( "<d> is the name of the dependency. Set <r> as root directory for paths specified in -depincpath options." ) },;
{ "-depincpath=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list. May be ';' delimited list of paths." ) },;
{ "-depincpath=<d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list." ) },;
{ "-depincpathlocal= <d:i>" , I_( "<d> is the name of the dependency. Add <i> to the header detection path list, where <i> is pointing to a directory local to the project and containing an embedded (or locally hosted) dependency." ) },;
{ "-depimplibs=<d:dll>" , I_( "<d> is the name of the dependency. Add <dll> to the import library source list. May be ';' delimited list of paths." ) },;
{ "-depimplibs=<d:dll>" , I_( "<d> is the name of the dependency. Add <dll> to the import library source list." ) },;
{ "-depimplibd=<d:lib>" , I_( "<d> is the name of the dependency. Set generated import library name to <lib>" ) },;
NIL,;
{ "-plugin=<.prg|.hbs|.hrb>", I_( "add plugin" ) },;
@@ -12318,7 +12326,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
LOCAL aNotes := {;
I_( "<script> can be:\n <@script> or <script.hbm>: command line options in file\n <script.hbp>: command line options in file, it also marks a new target if specified on the command line\n <script.hbc>: package configuration file" ),;
I_( "Multiple -l, -L and <script> parameters are accepted." ),;
I_( "Multiple -l, -L, -i and <script> parameters are accepted." ),;
I_( "Regular Harbour compiler options are also accepted.\n(see them with -harbourhelp option)" ),;
hb_StrFormat( I_( "%1$s option file in hbmk2 directory is always processed if it exists. On *nix platforms ~/.harbour, /etc/harbour, <base>/etc/harbour, <base>/etc are checked (in that order) before the hbmk2 directory." ), _HBMK_AUTOHBC_NAME ),;
hb_StrFormat( I_( "%1$s make script in current directory is always processed if it exists." ), _HBMK_AUTOHBM_NAME ),;

14
harbour/utils/hbmk2/hbmk2.pt_BR.po
View File

@@ -468,8 +468,8 @@ msgstr "comprime o executável/biblioteca dinânica (necessita de UPX)\\n<lev> p
#: hbmk2.prg:7960 hbmk2.prg:11650
#, c-format
msgid "Multiple -l, -L and <script> parameters are accepted."
msgstr "Multiplos parâmetros -l, -L e <script> são aceitos."
msgid "Multiple -l, -L, -i and <script> parameters are accepted."
msgstr "Multiplos parâmetros -l, -L, -i e <script> são aceitos."
#: hbmk2.prg:7960 hbmk2.prg:11650
#, c-format
@@ -1231,16 +1231,6 @@ msgstr ""
msgid "options/flags reserved for 3rd party tools, always ignored by hbmk2 itself"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <i> to the header detection path list"
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Add <dll> to the import library source list. May be ';' delimited list of paths."
msgstr ""
#: hbmk2.prg:11633
#, c-format
msgid "<d> is the name of the dependency. Set generated import library name to <lib>"