summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorAlbert <albert.tests@gmail.com>2013-10-20 12:14:07 (GMT)
committerAlbert <albert.tests@gmail.com>2013-10-20 12:14:07 (GMT)
commit0be7e28b0cf1d972199574c5dc7c5937d237fbbd (patch)
treee8f9ac94b1da994c60aa20a825f8a6271bd0d8c0 /configure
parent1a0a120b75c28b515cacb021d48d78c18a18b19b (diff)
downloadDoxygen-0be7e28b0cf1d972199574c5dc7c5937d237fbbd.zip
Doxygen-0be7e28b0cf1d972199574c5dc7c5937d237fbbd.tar.gz
Doxygen-0be7e28b0cf1d972199574c5dc7c5937d237fbbd.tar.bz2
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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 7 insertions, 19 deletions
diff --git a/configure b/configure
index dd4344d..02ec303 100755
--- a/configure
+++ b/configure
@@ -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