June 2009 - Wine-commits - list.winehq.org

Mikolaj Zalewski : add README file
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: bdb8582c80314c6dd0eb8e30cb95f0bd6be7fa57 URL: http://source.winehq.org/git/tools.git/?a=commit;h=bdb8582c80314c6dd0eb8e30… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Dec 7 01:13:35 2008 +0100 add README file --- README | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/README b/README new file mode 100644 index 0000000..7c66b10 --- /dev/null +++ b/README @@ -0,0 +1,12 @@ +To run the scripts, copy scripts/config-example to scripts/config and edit it +to setup the paths. Then, in scripts/, run ./Master.sh to generate the +statistics. If, in scripts/config, you have set to store results in the +directory with PHP scripts from php/, they should be able to display the +statistics. If you want to keep the generated data in a different directory +than the PHP scripts, edit php/config.php so that they can to find it. + +You can create files scripts/local-prehook.sh and scripts/local-posthook.sh if +you want to automate e.g. fetching the Git tree before generating the statistics +or push the results to a server after it. Running the scripts with the +environment variable NOVERBOSE set should make them silent enough to make them +usable as a cron job.

1 0

Mikolaj Zalewski : If needed, run configure in wrc tree
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 53aa16671d8ed4a7a6c96d1cf884eb404a5d8a17 URL: http://source.winehq.org/git/tools.git/?a=commit;h=53aa16671d8ed4a7a6c96d1c… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Feb 21 17:27:41 2009 +0100 If needed, run configure in wrc tree --- scripts/Master.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/scripts/Master.sh b/scripts/Master.sh index c936830..ee7a27c 100755 --- a/scripts/Master.sh +++ b/scripts/Master.sh @@ -26,6 +26,9 @@ if [ "$PREPARE_TREES" -eq 1 ]; then if [ "x$NOVERBOSE" = "x" ]; then echo -n "Preparing tree(s)..." fi + if [ ! -f "$WRCROOT/Makefile" ]; then + $WRCROOT/configure + fi make -C "$WRCROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in wrc tree failed" make -C "$WRCROOT" tools >/dev/null 2>>"$WORKDIR/run.log" || die "make tools in wrc tree failed" make -C "$SOURCEROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed"

1 0

Mikolaj Zalewski : Add Lithuanian language
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: cad9351655fc254a2cadcb7c3122d19f9445c11b URL: http://source.winehq.org/git/tools.git/?a=commit;h=cad9351655fc254a2cadcb7c… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sat Feb 21 17:28:02 2009 +0100 Add Lithuanian language --- php/conf/027:00 | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/php/conf/027:00 b/php/conf/027:00 new file mode 100644 index 0000000..52a59e5 --- /dev/null +++ b/php/conf/027:00 @@ -0,0 +1 @@ +Lithuanian[ignore-sublang] \ No newline at end of file

1 0

Mikolaj Zalewski : Polish should ignore sublang
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: c661e8d4bd1b72a8877b89a652b2b12b1f5b4b33 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c661e8d4bd1b72a8877b89a6… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Jun 7 11:48:20 2009 +0200 Polish should ignore sublang --- scripts/conf/015:00 | 1 + scripts/conf/015:01 | 1 - 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/conf/015:00 b/scripts/conf/015:00 new file mode 100644 index 0000000..f8e03c0 --- /dev/null +++ b/scripts/conf/015:00 @@ -0,0 +1 @@ +Polish[ignore-sublang] \ No newline at end of file diff --git a/scripts/conf/015:01 b/scripts/conf/015:01 deleted file mode 100644 index e88b597..0000000 --- a/scripts/conf/015:01 +++ /dev/null @@ -1 +0,0 @@ -Polish \ No newline at end of file

1 0

Mikolaj Zalewski : Fix menu tree drawing when comparing menu resources.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 363d8f75a8e11f5c0fe5efb5aea7ef8f5709907f URL: http://source.winehq.org/git/tools.git/?a=commit;h=363d8f75a8e11f5c0fe5efb5… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Jun 7 11:58:27 2009 +0200 Fix menu tree drawing when comparing menu resources. --- php/lib_res.php | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/php/lib_res.php b/php/lib_res.php index 279323e..9505c23 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -603,16 +603,14 @@ class MenuResource extends Resource dump_resource_row($id, $this, $master_res, "dump_menuitem", "is_menuitem_different", array($pos, $show[$i] & 1, &$tstate), - array($master_pos, $show[$i] & 2, &$tstate)); + array($master_pos, $show[$i] & 2, &$tstate_master)); if ($show[$i] & 1) $pos++; if ($show[$i] & 2) $master_pos++; } - } - } class DialogResource extends Resource

