2010-05-23 20:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* utils/hbmk2/hbmk2.pt_BR.po
  * utils/hbmk2/hbmk2.hu_HU.po
  * utils/hbmk2/hbmk2.prg
    + In non-incremental mode when no workdir is manually set, hbmk2
      will now create a temp subdir inside temp dir and create any
      intermediate output files there. (previously it was using the
      temp dir without creating a temp subdir inside).
    ; Please test and report leftover temp files and dirs, also test 
      it on *nix platforms.
    * Changed 'couldn't', 'don't' style English abbrevs to
      'could not', 'do not', etc.

  * config/rules.mk
    ! Fixed to include static-only C compiler options for targets 
      which have no separate static/dynamic C compiler pass.
      This should fix wrongly built pcre lib causing missing 
      exported functions in mingw Harbour .dlls.
This commit is contained in:
Viktor Szakats
2010-05-23 18:55:14 +00:00
parent ceecd43fa9
commit 6b53962852
5 changed files with 92 additions and 43 deletions

View File

@@ -17,6 +17,25 @@
past entries belonging to author(s): Viktor Szakats.
*/
2010-05-23 20:54 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.pt_BR.po
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.prg
+ In non-incremental mode when no workdir is manually set, hbmk2
will now create a temp subdir inside temp dir and create any
intermediate output files there. (previously it was using the
temp dir without creating a temp subdir inside).
; Please test and report leftover temp files and dirs, also test
it on *nix platforms.
* Changed 'couldn't', 'don't' style English abbrevs to
'could not', 'do not', etc.
* config/rules.mk
! Fixed to include static-only C compiler options for targets
which have no separate static/dynamic C compiler pass.
This should fix wrongly built pcre lib causing missing
exported functions in mingw Harbour .dlls.
2010-05-23 15:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.prg
+ Changed filtering implementation for cmdline parameters.

View File

@@ -38,7 +38,7 @@ CC_FLAGS := $(HB_INC_DEPEND) $(CFLAGS) $(HB_CFLAGS)
# The rule to compile a C source file.
ifeq ($(CC_RULE),)
CC_RULE = $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(CC_IN) $<)
CC_RULE = $(CC) $(subst $(CC_DIRSEPFROM),$(CC_DIRSEPTO),$(CC_FLAGS) $(HB_USER_CFLAGS) $(CC_OUT)$(<F:.c=$(OBJ_EXT)) $(HB_CFLAGS_STA) $(CC_IN) $<)
ifneq ($(HB_BUILD_DLL),no)
ifneq ($(HB_DYN_COPT),)
ifneq ($(LIBNAME),)

View File

