Commit 0be7e28b authored by Albert's avatar Albert
Browse files

Patch regarding generating the rules file for the windows build regarding... 

Patch regarding generating the rules file for the windows build regarding languages, some inconsistencies in the (windows) build system, corrections to some spelling.

- maintainers.txt
Spelling correction

- config.xml
Added missing languages
Extended some descriptions

- htmlhelp.cpp
Added missing languages
Spelling corrections

- language.cpp
Corrected call in respect to Serbian-Cyrillic

- translator_br.h
Spelling correction

- translator_fa.h
Corrected (not used) define in respect to LeftToRight

- translator_mk.h
Spelling correction

- translator_sc.h
Corrected in respect to consistency for Serbian-Cyrillic

- Doxygen.sln
Added project dependency as otherwise there might be a problem with the generation of version.cpp

- Doxygen.vcproj
Added rules for selecting languages to be used during translation
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)
Corrected name of genhead <-> gen_head (consistency with rules file)

- Doxywizard.vcproj
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)
Note place of resulting executable has hanged (more consistent now)

- Settings.rules
Corrected place where configure file can be found

- Version.rules
Corrected place where configure file can be found

- doxyindexer.vcproj
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)

- doxysearch.vcproj
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)

- iconv.vcproj
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)

- qtools.vcproj
Corrected some incorrect references / directories
Corrected names of generated files / directories so they won't overwrite / conflict (especially during parallel builds)

- lang_cfg.py
Script to generate the file lang_cfg.h based on the specified languages in the windows GUI or in the configure script.

- languages.py
Script to generate languages pane in the windows GUI
This file has to be called outside visual studio as it generates the rules for the Languages pane in the GUI (command on src directory python languages.py > ..\winbuild\Languages.rules)

- Languages.rules
Result file from language.py (old file was completely wrong and not used)
This file has to be generated outside visual studio as it contains the rules for the Languages pane in the GUI

- configure
Use lang_cfg.py script (consistency) instead of (internal) perl script.
parent 1a0a120b

configure

+7 −19
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ f_libclangstatic=NO 
# list will be in case as specified (f_langs) and in uppercase (f_ulangs) as used in the internal perl script

#

f_langs=`ls -1 src/translator_??.h | sed -e 's%src/translator_%%g' | sed -e 's/\.h//' | tr '\012' ',' | sed -e 's/,$//'`

f_ulangs=`echo $f_langs | tr '[a-z]' '[A-Z]'`



while test -n "$1";  do

  case $1 in
@@ -800,12 +799,6 @@ TMAKE_MOC = $QTDIR/bin/moc 
EOF

fi



if test "$f_english" = YES; then

  cat >> .tmakeconfig <<EOF

TMAKE_CXXFLAGS += -DENGLISH_ONLY

EOF

fi



if test "$f_search" = YES; then

  cat >> .tmakeconfig <<EOF

LIBS += -L$XAPIAN/lib
@@ -900,23 +893,18 @@ EOF 
done



# - generating src/lang_cfg.h 

# use consistent method on Linux and Windows



if test -f "src/lang_cfg.h"; then

    chmod u+w src/lang_cfg.h   # make sure file can be overwritten

fi

echo "  Generating src/lang_cfg.h..."

echo $f_langs | $f_perl -e '@l=split(/,/,<STDIN>); 

        chomp @l; 

	@allowed=(split(/,/,"'$f_ulangs'"));

	foreach my $elem (@l){ 

	     $elem =~ tr/a-z/A-Z/;

	     $r=0;

	     foreach my $tst (@allowed){

		if ($tst eq $elem) { $r=1; last; } 		

	     }	    

	     if ($r!=1) { die "ERROR: Invalid language $elem was selected!\n"; } 

	     print "#define LANG_$elem\n";

        };' > ./src/lang_cfg.h   

if test "$f_english" = YES; then

   $f_python src/lang_cfg.py ENONLY > src/lang_cfg.h

else

   f_ulangs=`echo $f_langs | tr '[a-z,]' '[A-Z ]'`

   $f_python src/lang_cfg.py $f_ulangs > src/lang_cfg.h

fi



if test -f "src/config.h"; then

    chmod u+w src/config.h