1 0

Mikolaj Zalewski : Move some styles to CSS file.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: b8963059aee5dd26a9f38ee11d30c8e9e307f9a1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8963059aee5dd26a9f38ee1… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Jun 7 12:20:47 2009 +0200 Move some styles to CSS file. --- php/index.php | 4 ++-- php/lib_res.php | 2 +- php/resource.php | 12 ++++++------ php/style.css | 30 +++++++++++++++++++++++++++++- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/php/index.php b/php/index.php index 379e10b..2993994 100644 --- a/php/index.php +++ b/php/index.php @@ -35,7 +35,7 @@ it needs to be found manually by the translators. If you would like to read abou improve Wine translations check <?php echo $WINE_WIKI_TRANSLATIONS ?>. </p> -<table border="1"> +<table border="1" class="index"> <tr><th></th><th>Language</th><th>Translated</th><th>Missing</th><th>Errors</th><th> </th></tr> <?php function draw_bar($tr, $err, $sum) @@ -49,7 +49,7 @@ function draw_bar($tr, $err, $sum) $tr_len--; } $miss_len = 300 - $tr_len - $err_len; - echo '<td style="background-color: #D1DAF9">'; + echo '<td class="bar">'; if ($tr_len > 0) echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; if ($err_len > 0) diff --git a/php/lib_res.php b/php/lib_res.php index 9505c23..0f963ed 100644 --- a/php/lib_res.php +++ b/php/lib_res.php @@ -174,7 +174,7 @@ function dump_resource_row($id, &$resource, &$master, $method_name, $diff_method $extra = ""; if ($master && $diff_method_name) if ($resource->$diff_method_name($master, $lparam, $master_lparam)) - $extra = " style=\"background-color: #ffb8d0\""; + $extra = " class=\"diff\""; if ($master_lparam == NULL) $master_lparam = $lparam; diff --git a/php/resource.php b/php/resource.php index f1fe085..3a7eb72 100644 --- a/php/resource.php +++ b/php/resource.php @@ -58,25 +58,25 @@ if ($compare) ?> -<table style="background-color: #f0f0ff" cellpadding="0" cellspacing="0"> -<tr style="background-color: #e0e0ff"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> +<table class="resource" cellpadding="0" cellspacing="0"> +<tr class="header"><th colspan="5"><?php echo get_resource_name($type, $id) ?></th></tr> <?php if (!$compare) { - echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"3\" style=\"text-align: right\">"; + echo "<tr class=\"subheader\"><td colspan=\"3\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, TRUE); echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a></small>"; echo "</td></tr>"; } else { - echo "<tr style=\"background-color: #e8e8ff\"><td colspan=\"5\" style=\"text-align: right\">"; + echo "<tr class=\"subheader\"><td colspan=\"5\" style=\"text-align: right\">"; echo "<small>".gen_resource_a($lang, $resfile, $type, $id, FALSE); - echo "<< Hide compare with ".get_lang_name($MASTER_LANGUAGE)."</a></small>"; + echo "<< Hide compare with ".$MASTER_LANGUAGE_NAME."</a></small>"; echo "</td></tr>"; - echo "<tr style=\"background-color: #e8e8ff\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; + echo "<tr class=\"subheader\"><td>id</td><td> </td><td>".get_lang_name($lang)."</td><td> </td><td>".get_lang_name($MASTER_LANGUAGE)."</td></tr>"; } $res->dump($master_res); diff --git a/php/style.css b/php/style.css index ef053ce..808597a 100644 --- a/php/style.css +++ b/php/style.css @@ -20,4 +20,32 @@ p.note border-style: solid; border-color: black; padding: 2px; -} \ No newline at end of file +} + +/* summary table on index page, bars column*/ +table.index td.bar +{ + background-color: #d1daf9; +} + +/* table with a standard resource dump */ +table.resource +{ + background-color: #f0f0ff; +} + +table.resource tr.header +{ + background-color: #e0e0ff; +} + +table.resource tr.subheader +{ + background-color: #e8e8ff; +} + +/* rows are different (in resource comparision mode) */ +table.resource tr.diff +{ + background-color: #ffb8d0; +}

1 0

Mikolaj Zalewski : there may be no space between RC_SRCS and =
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: feb0dc10fb095d48d231542682217d1c1bf83d0f URL: http://source.winehq.org/git/tools.git/?a=commit;h=feb0dc10fb095d48d2315426… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 5 23:05:48 2008 +0200 there may be no space between RC_SRCS and = --- scripts/checkmakefile.pl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/checkmakefile.pl b/scripts/checkmakefile.pl index cc5064f..c13c31f 100755 --- a/scripts/checkmakefile.pl +++ b/scripts/checkmakefile.pl @@ -113,7 +113,7 @@ $ARGV[0] =~ m,^(.*/)[^/]*$,; $path = $1; while (<MAKEFILE>) { - if (m/^RC_SRCS +=/) + if (m/^RC_SRCS *=/) { while (m/\\$/) { @@ -121,7 +121,7 @@ while (<MAKEFILE>) chop; $_ .= <MAKEFILE>; } - m/^RC_SRCS += (.*)$/; + m/^RC_SRCS *=(.*)$/; @file = split(/ /, $1); foreach (@file) {

1 0

Mikolaj Zalewski : add support for customizing the title
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 2a408d8a29ff7fdae4f7a0fa9fba3cfecb31f859 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2a408d8a29ff7fdae4f7a0fa… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Thu Jun 19 19:13:09 2008 +0200 add support for customizing the title --- php/config.php | 2 ++ php/index.php | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/php/config.php b/php/config.php index 0dff152..bb6c73b 100644 --- a/php/config.php +++ b/php/config.php @@ -1,3 +1,5 @@ <?php $DATAROOT = "."; +$TITLE_APPENDIX = " - Wine 1.1.x"; +$TITLE_DESCR = "This page shows the translation status of the most recent Wine 1.1.x. To see the Wine 1.0.x line see <a href=\"http://pf128.krakow.sdi.tpnet.pl/wine-transl/\">here</a>"; ?> \ No newline at end of file diff --git a/php/index.php b/php/index.php index b8f0f7d..561a089 100644 --- a/php/index.php +++ b/php/index.php @@ -22,9 +22,11 @@ while ($line = fgets($summary, 1024)) <html> <head> <link rel="stylesheet" href="style.css" type="text/css"/> - <title>Wine translation statistics</title> + <title>Wine translation statistics <?php echo $TITLE_APPENDIX ?></title> </head> -<h1>Wine translation statistics</h1> +<h1>Wine translation statistics <?php echo $TITLE_APPENDIX ?></h1> + +<?php echo $TITLE_DESCR ?> <p>This page shows the state of the translations of <a href="http://www.winehq.org/">Wine</a>. Note that some resources marked as translated may be in fact in English - sometimes developers

1 0

Mikolaj Zalewski : don't show 0-width bar bitmaps (needed by IE7)
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 09ccd9192c31756b606c19136a0e445f3835c406 URL: http://source.winehq.org/git/tools.git/?a=commit;h=09ccd9192c31756b606c1913… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Wed Jul 9 17:14:27 2008 +0200 don't show 0-width bar bitmaps (needed by IE7) --- php/index.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/php/index.php b/php/index.php index 561a089..379e10b 100644 --- a/php/index.php +++ b/php/index.php @@ -50,8 +50,10 @@ function draw_bar($tr, $err, $sum) } $miss_len = 300 - $tr_len - $err_len; echo '<td style="background-color: #D1DAF9">'; - echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; - echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\">"; + if ($tr_len > 0) + echo "<img src=\"img/bar0.gif\" height=\"15\" width=\"$tr_len\">"; + if ($err_len > 0) + echo "<img src=\"img/bar1.gif\" height=\"15\" width=\"$err_len\">"; // echo "<img src=\"img/bar6.gif\" height=\"15\" width=\"$miss_len\">"; echo "</td></tr>"; }

1 0

Mikolaj Zalewski : add support for dumping/comparing dialogs
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: c6ff763755f4bb93609bdc1d62f7c522036a498c URL: http://source.winehq.org/git/tools.git/?a=commit;h=c6ff763755f4bb93609bdc1d… Author: Mikolaj Zalewski <mikolajz(a)tygrys.dom> Date: Sun Nov 30 16:43:52 2008 +0100 add support for dumping/comparing dialogs --- php/lib.php | 2 +- php/lib_res.php | 398 +++++++++++++++++++++++++++++++++++++++++++++++++++++- php/resource.php | 7 +- 3 files changed, 400 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=c6ff763755f4bb93609b…

1 0