@@ -4,12 +4,12 @@
#: hbmk2.prg:3992
#, c-format
msgid "Warning: Resource compiler script couldn't be created, continuing in command line."
msgid "Warning: Resource compiler script could not be created, continuing in command line."
msgstr "Figyelem: Erõforrás fordító parancsállománya ne hozható létre, folytatás parancssorban."
#: hbmk2.prg:4379
#, c-format
msgid "Warning: Dynamic lib link script couldn't be created, continuing in command line."
msgid "Warning: Dynamic lib link script could not be created, continuing in command line."
msgstr "Figyelem: Dinamikus függvénykönyvtár parancsállománya nem hozható létre, folytatás parancssorban."
#: hbmk2.prg:7941
@@ -104,7 +104,7 @@ msgstr "A sz
#: hbmk2.prg:4128
#, c-format
msgid "Warning: C/C++ compiler script couldn't be created, continuing in command line."
msgid "Warning: C/C++ compiler script could not be created, continuing in command line."
msgstr "Figyelem: C/C++ fordító parancsállománya ne hozható létre, folytatás parancssorban."
#: hbmk2.prg:7941
@@ -344,7 +344,7 @@ msgstr ".pot hiba: %1$s"
#: hbmk2.prg:7941
#, c-format
msgid "don't (or do) add Harbour version number and source file reference to .po (default: add them)"
msgid "do (not) add Harbour version number and source file reference to .po (default: add them)"
msgstr "írja bele (vagy ne) a Harbour verizószámát és a forrásállomány referenciákat a .po állományba (alapértelmezés: írja)"
#: hbmk2.prg:1272
@@ -424,17 +424,17 @@ msgstr "Hiba: Harbour ford
#: hbmk2.prg:3773
#, c-format
msgid "Warning: Stub helper .c program couldn't be created."
msgid "Warning: Stub helper .c program could not be created."
msgstr ""
#: hbmk2.prg:3922
#, c-format
msgid "Warning: Stub helper .rc file couldn't be created."
msgid "Warning: Stub helper .rc file could not be created."
msgstr ""
#: hbmk2.prg:4191
#, c-format
msgid "Error: This platform/compiler isn't implemented."
msgid "Error: This platform/compiler is not implemented."
msgstr "Hiba: Ez a platform/fordító nincs megvalósítva."
#: hbmk2.prg:4244
@@ -464,7 +464,7 @@ msgstr ""
#: hbmk2.prg:7941
#, c-format
msgid "show commands to be executed, but don't execute them"
msgid "show commands to be executed, but do not execute them"
msgstr "mutassa a végrehajtandó parancsokat, anélkül hogy végrehajtaná õket"
#: hbmk2.prg:7941
@@ -604,12 +604,12 @@ msgstr "C ford
#: hbmk2.prg:4291
#, c-format
msgid "Warning: Link script couldn't be created, continuing in command line."
msgid "Warning: Link script could not be created, continuing in command line."
msgstr "Figyelem: Szerkesztõ parancsállománya ne hozható létre, folytatás parancssorban."
#: hbmk2.prg:4440
#, c-format
msgid "Warning: Lib script couldn't be created, continuing in command line."
msgid "Warning: Lib script could not be created, continuing in command line."
msgstr "Figyelem: Statikus függvénykönyvtár létrehozás parancsállománya nem hozható létre, folytatás parancssorban."
#: hbmk2.prg:7941
@@ -624,7 +624,7 @@ msgstr "munkak
#: hbmk2.prg:7941
#, c-format
msgid "don't add extra list of system libraries to default library list"
msgid "do not add extra list of system libraries to default library list"
msgstr ""
#: hbmk2.prg:7959
@@ -634,7 +634,7 @@ msgstr ""
#: hbmk2.prg:1302
#, c-format
msgid "Couldn't detect any supported C compiler in your PATH.\\nPlease setup one or set -compiler= option to one of these values: %1$s"
msgid "Could not detect any supported C compiler in your PATH.\\nPlease setup one or set -compiler= option to one of these values: %1$s"
msgstr "Nem sikerült automatikusan detektálni egyetlen C fordítót sem a PATH-ban.\\nKérem, telepítsen egyet vagy állítsa a -compiler= kapcsolót a következõ értékek valamelyikére: %1$s"
#: hbmk2.prg:7824
@@ -929,7 +929,7 @@ msgstr "t
#: hbmk2.prg:7941
#, c-format
msgid "run/don't run output executable"
msgid "run/do not run output executable"
msgstr "futtassa/ne az elkészült alkalmazást"
#: hbmk2.prg:7941

View File