doc/maintainers.txt

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ Alexandr Chelpanov: cav at cryptopro dot ru 
TranslatorSerbian

Dejan Milosavljevic: [unreachable] dmilos at email dot com



TranslatorSerbianCyrilic

TranslatorSerbianCyrillic

Nedeljko Stefanovic: stenedjo at yahoo dot com



TranslatorSlovak

src/config.xml

+10 −6
Original line number Diff line number Diff line
@@ -289,6 +289,7 @@ Go to the <a href="commands.html">next</a> section or return to the 
      </docs>

      <value name='Afrikaans'/>

      <value name='Arabic'/>

      <value name='Armenian'/>

      <value name='Brazilian'/>

      <value name='Catalan'/>

      <value name='Chinese'/>
@@ -297,28 +298,31 @@ Go to the <a href="commands.html">next</a> section or return to the 
      <value name='Czech'/>

      <value name='Danish'/>

      <value name='Dutch'/>

      <value name='English'/>

      <value name='English' desc='(United States)'/>

      <value name='Esperanto'/>

      <value name='Farsi'/>

      <value name='Farsi' desc='(Persian)'/>

      <value name='Finnish'/>

      <value name='French'/>

      <value name='German'/>

      <value name='Greek'/>

      <value name='Hungarian'/>

      <value name='Indonesian'/>

      <value name='Italian'/>

      <value name='Japanese'/>

      <value name='Japanese-en'/>

      <value name='Japanese-en' desc='(Japanese with English messages)'/>

      <value name='Korean'/>

      <value name='Korean-en'/>

      <value name='Korean-en' desc='(Korean with English messages)'/>

      <value name='Latvian'/>

      <value name='Norwegian'/>

      <value name='Lithuanian'/>

      <value name='Macedonian'/>

      <value name='Persian'/>

      <value name='Norwegian'/>

      <value name='Persian' desc='(Farsi)'/>

      <value name='Polish'/>

      <value name='Portuguese'/>

      <value name='Romanian'/>

      <value name='Russian'/>

      <value name='Serbian'/>

      <value name='Serbian-Cyrillic'/>

      <value name='Slovak'/>

      <value name='Slovene'/>

      <value name='Spanish'/>

src/htmlhelp.cpp

+5 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ void HtmlHelp::initialize() 
  s_languageDict.insert("norwegian",   new QCString("0x814 Norwegian"));

  s_languageDict.insert("polish",      new QCString("0x415 Polish"));

  s_languageDict.insert("portuguese",  new QCString("0x816 Portuguese(Portugal)"));

  s_languageDict.insert("brazil",      new QCString("0x416 Portuguese(Brazil)"));

  s_languageDict.insert("brazilian",   new QCString("0x416 Portuguese(Brazil)"));

  s_languageDict.insert("russian",     new QCString("0x419 Russian"));

  s_languageDict.insert("spanish",     new QCString("0x40A Spanish(Traditional Sort)"));

  s_languageDict.insert("swedish",     new QCString("0x41D Swedish"));
@@ -433,6 +433,10 @@ void HtmlHelp::initialize() 
  s_languageDict.insert("persian",     new QCString("0x429 Persian (Iran)"));

  s_languageDict.insert("arabic",      new QCString("0xC01 Arabic (Egypt)"));

  s_languageDict.insert("latvian",     new QCString("0x426 Latvian"));

  s_languageDict.insert("macedonian",  new QCString("0x042f Macedonian (Former Yugoslav Republic of Macedonia)"));

  s_languageDict.insert("armenian",    new QCString("0x42b Armenian"));

  s_languageDict.insert("esperanto",   new QCString("0x48f Esperanto"));

  s_languageDict.insert("serbian-cyrillic", new QCString("0xC1A Serbian (Serbia, Cyrillic)"));

}

src/lang_cfg.py

0 → 100644
+8 −0
Original line number Diff line number Diff line 
import sys



if (len(sys.argv) > 0):

    if (sys.argv[1] == "ENONLY"):

        print "#define ENGLISH_ONLY"

    else:

        for x in xrange(1, len(sys.argv)):

            print "#define LANG_%s"%(sys.argv[x])