2011-04-20 00:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* utils/hbmk2/hbmk2.pt_BR.po
* utils/hbmk2/hbmk2.hu_HU.po
* utils/hbmk2/hbmk2.es_PE.po
* utils/hbmk2/hbmk2.prg
* INSTALL
* Use 'please' more sparsingly. Use 'always' a bit more.
* config/lib.mk
* config/bin.mk
* config/dyn.mk
+ Added internal configuration '__HB_BUILD_NOSYSLIB=<lib1> [<lib2>]'
to delete items from default list of system libs used by
core build.
This commit is contained in:
Viktor Szakats
@@ -16,6 +16,21 @@
|
||||
The license applies to all entries newer than 2009-04-28.
|
||||
*/
|
||||
|
||||
2011-04-20 00:28 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
|
||||
* utils/hbmk2/hbmk2.pt_BR.po
|
||||
* utils/hbmk2/hbmk2.hu_HU.po
|
||||
* utils/hbmk2/hbmk2.es_PE.po
|
||||
* utils/hbmk2/hbmk2.prg
|
||||
* INSTALL
|
||||
* Use 'please' more sparsingly. Use 'always' a bit more.
|
||||
|
||||
* config/lib.mk
|
||||
* config/bin.mk
|
||||
* config/dyn.mk
|
||||
+ Added internal configuration '__HB_BUILD_NOSYSLIB=<lib1> [<lib2>]'
|
||||
to delete items from default list of system libs used by
|
||||
core build.
|
||||
|
||||
2011-04-20 00:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
|
||||
* harbour/config/linux/libs.mk
|
||||
* harbour/config/android/libs.mk
|
||||
|
||||
@@ -17,8 +17,8 @@ HARBOUR
|
||||
===============================================
|
||||
|
||||
==========================================================================
|
||||
NOTE: Before reporting a problem to developers, please make sure to read
|
||||
the TROUBLESHOOTING section in this document and try the suggestions
|
||||
NOTE: Before reporting a problem to developers, make sure to read the
|
||||
TROUBLESHOOTING section in this document and try the suggestions
|
||||
you find there.
|
||||
==========================================================================
|
||||
|
||||
@@ -42,7 +42,7 @@ HARBOUR
|
||||
your setup. It's also highly discouraged to keep multiple copies
|
||||
of the same compiler, or different versions of the same compiler
|
||||
in PATH at the same time. For the list of supported compilers,
|
||||
please look up the relevant section in this document.
|
||||
look up the relevant section in this document.
|
||||
3.) GNU Make 3.81 or upper is required. We recommend this link:
|
||||
http://sourceforge.net/projects/mingw/files/MinGW/make/make-3.82-mingw32/make-3.82-3-mingw32-bin.tar.lzma/download
|
||||
Unpack it to your PATH or Harbour source root directory.
|
||||
@@ -99,8 +99,8 @@ HARBOUR
|
||||
1.) You need to get GNU Make. If you use OS/2 host, 3.81r3 or upper
|
||||
version is required. We recommend this link:
|
||||
ftp://hobbes.nmsu.edu/pub/os2/dev/util/make-3.81-r3-bin-static.zip
|
||||
If you use other host, please refer to other platform instructions
|
||||
in this section.
|
||||
If you use other host, refer to other platform instructions in
|
||||
this section.
|
||||
You can also use included copy named os2-make.exe instead.
|
||||
|
||||
> make [install]
|
||||
@@ -302,7 +302,7 @@ HARBOUR
|
||||
|
||||
> package\winuni\mpkg_win_uni.bat
|
||||
|
||||
NOTE: Please read instructions in file and do the necessary
|
||||
NOTE: Carefully read in-file instructions and do the necessary
|
||||
steps before calling the script.
|
||||
|
||||
|
||||
@@ -1220,7 +1220,7 @@ HARBOUR
|
||||
10. TROUBLESHOOTING
|
||||
===================
|
||||
|
||||
Please evaluate these points before reporting an issue on the developers'
|
||||
Always evaluate these points before reporting an issue on the developers'
|
||||
mailing list.
|
||||
|
||||
1. Make sure to have carefully read this document.
|
||||
@@ -1652,8 +1652,8 @@ HARBOUR
|
||||
The size limit for e-mails sent to the development list is
|
||||
40KB. If you need more, upload it to a site where we can
|
||||
access it, or use the sf.net page to submit it.
|
||||
Please use the same coding style as you find in the files
|
||||
you're patching.
|
||||
Always use the same coding/formatting style as you find in
|
||||
the files you're patching.
|
||||
- Given a good history of valuable contributions, you can get
|
||||
write access to the source repository.
|
||||
- Of course there is more into Harbour contribution than writing
|
||||
|
||||
@@ -117,6 +117,10 @@ endif
|
||||
|
||||
-include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
|
||||
|
||||
ifneq ($(__HB_BUILD_NOSYSLIB),)
|
||||
SYSLIBS := $(filter-out $(__HB_BUILD_NOSYSLIB),$(SYSLIBS))
|
||||
endif
|
||||
|
||||
ifneq ($(HB_PLATFORM_UNIX),)
|
||||
ifeq ($(BUILD_SHARED),yes)
|
||||
SYSLIBS :=
|
||||
|
||||
@@ -19,6 +19,10 @@ endif
|
||||
|
||||
-include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
|
||||
|
||||
ifneq ($(__HB_BUILD_NOSYSLIB),)
|
||||
SYSLIBS := $(filter-out $(__HB_BUILD_NOSYSLIB),$(SYSLIBS))
|
||||
endif
|
||||
|
||||
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
|
||||
include $(TOP)$(ROOT)config/c.mk
|
||||
include $(TOP)$(ROOT)config/prg.mk
|
||||
|
||||
@@ -47,6 +47,11 @@ endif
|
||||
|
||||
# Added only for hbpp
|
||||
-include $(TOP)$(ROOT)config/$(HB_PLATFORM)/libs.mk
|
||||
|
||||
ifneq ($(__HB_BUILD_NOSYSLIB),)
|
||||
SYSLIBS := $(filter-out $(__HB_BUILD_NOSYSLIB),$(SYSLIBS))
|
||||
endif
|
||||
|
||||
include $(TOP)$(ROOT)config/$(HB_PLATFORM)/$(HB_COMPILER).mk
|
||||
include $(TOP)$(ROOT)config/c.mk
|
||||
include $(TOP)$(ROOT)config/prg.mk
|
||||
|
||||
@@ -48,7 +48,7 @@ msgstr "fuerza modo C/C++ o restablecimiento de valores"
|
||||
|
||||
#: hbmk2.prg:1104 hbmk2.prg:1450
|
||||
#, c-format
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgstr "Error: HB_INSTALL_PREFIX no definido, fallo autodetección.\\nPor favor, ejecute esta herramienta desde su ubicación original dentro de la carpeta de instalación de Harbour o configure la variable de entorno HB_INSTALL_PREFIX hacia el directorio raíz de Harbour."
|
||||
|
||||
#: hbmk2.prg:953 hbmk2.prg:1268
|
||||
@@ -98,7 +98,7 @@ msgstr "Compilador C detectado automáticamente: %1$s"
|
||||
|
||||
#: hbmk2.prg:1301 hbmk2.prg:1673
|
||||
#, c-format
|
||||
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"
|
||||
msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -compiler= option to one of these values: %1$s"
|
||||
msgstr "No se pudo detectar ningún compilador C en su PATH.\\nPor favor, utilice la opción -compiler= para especificar uno de estos valores: %1$s"
|
||||
|
||||
#: hbmk2.prg:1307 hbmk2.prg:1679
|
||||
@@ -113,7 +113,7 @@ msgstr "Usando Harbour: %1$s %2$s %3$s %4$s"
|
||||
|
||||
#: hbmk2.prg:1299 hbmk2.prg:1671
|
||||
#, c-format
|
||||
msgid "Please choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgid "Choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgstr "Por favor, elija un compilador C usando la Opción: -compiler=.\\ntiene las siguientes opciones en su plataforma: %1$s"
|
||||
|
||||
#: hbmk2.prg:1380 hbmk2.prg:1855
|
||||
@@ -1023,7 +1023,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
#, c-format
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Please note that .hbp files are automatically considered as separate targets."
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Note that .hbp files are automatically considered as separate targets."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
@@ -1258,7 +1258,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:6786
|
||||
#, c-format
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Please check your Harbour build settings."
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Check your Harbour build settings."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
|
||||
@@ -374,7 +374,7 @@ msgstr "C fordító debug információ hozzáadása (vagy sem). Harbour szintű
|
||||
|
||||
#: hbmk2.prg:1300 hbmk2.prg:1671
|
||||
#, c-format
|
||||
msgid "Please choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgid "Choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgstr "Kérem, válasszon C fordítót a -compiler= kapcsoló segítségével.\\nA következő lehetőségek közül választhat: %1$s"
|
||||
|
||||
#: hbmk2.prg:7941 hbmk2.prg:11633
|
||||
@@ -404,7 +404,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:1105 hbmk2.prg:1450
|
||||
#, c-format
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgstr "Hiba: HB_INSTALL_PREFIX nincs megadva, automata detektálás nem járt sikerrel.\\nKérem, futtassa ezt a programot a Harbour könyvtárán belüli eredeti helyéről vagy állítsa be a HB_INSTALL_PREFIX környezeti változót a Harbour gyökér könyvtárára."
|
||||
|
||||
#: hbmk2.prg:2096 hbmk2.prg:2938
|
||||
@@ -624,7 +624,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:1302 hbmk2.prg:1673
|
||||
#, c-format
|
||||
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"
|
||||
msgid "Could not detect any supported C compiler in your PATH.\\nSetup 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 hbmk2.prg:11479
|
||||
@@ -1019,7 +1019,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
#, c-format
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Please note that .hbp files are automatically considered as separate targets."
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Note that .hbp files are automatically considered as separate targets."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
@@ -1254,7 +1254,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:6786
|
||||
#, c-format
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Please check your Harbour build settings."
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Check your Harbour build settings."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
|
||||
@@ -1481,7 +1481,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
|
||||
CASE hb_FileExists( hb_DirSepAdd( hb_DirBase() ) + ".." + hb_ps() + ".." + hb_ps() + ".." + hb_ps() + "bin" + hb_ps() + cBin_CompPRG + hbmk[ _HBMK_cCCEXT ] )
|
||||
l_cHB_INSTALL_PREFIX := hb_DirSepAdd( hb_DirBase() ) + ".." + hb_ps() + ".." + hb_ps() + ".."
|
||||
OTHERWISE
|
||||
hbmk_OutErr( hbmk, I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." ) )
|
||||
hbmk_OutErr( hbmk, I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." ) )
|
||||
RETURN _ERRLEV_FAILHBDETECT
|
||||
ENDCASE
|
||||
#endif
|
||||
@@ -1519,7 +1519,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
|
||||
ENDIF
|
||||
ELSEIF ! hb_FileExists( hb_DirSepAdd( l_cHB_INSTALL_PREFIX ) + hb_ps() + "include" +;
|
||||
hb_ps() + "hbvm.h" )
|
||||
hbmk_OutErr( hbmk, I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." ) )
|
||||
hbmk_OutErr( hbmk, I_( "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\nRun this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory." ) )
|
||||
RETURN _ERRLEV_FAILHBDETECT
|
||||
ENDIF
|
||||
|
||||
@@ -1705,9 +1705,9 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
|
||||
ENDIF
|
||||
ELSE
|
||||
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, ", " ) ) )
|
||||
hbmk_OutErr( hbmk, hb_StrFormat( I_( "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_( "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, ", " ) ) )
|
||||
hbmk_OutErr( hbmk, hb_StrFormat( I_( "Could not detect any supported C compiler in your PATH.\nSetup one or set -compiler= option to one of these values: %1$s" ), ArrayToList( aCOMPSUP, ", " ) ) )
|
||||
ENDIF
|
||||
RETURN _ERRLEV_UNKNCOMP
|
||||
ENDIF
|
||||
@@ -7113,7 +7113,7 @@ STATIC FUNCTION s_getIncludedFiles( hbmk, cFile, cParentDir, lCMode )
|
||||
.F. /* lCaseSensitive */,;
|
||||
.T. /* lNewLine */ )
|
||||
IF Empty( s_pRegexInclude )
|
||||
hbmk_OutErr( hbmk, I_( "Internal Error: Regular expression engine missing or unsupported. Please check your Harbour build settings." ) )
|
||||
hbmk_OutErr( hbmk, I_( "Internal Error: Regular expression engine missing or unsupported. Check your Harbour build settings." ) )
|
||||
s_pRegexInclude := 0 /* To show the error only once by setting to non-NIL empty value */
|
||||
ENDIF
|
||||
ENDIF
|
||||
@@ -11983,7 +11983,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lLong )
|
||||
NIL,;
|
||||
{ "Options below are available on command line only:" },;
|
||||
NIL,;
|
||||
{ "-target=<script>" , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Please note that .hbp files are automatically considered as separate targets." ) },;
|
||||
{ "-target=<script>" , I_( "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Note that .hbp files are automatically considered as separate targets." ) },;
|
||||
NIL,;
|
||||
{ "-env:<e>[<o>[<v>]]" , I_( "alter local environment. <e> is the name of the environment variable to alter. <o> can be '=' to set/override, '-' to delete, '+' to append to the end of existing value, '#' to insert to the beginning of existing value. <v> is the value to set/append/insert. If multiple options are passed, they are processed from left to right." ) },;
|
||||
NIL,;
|
||||
|
||||
@@ -48,7 +48,7 @@ msgstr "forçar compilação em modo C/C++ ou reseta para o modo padrão"
|
||||
|
||||
#: hbmk2.prg:1104 hbmk2.prg:1450
|
||||
#, c-format
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nPlease run this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgid "Error: HB_INSTALL_PREFIX not set, failed to autodetect.\\nRun this tool from its original location inside the Harbour installation or set HB_INSTALL_PREFIX environment variable to Harbour's root directory."
|
||||
msgstr "Erro: HB_INSTALL_PREFIX não definido, falha na detecção automática."
|
||||
|
||||
#: hbmk2.prg:953 hbmk2.prg:1268
|
||||
@@ -98,7 +98,7 @@ msgstr "Compilador C detectado automaticamente: %1$s"
|
||||
|
||||
#: hbmk2.prg:1301 hbmk2.prg:1673
|
||||
#, c-format
|
||||
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"
|
||||
msgid "Could not detect any supported C compiler in your PATH.\\nSetup one or set -compiler= option to one of these values: %1$s"
|
||||
msgstr "Nenhum compilador C suportado foi encontrado em seu PATH.\\nPor favor, utilize a opção -compiler= com um destes valores: %1$s"
|
||||
|
||||
#: hbmk2.prg:1307 hbmk2.prg:1679
|
||||
@@ -113,7 +113,7 @@ msgstr "Usando Harbour: %1$s %2$s %3$s %4$s"
|
||||
|
||||
#: hbmk2.prg:1299 hbmk2.prg:1671
|
||||
#, c-format
|
||||
msgid "Please choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgid "Choose a C compiler by using -compiler= option.\\nYou have the following choices on your platform: %1$s"
|
||||
msgstr "Por favor, selecione um compilador C usando a opção -compiler= ou a variável de ambiente HBCOMPILER.\\nVocê possui as seguintes opções para sua plataforma> %1$s"
|
||||
|
||||
#: hbmk2.prg:1380 hbmk2.prg:1855
|
||||
@@ -1023,7 +1023,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
#, c-format
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Please note that .hbp files are automatically considered as separate targets."
|
||||
msgid "specify a new build target. <script> can be .prg (or no extension) or .hbp file. Note that .hbp files are automatically considered as separate targets."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
@@ -1258,7 +1258,7 @@ msgstr ""
|
||||
|
||||
#: hbmk2.prg:6786
|
||||
#, c-format
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Please check your Harbour build settings."
|
||||
msgid "Internal Error: Regular expression engine missing or unsupported. Check your Harbour build settings."
|
||||
msgstr ""
|
||||
|
||||
#: hbmk2.prg:11633
|
||||
|
||||
Reference in New Issue
Block a user