@@ -746,6 +746,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
LOCAL nStart := Seconds()
LOCAL lDoSupportDetection
LOCAL lDeleteWorkDir
hbmk[ _HBMK_lCreateLib ] := .F.
hbmk[ _HBMK_lCreateDyn ] := .F.
@@ -1399,7 +1400,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
IF Empty( aCOMPDET )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Please choose a C compiler by using -compiler= option.\nYou have the following choices on your platform: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
ELSE
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Couldn't detect any supported C compiler in your PATH.\nPlease setup one or set -compiler= option to one of these values: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Could not detect any supported C compiler in your PATH.\nPlease setup one or set -compiler= option to one of these values: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
ENDIF
RETURN 2
ENDIF
@@ -2298,7 +2299,18 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
/* It's controlled by -o option in these cases */
cWorkDir := ""
ELSE
DEFAULT cWorkDir TO hb_DirTemp()
IF cWorkDir == NIL
FClose( hb_FTempCreateEx( @cWorkDir, NIL, "hbmk_", ".dir" ) )
FErase( cWorkDir )
IF hb_DirCreate( cWorkDir ) != 0
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Temporary Working directory cannot be created: %1$s" ), cWorkDir ) )
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
RETURN 9
ENDIF
lDeleteWorkDir := .T.
ENDIF
ENDIF
ENDIF
ENDIF
@@ -3955,6 +3967,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
" " + ArrayToList( aCommand ) + _OUT_EOL )
ENDIF
IF ! hbmk[ _HBMK_lIGNOREERROR ]
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
@@ -3978,6 +3993,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
OutErr( ArrayToList( thread[ 2 ] ) + _OUT_EOL )
ENDIF
IF ! hbmk[ _HBMK_lIGNOREERROR ]
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
@@ -4011,6 +4029,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
OutErr( cCommand + _OUT_EOL )
ENDIF
IF ! hbmk[ _HBMK_lIGNOREERROR ]
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
@@ -4174,10 +4195,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
AAdd( hbmk[ _HBMK_aC ], l_cCSTUB )
AAdd( l_aC_TODO, l_cCSTUB )
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .c program couldn't be created." ) )
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .c program could not be created." ) )
IF ! hbmk[ _HBMK_lINC ]
AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {| tmp | FErase( tmp ) } )
ENDIF
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
@@ -4275,10 +4299,13 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
AAdd( hbmk[ _HBMK_aCPP ], l_cCPPSTUB )
AAdd( l_aCPP_TODO, l_cCPPSTUB )
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .cpp program couldn't be created." ) )
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .cpp program could not be created." ) )
IF ! hbmk[ _HBMK_lINC ]
AEval( ListDirExt( hbmk[ _HBMK_aPRG ], cWorkDir, ".c", .T. ), {| tmp | FErase( tmp ) } )
ENDIF
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF hbmk[ _HBMK_lBEEP ]
DoBeep( .F. )
ENDIF
@@ -4441,7 +4468,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
hb_AIns( hbmk[ _HBMK_aRESSRC ], 1, l_cRESSTUB, .T. )
AAdd( l_aRESSRC_TODO, l_cRESSTUB )
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .rc file couldn't be created." ) )
hbmk_OutErr( hbmk, I_( "Warning: Stub helper .rc file could not be created." ) )
ENDIF
/* Don't delete stub in workdir in incremental mode. */
IF hbmk[ _HBMK_lINC ]
@@ -4511,7 +4538,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
FClose( fhnd )
cOpt_Res := "@" + cScriptFile
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Resource compiler script couldn't be created, continuing in command line." ) )
hbmk_OutErr( hbmk, I_( "Warning: Resource compiler script could not be created, continuing in command line." ) )
ENDIF
ENDIF
@@ -4649,7 +4676,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
FClose( fhnd )
cOpt_CompCLoop := "@" + cScriptFile
ELSE
hbmk_OutErr( hbmk, I_( "Warning: C/C++ compiler script couldn't be created, continuing in command line." ) )
hbmk_OutErr( hbmk, I_( "Warning: C/C++ compiler script could not be created, continuing in command line." ) )
ENDIF
ENDIF
@@ -4712,7 +4739,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
ENDIF
ELSE
hbmk_OutErr( hbmk, I_( "Error: C/C++ command isn't implemented for this platform/compiler." ) )
hbmk_OutErr( hbmk, I_( "Error: C/C++ command is not implemented for this platform/compiler." ) )
nErrorLevel := 8
ENDIF
ENDIF
@@ -4814,7 +4841,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
FClose( fhnd )
cOpt_Link := "@" + cScriptFile
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Link script couldn't be created, continuing in command line." ) )
hbmk_OutErr( hbmk, I_( "Warning: Link script could not be created, continuing in command line." ) )
ENDIF
ENDIF
@@ -4904,7 +4931,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
FClose( fhnd )
cOpt_Dyn := "@" + cScriptFile
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Dynamic lib link script couldn't be created, continuing in command line." ) )
hbmk_OutErr( hbmk, I_( "Warning: Dynamic lib link script could not be created, continuing in command line." ) )
ENDIF
ENDIF
@@ -4965,7 +4992,7 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
FClose( fhnd )
cOpt_Lib := "@" + cScriptFile
ELSE
hbmk_OutErr( hbmk, I_( "Warning: Lib script couldn't be created, continuing in command line." ) )
hbmk_OutErr( hbmk, I_( "Warning: Lib script could not be created, continuing in command line." ) )
ENDIF
ENDIF
@@ -5026,6 +5053,9 @@ FUNCTION hbmk2( aArgs, /* @ */ lPause )
ENDIF
ENDIF
AEval( l_aCLEAN, {| tmp | FErase( tmp ) } )
IF lDeleteWorkDir
hb_DirDelete( cWorkDir )
ENDIF
IF l_lCLEAN
DirUnbuild( cWorkDir )
ENDIF
@@ -7805,7 +7835,7 @@ STATIC FUNCTION LoadPOTFiles( hbmk, aFiles, cFileBase, lIgnoreError )
NEXT
IF hbmk[ _HBMK_lDEBUGI18N ] .AND. aTrans == NIL
hbmk_OutErr( hbmk, "LoadPOTFiles() didn't load anything" )
hbmk_OutErr( hbmk, "LoadPOTFiles() did not load anything" )
ENDIF
RETURN aTrans
@@ -8912,11 +8942,11 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
{ "-[no]hbcppmm" , I_( "forces to override standard C++ memory management functions with Harbour ones" ) },;
{ "-nohblib[-]" , I_( "do not use static core Harbour libraries when linking" ) },;
{ "-nolibgrouping[-]" , I_( "disable library grouping on gcc based compilers" ) },;
{ "-nomiscsyslib[-]" , I_( "don't add extra list of system libraries to default library list" ) },;
{ "-traceonly" , I_( "show commands to be executed, but don't execute them" ) },;
{ "-nomiscsyslib[-]" , I_( "do not add extra list of system libraries to default library list" ) },;
{ "-traceonly" , I_( "show commands to be executed, but do not execute them" ) },;
{ "-[no]warn[=lev]" , I_( "set C compiler warning level\n<lev> can be: max, yes, low, no, def (default: yes)" ) },;
{ "-[no]compr[=lev]" , I_( "compress executable/dynamic lib (needs UPX)\n<lev> can be: min, max, def" ) },;
{ "-[no]run" , I_( "run/don't run output executable" ) },;
{ "-[no]run" , I_( "run/do not run output executable" ) },;
{ "-vcshead=<file>" , I_( "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar and Fossil are currently supported. Generated header will define macro _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" ) },;
{ "-tshead=<file>" , I_( "generate .ch header file with timestamp information. Generated header will define macros _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build" ) },;
{ "-icon=<file>" , I_( "set <file> as application icon. <file> should be a supported format on the target platform" ) },;
@@ -8947,7 +8977,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
{ "-hbl[=<output>]" , hb_StrFormat( I_( "output .hbl filename. %1$s macro is accepted in filename" ), _LNG_MARKER ) },;
{ "-lng=<languages>" , hb_StrFormat( I_( "list of languages to be replaced in %1$s macros in .pot/.po filenames and output .hbl/.po filenames. Comma separared list:\n-lng=en,hu-HU,de" ), _LNG_MARKER ) },;
{ "-po=<output>" , I_( "create/update .po file from source. Merge it with previous .po file of the same name" ) },;
{ "-[no]minipo" , I_( "don't (or do) add Harbour version number and source file reference to .po (default: add them)" ) },;
{ "-[no]minipo" , I_( "do (not) add Harbour version number and source file reference to .po (default: add them)" ) },;
{ "-rebuildpo" , I_( "recreate .po file, thus removing all obsolete entries in it" ) },;
NIL,;
{ "Options below are available on command line only:" },;

