Skip to content

Commit

Permalink
Delete things related to old translation system
Browse files Browse the repository at this point in the history
Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
  • Loading branch information
Uoti Urpala committed Mar 10, 2010
1 parent b996250 commit 00323c0
Show file tree
Hide file tree
Showing 220 changed files with 6 additions and 34,479 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
/config.h
/config.mak
/configure.log
/help_mp.h
/mencoder
/mplayer
/version.h
Expand Down
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ mplayer$(EXESUF): EXTRALIBS += $(EXTRALIBS_MPLAYER)
mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)

codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h
$(HOST_CC) -O -DCODECS2HTML -I. -o $@ $<

codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf
Expand All @@ -784,9 +784,6 @@ config.mak: configure
@echo "####### Please run ./configure again - it's changed! #######"
@echo "############################################################"

help_mp.h: help/help_mp-en.h $(HELP_FILE)
help/help_create.sh $(HELP_FILE) $(CHARSET)

version.h: version.sh
./$< `$(CC) -dumpversion`

Expand All @@ -798,7 +795,6 @@ version.h: version.sh

# Make sure all generated header files are created.
codec-cfg.d codec-cfg.o: codecs.conf.h
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi osdep/mplayer.rc): version.h

# Files that depend on libswscale internals
Expand Down Expand Up @@ -894,7 +890,7 @@ clean:
distclean: clean testsclean toolsclean driversclean dhahelperclean dhahelperwinclean
-rm -rf DOCS/tech/doxygen
-rm -f $(call ADD_ALL_DIRS,/*.d)
-rm -f configure.log config.mak config.h codecs.conf.h help_mp.h \
-rm -f configure.log config.mak config.h codecs.conf.h \
version.h $(VIDIX_PCI_FILES) TAGS tags
-rm -f $(call ADD_ALL_EXESUFS,codec-cfg cpuinfo)

Expand All @@ -915,10 +911,10 @@ generated_ebml:

TEST_OBJS = mp_msg.o mp_fifo.o osdep/$(GETCH) osdep/$(TIMER) -ltermcap -lm

codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h help_mp.h $(TEST_OBJS)
codec-cfg-test$(EXESUF): codec-cfg.c codecs.conf.h $(TEST_OBJS)
$(CC) -I. -DTESTING -o $@ $^

codecs2html$(EXESUF): codec-cfg.c help_mp.h $(TEST_OBJS)
codecs2html$(EXESUF): codec-cfg.c $(TEST_OBJS)
$(CC) -I. -DCODECS2HTML -o $@ $^

liba52/test$(EXESUF): cpudetect.o $(SRCS_LIBA52_INTERNAL:.c=.o) -lm
Expand Down
1 change: 0 additions & 1 deletion codec-cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
#endif
#endif

#include "help_mp.h"

#include "libmpcodecs/img_format.h"
#include "codec-cfg.h"
Expand Down
1 change: 0 additions & 1 deletion command.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#include "libvo/sub.h"
#include "m_option.h"
#include "m_property.h"
#include "help_mp.h"
#include "metadata.h"
#include "libmpcodecs/vf.h"
#include "libmpcodecs/vd.h"
Expand Down
34 changes: 2 additions & 32 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,6 @@ case $(echo -n) in
*) _echo_n='-n ' _echo_c= ;; # BSD echo
esac

msg_lang_all=$(echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g")
man_lang_all=$(echo DOCS/man/??/mplayer.1 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -e "s:DOCS/man/\(.._..\)/mplayer.1:\1:g")
doc_lang_all=$(echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g")

Expand Down Expand Up @@ -403,15 +402,14 @@ Language options:
--charset=charset convert the console messages to this character set
--language-doc=lang language to use for the documentation [en]
--language-man=lang language to use for the man pages [en]
--language-msg=lang language to use for the messages [en]
--language=lang default language to use [en]
Specific options override --language. You can pass a list of languages separated
by whitespace or commas instead of a single language. Nonexisting translations
will be dropped from each list. All documentation and man page translations
available in the list will be installed, for the messages the first available
translation will be used. The value "all" will activate all translations. The
LINGUAS environment variable is honored. In all cases the fallback is English.
Available values are: all $msg_lang_all
Available values are: all $man_lang_all
Miscellaneous options:
--enable-runtime-cpudetection enable runtime CPU detection [disable]
Expand Down Expand Up @@ -821,9 +819,6 @@ for ac_option do
--language-man=*)
language_man=$(echo $ac_option | cut -d '=' -f 2)
;;
--language-msg=*)
language_msg=$(echo $ac_option | cut -d '=' -f 2)
;;
--language=*)
language=$(echo $ac_option | cut -d '=' -f 2)
;;
Expand Down Expand Up @@ -2848,14 +2843,11 @@ echocheck "language"
test -z "$language" && language=$LINGUAS
test -z "$language_doc" && language_doc=$language
test -z "$language_man" && language_man=$language
test -z "$language_msg" && language_msg=$language
language_doc=$(echo $language_doc | tr , " ")
language_man=$(echo $language_man | tr , " ")
language_msg=$(echo $language_msg | tr , " ")

test "$language_doc" = "all" && language_doc=$doc_lang_all
test "$language_man" = "all" && language_man=$man_lang_all
test "$language_msg" = "all" && language_msg=en

# Prune non-existing translations from language lists.
# Set message translation to the first available language.
Expand All @@ -2872,13 +2864,7 @@ done
language_man=$tmp_language_man
test -z "$language_man" && language_man=en

for lang in $language_msg ; do
test -f "help/help_mp-${lang}.h" && tmp_language_msg=$lang && break
done
language_msg=$tmp_language_msg
test -z "$language_msg" && language_msg=en
_mp_help="help/help_mp-${language_msg}.h"
echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc"
echores "man pages: $language_man - documentation: $language_doc"


echocheck "enable sighandler"
Expand Down Expand Up @@ -7618,20 +7604,6 @@ else
_charset="UTF-8"
fi

if test -n "$_charset" && test "$_charset" != "UTF-8" ; then
echocheck "iconv program"
iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
if test "$?" -ne 0 ; then
echores "no"
echo "No working iconv program found, use "
echo "--charset=UTF-8 to continue anyway."
echo "If you also have problems with iconv library functions use --charset=noconv."
exit 1
else
echores "yes"
fi
fi

#############################################################################

echocheck "automatic gdb attach"
Expand Down Expand Up @@ -7888,7 +7860,6 @@ MPDEPEND_CMD = \$(CC) -MM \$(CFLAGS) \$(filter-out %.xpm,\$(filter-out %.h
MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.hh,\$(filter-out %.h,$^)) | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
GETCH = $_getch
HELP_FILE = $_mp_help
TIMER = $_timer
EXESUF = $_exesuf
Expand Down Expand Up @@ -8582,7 +8553,6 @@ Config files successfully generated by ./configure $_configuration !
Optimizing for: $_optimizing
Languages:
Messages: $language_msg
Manual pages: $language_man
Documentation: $language_doc
Expand Down
1 change: 0 additions & 1 deletion edl.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "config.h"
#include "mp_msg.h"
#include "edl.h"
#include "help_mp.h"

char *edl_filename; // file to extract EDL entries from (-edl)
char *edl_output_filename; // file to put EDL entries in (-edlout)
Expand Down
1 change: 0 additions & 1 deletion find_sub.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include "subreader.h"

#include "mp_msg.h"
#include "help_mp.h"
#include "mpcommon.h"

static int current_sub=0;
Expand Down
68 changes: 0 additions & 68 deletions help/help_create.sh

This file was deleted.

Loading

0 comments on commit 00323c0

Please sign in to comment.