Merge pull request #47 from albert-github/feature/build_language (4447e7f3) · Commits · Elphel / doxverilog

configure

+7 −19

Original line number	Original line	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		# 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_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		while test -n "$1"; do
	case $1 in		case $1 in
	@@ -800,12 +799,6 @@ TMAKE_MOC = $QTDIR/bin/moc
	EOF		EOF
	fi		fi

	if test "$f_english" = YES; then
	cat >> .tmakeconfig <<EOF
	TMAKE_CXXFLAGS += -DENGLISH_ONLY
	EOF
	fi

	if test "$f_search" = YES; then		if test "$f_search" = YES; then
	cat >> .tmakeconfig <<EOF		cat >> .tmakeconfig <<EOF
	LIBS += -L$XAPIAN/lib		LIBS += -L$XAPIAN/lib
	@@ -900,23 +893,18 @@ EOF
	done		done

	# - generating src/lang_cfg.h		# - generating src/lang_cfg.h
			# use consistent method on Linux and Windows

	if test -f "src/lang_cfg.h"; then		if test -f "src/lang_cfg.h"; then
	chmod u+w src/lang_cfg.h # make sure file can be overwritten		chmod u+w src/lang_cfg.h # make sure file can be overwritten
	fi		fi
	echo " Generating src/lang_cfg.h..."		echo " Generating src/lang_cfg.h..."
	echo $f_langs \| $f_perl -e '@l=split(/,/,<STDIN>);		if test "$f_english" = YES; then
	chomp @l;		$f_python src/lang_cfg.py ENONLY > src/lang_cfg.h
	@allowed=(split(/,/,"'$f_ulangs'"));		else
	foreach my $elem (@l){		f_ulangs=`echo $f_langs \| tr '[a-z,]' '[A-Z ]'`
	$elem =~ tr/a-z/A-Z/;		$f_python src/lang_cfg.py $f_ulangs > src/lang_cfg.h
	$r=0;		fi
	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 "src/config.h"; then		if test -f "src/config.h"; then
	chmod u+w src/config.h		chmod u+w src/config.h

doc/maintainers.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -134,7 +134,7 @@ Alexandr Chelpanov: cav at cryptopro dot ru
	TranslatorSerbian		TranslatorSerbian
	Dejan Milosavljevic: [unreachable] dmilos at email dot com		Dejan Milosavljevic: [unreachable] dmilos at email dot com

	TranslatorSerbianCyrilic		TranslatorSerbianCyrillic
	Nedeljko Stefanovic: stenedjo at yahoo dot com		Nedeljko Stefanovic: stenedjo at yahoo dot com

	TranslatorSlovak		TranslatorSlovak

src/config.xml

+10 −6

Original line number	Original line	Diff line number	Diff line
	@@ -289,6 +289,7 @@ Go to the <a href="commands.html">next</a> section or return to the
	</docs>		</docs>
	<value name='Afrikaans'/>		<value name='Afrikaans'/>
	<value name='Arabic'/>		<value name='Arabic'/>
			<value name='Armenian'/>
	<value name='Brazilian'/>		<value name='Brazilian'/>
	<value name='Catalan'/>		<value name='Catalan'/>
	<value name='Chinese'/>		<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='Czech'/>
	<value name='Danish'/>		<value name='Danish'/>
	<value name='Dutch'/>		<value name='Dutch'/>
	<value name='English'/>		<value name='English' desc='(United States)'/>
	<value name='Esperanto'/>		<value name='Esperanto'/>
	<value name='Farsi'/>		<value name='Farsi' desc='(Persian)'/>
	<value name='Finnish'/>		<value name='Finnish'/>
	<value name='French'/>		<value name='French'/>
	<value name='German'/>		<value name='German'/>
	<value name='Greek'/>		<value name='Greek'/>
	<value name='Hungarian'/>		<value name='Hungarian'/>
			<value name='Indonesian'/>
	<value name='Italian'/>		<value name='Italian'/>
	<value name='Japanese'/>		<value name='Japanese'/>
	<value name='Japanese-en'/>		<value name='Japanese-en' desc='(Japanese with English messages)'/>
	<value name='Korean'/>		<value name='Korean'/>
	<value name='Korean-en'/>		<value name='Korean-en' desc='(Korean with English messages)'/>
	<value name='Latvian'/>		<value name='Latvian'/>
	<value name='Norwegian'/>		<value name='Lithuanian'/>
	<value name='Macedonian'/>		<value name='Macedonian'/>
	<value name='Persian'/>		<value name='Norwegian'/>
			<value name='Persian' desc='(Farsi)'/>
	<value name='Polish'/>		<value name='Polish'/>
	<value name='Portuguese'/>		<value name='Portuguese'/>
	<value name='Romanian'/>		<value name='Romanian'/>
	<value name='Russian'/>		<value name='Russian'/>
	<value name='Serbian'/>		<value name='Serbian'/>
			<value name='Serbian-Cyrillic'/>
	<value name='Slovak'/>		<value name='Slovak'/>
	<value name='Slovene'/>		<value name='Slovene'/>
	<value name='Spanish'/>		<value name='Spanish'/>

src/htmlhelp.cpp

+5 −1

src/lang_cfg.py

0 → 100644

+8 −0

Original line number	Original line	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])

Original line number	Original line	Diff line number	Diff line
	@@ -406,7 +406,7 @@ void HtmlHelp::initialize()
	s_languageDict.insert("norwegian", new QCString("0x814 Norwegian"));		s_languageDict.insert("norwegian", new QCString("0x814 Norwegian"));
	s_languageDict.insert("polish", new QCString("0x415 Polish"));		s_languageDict.insert("polish", new QCString("0x415 Polish"));
	s_languageDict.insert("portuguese", new QCString("0x816 Portuguese(Portugal)"));		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("russian", new QCString("0x419 Russian"));
	s_languageDict.insert("spanish", new QCString("0x40A Spanish(Traditional Sort)"));		s_languageDict.insert("spanish", new QCString("0x40A Spanish(Traditional Sort)"));
	s_languageDict.insert("swedish", new QCString("0x41D Swedish"));		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("persian", new QCString("0x429 Persian (Iran)"));
	s_languageDict.insert("arabic", new QCString("0xC01 Arabic (Egypt)"));		s_languageDict.insert("arabic", new QCString("0xC01 Arabic (Egypt)"));
	s_languageDict.insert("latvian", new QCString("0x426 Latvian"));		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)"));
	}		}

Admin message