From ac56711021526f21461bfa673037e1805ceb611b Mon Sep 17 00:00:00 2001 From: Tommaso Cucinotta Date: Fri, 11 Feb 2011 23:27:34 +0000 Subject: [PATCH] Added version suffix to symlinks. Tested with --enable-version-suffix. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37598 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/autotests/Makefile | 5 ++++- development/autotests/keytest.py | 10 +++++++--- development/autotests/run-tests.sh | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/development/autotests/Makefile b/development/autotests/Makefile index 97ad33d1de..695e2e0217 100644 --- a/development/autotests/Makefile +++ b/development/autotests/Makefile @@ -6,5 +6,8 @@ build-xvkbd: cd xvkbd && xmkmf && make .PHONY: -run-tests: xvkbd +run-tests: ./run-tests.sh + +clean: + rm -rf locale out-* diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py index 1122e6e7b6..cf5d13e089 100755 --- a/development/autotests/keytest.py +++ b/development/autotests/keytest.py @@ -389,6 +389,9 @@ while not failed: lang = c[5:].rstrip() print "Setting LANG=" + lang + "\n" os.environ['LANG'] = lang +# If it doesn't exist, create a link //LC_MESSAGES/lyx.mo +# pointing to the corresponding .gmo file. Needed to let lyx find the right translation files. +# See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg165613.html idx = lang.rfind(".") if idx != -1: ccode = lang[0:idx] @@ -400,14 +403,15 @@ while not failed: else: short_code = ccode lyx_dir = os.popen("dirname \"" + lyx_exe + "\"").read().rstrip() + print "Executing: grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'" + lyx_name = os.popen("grep 'PACKAGE =' " + lyx_dir + "/Makefile | sed -e 's/PACKAGE = \(.*\)/\\1/'").read().rstrip() intr_system("mkdir -p " + locale_dir + "/" + ccode + "/LC_MESSAGES") -# Append version suffix ? if lyx_dir[0:3] == "../": rel_dir = "../../" + lyx_dir else: rel_dir = lyx_dir - intr_system("rm -f " + locale_dir + "/" + ccode + "/LC_MESSAGES/lyx.mo") - intr_system("ln -s " + rel_dir + "/../po/" + short_code + ".gmo " + locale_dir + "/" + ccode + "/LC_MESSAGES/lyx.mo") + intr_system("rm -f " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") + intr_system("ln -s " + rel_dir + "/../po/" + short_code + ".gmo " + locale_dir + "/" + ccode + "/LC_MESSAGES/" + lyx_name + ".mo") else: print "Unrecognised Command '" + c + "'\n" failed = True diff --git a/development/autotests/run-tests.sh b/development/autotests/run-tests.sh index 6cbbbe563b..f5ac847c9b 100755 --- a/development/autotests/run-tests.sh +++ b/development/autotests/run-tests.sh @@ -60,7 +60,7 @@ if [ ! -d $LYX_HOME ]; then fi # Launch the emergency STOP button -./stop_autotests.tcl & +./stop_autotests.tcl > /dev/null 2>&1 & echo "Running test cases . . ." failed=0 -- 2.39.2