diff --git a/ChangeLog.txt b/ChangeLog.txt index fe6bd2daa4..b4c20b4964 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,17 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2013-03-16 12:15 UTC+0100 Viktor Szakats (harbour syenar.net) + * utils/hbmk2/hbmk2.*.po + * utils/hbmk2/hbmk2.prg + * changed order of VCS systems in help + + * config/global.mk + - deleted commented svn support + + * tests/stripsvn.hb -> tests/stripid.hb + * avoid the word 'svn' + 2013-03-16 12:10 UTC+0100 Viktor Szakats (harbour syenar.net) * README.txt * minor to git clone diff --git a/config/global.mk b/config/global.mk index d73e4e1db2..662f9dcf23 100644 --- a/config/global.mk +++ b/config/global.mk @@ -1735,13 +1735,6 @@ ifeq ($(HB_INIT_DONE),) $(info ! HB_INSTALL_PREFIX automatically set to: $(HB_INSTALL_PREFIX)) endif ifeq ($(ROOT),./) -# ifneq ($(call find_in_path,svnversion),) -# _tmp := $(shell svnversion .) -# ifneq ($(findstring M,$(_tmp)),) -# $(info ! === WARNING: Locally modified source code ===) -# endif -# $(info ! REVISION: $(_tmp)) -# endif ifneq ($(wildcard .git),) ifneq ($(call find_in_path,git),) _tmp := $(shell git diff --name-only --quiet) diff --git a/tests/stripsvn.hb b/tests/stripid.hb similarity index 97% rename from tests/stripsvn.hb rename to tests/stripid.hb index 54ca1762bc..3971114692 100644 --- a/tests/stripsvn.hb +++ b/tests/stripid.hb @@ -1,5 +1,5 @@ /* - * Strips svn headers from source files + * Strips VCS id headers from source files * * Copyright 2013 Viktor Szakats (harbour syenar.net) * www - http://harbour-project.org diff --git a/utils/hbmk2/hbmk2.es_PE.po b/utils/hbmk2/hbmk2.es_PE.po index dbd2389182..1dd165b858 100644 --- a/utils/hbmk2/hbmk2.es_PE.po +++ b/utils/hbmk2/hbmk2.es_PE.po @@ -818,8 +818,8 @@ msgstr "archivo de opciones %1$s en directorio de %2$s siempre es procesado si e #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar, Fossil and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" -msgstr "genera archivo .ch con información de repositorio local. SVN, CVS, Git, Mercurial, Bazaar, Fossil y Monotone están actualmente soportadas. Archivo de cabecera generado contendrá macro _HBMK_VCS_TYPE_ con en nombre de VCS detectado y _HBMK_VCS_ID_ con ID único del repositorio local" +msgid "generate .ch header file with local repository information. Git, SVN, Mercurial, Bazaar, Fossil, CVS and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" +msgstr "genera archivo .ch con información de repositorio local. Git, SVN, Mercurial, Bazaar, Fossil, CVS y Monotone están actualmente soportadas. Archivo de cabecera generado contendrá macro _HBMK_VCS_TYPE_ con en nombre de VCS detectado y _HBMK_VCS_ID_ con ID único del repositorio local" #: hbmk2.prg:5805 hbmk2.prg:8785 hbmk2.prg:9362 #, c-format diff --git a/utils/hbmk2/hbmk2.hu_HU.po b/utils/hbmk2/hbmk2.hu_HU.po index b5a4f4e5a4..b713b4c1d1 100644 --- a/utils/hbmk2/hbmk2.hu_HU.po +++ b/utils/hbmk2/hbmk2.hu_HU.po @@ -819,8 +819,8 @@ msgstr "hozzon létre egy .ch fejlécet időpont adatokkal. Generált fejléc _H #: hbmk2.prg:7941 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar, Fossil and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" -msgstr "hozzon létre egy .ch fejlécet a helyi források verziókövető (VCS) adatbázisbeli adataival. SVN, CVS, Git, Mercurial, Bazaar, Fossil és Monotone támogatottak. Generált fejléc _HBMK_VCS_TYPE_ makrója adja vissza a VCS típusát, míg _HBMK_VCS_ID_ az aktuális állapot egyedi azonosítóját" +msgid "generate .ch header file with local repository information. Git, SVN, Mercurial, Bazaar, Fossil, CVS and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" +msgstr "hozzon létre egy .ch fejlécet a helyi források verziókövető (VCS) adatbázisbeli adataival. Git, SVN, Mercurial, Bazaar, Fossil, CVS és Monotone támogatottak. Generált fejléc _HBMK_VCS_TYPE_ makrója adja vissza a VCS típusát, míg _HBMK_VCS_ID_ az aktuális állapot egyedi azonosítóját" #: hbmk2.prg:6846 hbmk2.prg:10111 hbmk2.prg:10837 #, c-format diff --git a/utils/hbmk2/hbmk2.prg b/utils/hbmk2/hbmk2.prg index fa866508f3..c956b1d572 100644 --- a/utils/hbmk2/hbmk2.prg +++ b/utils/hbmk2/hbmk2.prg @@ -15705,7 +15705,7 @@ STATIC PROCEDURE ShowHelp( hbmk, lMore, lLong ) { "-safe[-]" , I_( e"enable safety options in C compiler/linker (default: enabled on Windows, disabled on other systems)" ) }, ; { "-compr=" , I_( e"compress executable/dynamic lib (needs UPX tool)\n can be: yes, no, min, max" ) }, ; { "-run[-]" , I_( "run/do not run output executable" ) }, ; - { "-vcshead=" , I_( "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar, Fossil and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository. If no VCS system is detected, a sequential number will be rolled automatically on each build." ) }, ; + { "-vcshead=" , I_( "generate .ch header file with local repository information. Git, SVN, Mercurial, Bazaar, Fossil, CVS and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository. If no VCS system is detected, a sequential number will be rolled automatically on each build." ) }, ; { "-tshead=" , I_( "generate .ch header file with timestamp information. Generated header will define preprocessor constants _HBMK_BUILD_DATE_, _HBMK_BUILD_TIME_, _HBMK_BUILD_TIMESTAMP_ with the date/time of build" ) }, ; { "-icon=" , I_( "set as application icon. should be a supported format on the target platform (not supported by some platforms/compilers). On Windows, it is implemented by generating and linking a resource file." ) }, ; { "-manifest=" , I_( "embed manifest in executable/dynamic lib (Windows only)" ) }, ; diff --git a/utils/hbmk2/hbmk2.pt_BR.po b/utils/hbmk2/hbmk2.pt_BR.po index 87954083f6..be3801cc5f 100644 --- a/utils/hbmk2/hbmk2.pt_BR.po +++ b/utils/hbmk2/hbmk2.pt_BR.po @@ -818,8 +818,8 @@ msgstr "O arquivo de configuração %1$s no diretório do %2$s sempre ser proces #: hbmk2.prg:7942 hbmk2.prg:11633 hbmk2.prg:13102 #, c-format -msgid "generate .ch header file with local repository information. SVN, CVS, Git, Mercurial, Bazaar, Fossil and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" -msgstr "gera um arquivo .ch com informações do repositório local. SVN, CVS, Git, Mercurial, Bazaar, Fossil e Monotone estão entre as ferramentas atualmente suportadas. O arquivo gerado conterá a diretriva _HBMK_VCS_TYPE_ com o nome do VCS detectado e _HBMK_VCS_ID_ com o unique ID do repositório local" +msgid "generate .ch header file with local repository information. Git, SVN, Mercurial, Bazaar, Fossil, CVS and Monotone are currently supported. Generated header will define preprocessor constant _HBMK_VCS_TYPE_ with the name of detected VCS and _HBMK_VCS_ID_ with the unique ID of local repository" +msgstr "gera um arquivo .ch com informações do repositório local. Git, SVN, Mercurial, Bazaar, Fossil, CVS e Monotone estão entre as ferramentas atualmente suportadas. O arquivo gerado conterá a diretriva _HBMK_VCS_TYPE_ com o nome do VCS detectado e _HBMK_VCS_ID_ com o unique ID do repositório local" #: hbmk2.prg:5805 hbmk2.prg:8785 hbmk2.prg:9362 #, c-format