View File

@@ -104,7 +104,7 @@ msgstr "Compilador C detectado automaticamente: %1$s"
#: hbmk2.prg:1301
#, c-format
msgid ""
"Couldn't detect any supported C compiler in your PATH.\\n"
"Could not detect any supported C compiler in your PATH.\\n"
"Please setup one or set -compiler= option to one of these values: %1$s"
msgstr ""
"Nenhum compilador C suportado foi encontrado em seu PATH.\\n"
@@ -147,7 +147,7 @@ msgstr "Processando script local: %1$s"
#: hbmk2.prg:4127
#, c-format
msgid "Warning: C/C++ compiler script couldn't be created, continuing in command line."
msgid "Warning: C/C++ compiler script could not be created, continuing in command line."
msgstr "Atenção: Script para o compilador C/C++ não pode ser criado, continuando com a linha de comando."
#: hbmk2.prg:4457
@@ -168,7 +168,7 @@ msgstr "Criando cabe
#: hbmk2.prg:3921
#, c-format
msgid "Warning: Stub helper .rc file couldn't be created."
msgid "Warning: Stub helper .rc file could not be created."
msgstr "Atencao: arquivo auxiliar .rc não pode ser criado."
#: hbmk2.prg:3961
@@ -184,7 +184,7 @@ msgstr "As op
#: hbmk2.prg:4378
#, c-format
msgid "Warning: Dynamic lib link script couldn't be created, continuing in command line."
msgid "Warning: Dynamic lib link script could not be created, continuing in command line."
msgstr "Atenção: Script para linkagem da biblioteca dinâmica não pode ser criado, continuando com a linha de comando."
#: hbmk2.prg:4240
@@ -204,7 +204,7 @@ msgstr "Script para linkagem da biblioteca din
#: hbmk2.prg:4290
#, c-format
msgid "Warning: Link script couldn't be created, continuing in command line."
msgid "Warning: Link script could not be created, continuing in command line."
msgstr "Atenção: Script de linkagem não pode ser criado, continuando com a linha de comando."
#: hbmk2.prg:4298
@@ -278,12 +278,12 @@ msgstr "Criando biblioteca din
#: hbmk2.prg:3991
#, c-format
msgid "Warning: Resource compiler script couldn't be created, continuing in command line."
msgid "Warning: Resource compiler script could not be created, continuing in command line."
msgstr "Atenção: Script para o compilador de Recursos não pode ser criado, continuando com a linha de comando."
#: hbmk2.prg:3772
#, c-format
msgid "Warning: Stub helper .c program couldn't be created."
msgid "Warning: Stub helper .c program could not be created."
msgstr "Atenção: arquivo auxiliar .c não pode ser criado."
#: hbmk2.prg:4060
@@ -409,7 +409,7 @@ msgstr "O script %1$s no diret
#: hbmk2.prg:4439
#, c-format
msgid "Warning: Lib script couldn't be created, continuing in command line."
msgid "Warning: Lib script could not be created, continuing in command line."
msgstr "Atenção: Script para criação da biblioteca não pode ser criado, continuando com a linha de comando."
#: hbmk2.prg:4396
@@ -656,7 +656,7 @@ msgstr "desativar agrupamento de LIBs em compiladores baseados no gcc."
#: hbmk2.prg:7942
#, c-format
msgid "run/don't run output executable"
msgid "run/do not run output executable"
msgstr "executar/não executar o aplicativo gerado."
#: hbmk2.prg:7942
@@ -706,7 +706,7 @@ msgstr "exibe o diret
#: hbmk2.prg:7942
#, c-format
msgid "don't (or do) add Harbour version number and source file reference to .po (default: add them)"
msgid "do (not) add Harbour version number and source file reference to .po (default: add them)"
msgstr "adicionar (ou não) a referência do número da versão do Harbour e o arquivo de origem ao .po (ativo por padrão)"
#: hbmk2.prg:7942
@@ -836,7 +836,7 @@ msgstr "passa flag para o linkeditor (lib est
#: hbmk2.prg:7942
#, c-format
msgid "show commands to be executed, but don't execute them"
msgid "show commands to be executed, but do not execute them"
msgstr "exibir os comandos à serem executados, mas não execute-os"
#: hbmk2.prg:7942
@@ -863,7 +863,7 @@ msgstr "Erro: Executando compilador C/C++. %1$s"
#: hbmk2.prg:4190
#, c-format
msgid "Error: This platform/compiler isn't implemented."
msgid "Error: This platform/compiler is not implemented."
msgstr "Erro: Arquitetura/compilador não implementado."
#: hbmk2.prg:4302
@@ -1020,7 +1020,7 @@ msgstr "Aten
#: hbmk2.prg:7942
#, c-format
msgid "don't add extra list of system libraries to default library list"
msgid "do not add extra list of system libraries to default library list"
msgstr "não adicione bibliotecas extras do sistema à lista padrão de bibliotecas"
#: hbmk2.prg:7960