wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Alexandre Julliard : transl: Make checkmakefile. pl accept config parameters from the command line too.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: db12963b683c239d6d45c9520d66d769730e4d5e URL: http://source.winehq.org/git/tools.git/?a=commit;h=db12963b683c239d6d45c952… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 12:59:25 2009 +0200 transl: Make checkmakefile.pl accept config parameters from the command line too. Also make it automatically process all the makefiles if no argument is specified. --- transl/scripts/Master.sh | 2 +- transl/scripts/checkmakefile.pl | 113 +++++++++++++++++++++++++------------- 2 files changed, 75 insertions(+), 40 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 1c59744..c85cd7b 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -48,7 +48,7 @@ mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs # Analyze all the Makefiles -find $SOURCEROOT/ -name Makefile.in -exec $SCRIPTSDIR/checkmakefile.pl \{\} \; +$SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" $SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" # Check for a new languages diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index e54c434..fd919c9 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -75,65 +75,100 @@ sub prepare_file } } -if ($ARGV[0] =~ m,programs/winetest/, || $ARGV[0] =~ m,/tests/,) -{ - if (not exists $ENV{"NOVERBOSE"}) - { - print "--- Ignoring: ".$ARGV[0]."\n"; - } - exit; -} - srand(); # Parse config file -open(CONFIG, "<config"); -while (<CONFIG>) +if (-f config) { - if (m/^([A-Z_]+)=([^\s]+)\s*$/) + open(CONFIG, "<config"); + while (<CONFIG>) { - $CONFIG{$1} = $2; + if (m/^([A-Z_]+)=([^\s]+)\s*$/) + { + $CONFIG{$1} = $2; + } + elsif (!(m/^#/ || m/^$/)) + { + print("checkmakefile.pl: Can't parse config line: $_\n"); + } } - elsif (!(m/^#/ || m/^$/)) + close(CONFIG); +} + +while (@ARGV && $ARGV[0] =~ /^-/) +{ + my $opt = shift @ARGV; + if ($opt eq "-S") { $srcdir = shift @ARGV; } + elsif ($opt eq "-T") { $objdir = shift @ARGV; } + elsif ($opt eq "-s") { $scriptsdir = shift @ARGV; } + elsif ($opt eq "-t") { $toolsdir = shift @ARGV; } + elsif ($opt eq "-w") { $workdir = shift @ARGV; } + else { - print("checkmakefile.pl: Can't parse config line: $_\n"); + print STDERR "Usage: $0 [options] [makefiles]\n\n"; + print STDERR " -S dir Set the top of the Wine source tree\n"; + print STDERR " -T dir Set the top of the Wine build tree\n"; + print STDERR " -t dir Set the Wine tools directory\n"; + print STDERR " -s dir Set the scripts directory\n"; + print STDERR " -w dir Set the work directory\n"; + exit 1; } } -close(CONFIG); -$srcdir = $CONFIG{"SOURCEROOT"}; -$objdir = $CONFIG{"BUILDROOT"} || $srcdir; -$wrc = ($CONFIG{"WRCROOT"} || $objdir) . "/tools/wrc/wrc"; -$workdir = $CONFIG{"WORKDIR"}; -$scriptsdir = $CONFIG{"SCRIPTSDIR"} || "."; +$srcdir ||= $CONFIG{"SOURCEROOT"}; +$objdir ||= $CONFIG{"BUILDROOT"} || $srcdir; +$toolsdir ||= $CONFIG{"WRCROOT"} || $objdir; +$workdir ||= $CONFIG{"WORKDIR"}; +$scriptsdir ||= $CONFIG{"SCRIPTSDIR"} || "."; +$wrc = $toolsdir . "/tools/wrc/wrc"; if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") { die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } -# parse the makefile -open(MAKEFILE, "<".$ARGV[0]); -$ARGV[0] =~ m,^(.*/)[^/]*$,; -$path = $1; -while (<MAKEFILE>) +@makefiles = @ARGV; +if (!@makefiles) { - if (m/^RC_SRCS *=/) + @makefiles = split(/\s/,`find $srcdir/ -name Makefile.in -print`); +} + +# parse the makefiles +foreach my $makefile (@makefiles) +{ + if ($makefile =~ m,programs/winetest/, || $makefile =~ m,/tests/,) { - while (m/\\$/) + if (not exists $ENV{"NOVERBOSE"}) { - chop; - chop; - $_ .= <MAKEFILE>; + print "--- Ignoring: ".$makefile."\n"; } - m/^RC_SRCS *=(.*)$/; - @file = split(/ /, $1); - foreach (@file) + next; + } + + open(MAKEFILE, "<$makefile"); + $makefile =~ m,^(.*/)[^/]*$,; + $path = $1; + while (<MAKEFILE>) + { + last if m/EXTRARCFLAGS\s*=.*res16/; # 16-bit resources not supported + if (m/^RC_SRCS *=/) { - next if ($_ eq ""); - s/\s//; - &prepare_file("$path", "$_") if ($CONFIG{"PREPARE_TREES"} == 1); - &mycheck("$path$_"); + while (m/\\$/) + { + chop; + chop; + $_ .= <MAKEFILE>; + } + m/^RC_SRCS *=(.*)$/; + @file = split(/ /, $1); + foreach (@file) + { + next if ($_ eq ""); + s/\s//; + &prepare_file("$path", "$_") if ($CONFIG{"PREPARE_TREES"} == 1); + &mycheck("$path$_"); + } + last; } - exit; } + close MAKEFILE; }

1 0

Alexandre Julliard : transl: Add config parameters for build tree and scripts directory.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: 04bc7e73ac4d03f9a1c201e7cc2d846e6b1858cf URL: http://source.winehq.org/git/tools.git/?a=commit;h=04bc7e73ac4d03f9a1c201e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jun 20 12:38:41 2009 +0200 transl: Add config parameters for build tree and scripts directory. --- transl/scripts/Master.sh | 12 ++++++------ transl/scripts/checkmakefile.pl | 26 +++++++++++++++----------- transl/scripts/config-example | 6 ++++++ transl/scripts/summary.pl | 7 ++++--- transl/scripts/ver.pl | 15 ++++++++------- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index ee7a27c..1c59744 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -27,12 +27,12 @@ if [ "$PREPARE_TREES" -eq 1 ]; then echo -n "Preparing tree(s)..." fi if [ ! -f "$WRCROOT/Makefile" ]; then - $WRCROOT/configure + (cd $WRCROOT && $SOURCEROOT/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" - make -C "$SOURCEROOT" include/stdole2.tlb >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in source tree failed" + make -C "$BUILDROOT" depend >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in build tree failed" + make -C "$BUILDROOT" include/stdole2.tlb >/dev/null 2>>"$WORKDIR/run.log" || die "make depend in build tree failed" if [ "x$NOVERBOSE" = "x" ]; then echo " done" fi @@ -48,8 +48,8 @@ mkdir $WORKDIR/dumps/res mkdir $WORKDIR/new-langs # Analyze all the Makefiles -find $SOURCEROOT/ -name Makefile.in -exec ./checkmakefile.pl \{\} \; -./summary.pl "$WORKDIR" +find $SOURCEROOT/ -name Makefile.in -exec $SCRIPTSDIR/checkmakefile.pl \{\} \; +$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" # Check for a new languages for i in $WORKDIR/new-langs/*; do @@ -68,7 +68,7 @@ mv -f $WORKDIR/langs $DESTDIR/langs mv -f $WORKDIR/dumps $DESTDIR/dumps cp -f $WORKDIR/run.log $DESTDIR/dumps/run.log -rsync -r --delete conf $DESTDIR +rsync -r --delete $SCRIPTSDIR/conf $DESTDIR # Deleting can take a bit longer so we do it after the new version is set up rm -Rf $DESTDIR/langs.old diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index c13c31f..e54c434 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -29,26 +29,28 @@ sub mycheck # files in dlls/ are compiled with __WINESRC__ my($defs) = ""; - $defs = "-D__WINESRC__" if ($name =~ m,^${winedir}/?dlls,); + $defs = "-D__WINESRC__" if ($name =~ m,^${srcdir}/?dlls,); log_string("*** $name [$defs]"); my($respath) = dirname($name); - $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); + my $srcincl = "-I$respath -I$srcdir/include -I$srcdir/dlls/user32"; + (my $objincl = $srcincl) =~ s!I$srcdir!I$objdir!g; + $ret = system("$wrc $srcincl $objincl --verify-translation $defs $name $workdir/tmp.res 2>>$workdir/run.log >$workdir/ver.txt"); if ($ret == 0) { - $name =~ s,$winedir,,; + $name =~ s,$srcdir/,,; if ($name eq "dlls/kernel32/kernel.rc") { - system("./ver.pl \"$name\" \"$workdir\" nonlocale <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$name\" \"$workdir\" nonlocale $scriptsdir <$workdir/ver.txt"); log_string("*** $name [$defs] (locale run)"); - system("./ver.pl \"$name\" \"$workdir\" locale <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$name\" \"$workdir\" locale $scriptsdir <$workdir/ver.txt"); } else { - system("./ver.pl \"$name\" \"$workdir\" normal <$workdir/ver.txt"); + system("$scriptsdir/ver.pl \"$name\" \"$workdir\" normal $scriptsdir <$workdir/ver.txt"); } $norm_fn= $name; $norm_fn =~ s/\.rc$//; $norm_fn =~ s/[^a-zA-Z0-9]/-/g; - $ret = system("$wrc -I$respath -I$winedir/include -I$winedir/dlls/user32 $defs $winedir$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); + $ret = system("$wrc $srcincl $objincl $defs $srcdir/$name $workdir/dumps/res/$norm_fn.res 2>>$workdir/run.log >/dev/null"); if ($ret != 0) { print "!!!!!!! 2nd pass return value: ".$ret."\n"; @@ -98,11 +100,13 @@ while (<CONFIG>) } close(CONFIG); -$winedir = $CONFIG{"SOURCEROOT"}."/"; -$wrc = $CONFIG{"WRCROOT"}."/tools/wrc/wrc"; -$workdir = $CONFIG{"WORKDIR"}."/"; +$srcdir = $CONFIG{"SOURCEROOT"}; +$objdir = $CONFIG{"BUILDROOT"} || $srcdir; +$wrc = ($CONFIG{"WRCROOT"} || $objdir) . "/tools/wrc/wrc"; +$workdir = $CONFIG{"WORKDIR"}; +$scriptsdir = $CONFIG{"SCRIPTSDIR"} || "."; -if ($winedir eq "/" || $wrc eq "/tools/wrc/wrc" || $workdir eq "/") +if ($srcdir eq "" || $wrc eq "/tools/wrc/wrc" || $workdir eq "") { die("Config entry for SOURCEROOT, WRCROOT or WORKDIR missing\n"); } diff --git a/transl/scripts/config-example b/transl/scripts/config-example index b8068dd..47cc4c5 100644 --- a/transl/scripts/config-example +++ b/transl/scripts/config-example @@ -3,9 +3,15 @@ # Path to the Wine source tree to analyze SOURCEROOT=/path/to/wine-src +# Path to the Wine build tree (if different from SOURCEROOT) +BUILDROOT=/path/to/wine-src + # Path to the Wine tree to take wrc from. Usually the same as SOURCEROOT. WRCROOT=/path/to/wine-src +# Directory containing the various scripts +SCRIPTSDIR=. + # The directory where to store the generated langs/ and dumps/. Usually the # directory with the PHP scripts. DESTDIR=../php diff --git a/transl/scripts/summary.pl b/transl/scripts/summary.pl index 377fea3..f1290b5 100755 --- a/transl/scripts/summary.pl +++ b/transl/scripts/summary.pl @@ -3,9 +3,10 @@ # Helper script - create a summary for each language about how # many resources are translated -die "This helper script take one argument" unless ($#ARGV == 0); +die "This helper script takes two arguments" unless ($#ARGV == 1); $workdir = $ARGV[0]; +$scriptsdir = $ARGV[1]; sub collapse { my($name) = shift @_; @@ -13,7 +14,7 @@ sub collapse { $base_name =~ s/:[0-9a-f]{2}/:00/; if (not exists $tab_should_collapse{$name}) { - open(NAMEFILE, "<conf/$base_name"); + open(NAMEFILE, "<$scriptsdir/conf/$base_name"); $content = <NAMEFILE>; close(NAMEFILE); if ($content =~ /\[ignore-sublang\]/) { @@ -27,7 +28,7 @@ sub collapse { return $name; } -opendir(DIR, "conf"); +opendir(DIR, "$scriptsdir/conf"); @files = grep(!/^\./, readdir(DIR)); closedir(DIR); diff --git a/transl/scripts/ver.pl b/transl/scripts/ver.pl index bafd8bb..9b7f289 100755 --- a/transl/scripts/ver.pl +++ b/transl/scripts/ver.pl @@ -3,11 +3,12 @@ # Helper script - parse the results of wrc --verify-translation # and store then in $2/langs/* and $2/dumps/* -die "This helper script takes three arguments" unless ($#ARGV == 2); +die "This helper script takes at least three arguments" unless ($#ARGV >= 2); $filename = $ARGV[0]; $workdir = $ARGV[1]; $mode = $ARGV[2]; +$scriptsdir = $ARGV[3] || "."; $type=-1; $types[1] = "CURSOR"; @@ -64,7 +65,7 @@ sub collapse { $base_name =~ s/:[0-9a-f]{2}/:00/; if (not exists $tab_should_collapse{$name}) { - open(NAMEFILE, "<conf/$base_name"); + open(NAMEFILE, "<$scriptsdir/conf/$base_name"); $content = <NAMEFILE>; close(NAMEFILE); if ($content =~ /\[ignore-sublang\]/) { @@ -204,9 +205,9 @@ foreach $lang (@file_langs) { $basic_lang = $lang; $basic_lang =~ s/:[0-9a-f]{2}/:00/; - if (-e "conf/$lang") { + if (-e "$scriptsdir/conf/$lang") { open(LANGOUT, ">>$workdir/langs/$lang"); - } elsif (-e "conf/$basic_lang") { + } elsif (-e "$scriptsdir/conf/$basic_lang") { open(LANGOUT, ">>$workdir/langs/$basic_lang"); } else { # print("Ignoring locale $lang\n"); @@ -214,7 +215,7 @@ foreach $lang (@file_langs) print LANGOUT "LOCALE $lang $filename ".($transl_count{$lang}+0)." ".($missing_count{$lang}+0)." ".($err_count{$lang}+0)."\n"; $suffix = "#locale$lang"; } else { - if (-e "conf/$lang") { + if (-e "$scriptsdir/conf/$lang") { open(LANGOUT, ">>$workdir/langs/$lang"); } else { open(LANGOUT, ">>$workdir/new-langs/$lang"); @@ -255,7 +256,7 @@ foreach $lang (@file_langs) if (!($mode eq "locale")) { - opendir(DIR, "conf"); + opendir(DIR, "$scriptsdir/conf"); @files = grep(!/^\./, readdir(DIR)); closedir(DIR); foreach $lang (@files) { @@ -269,4 +270,4 @@ if (!($mode eq "locale")) close(LANGOUT); } } -} \ No newline at end of file +}

1 0

Alexandre Julliard : wine_release: Don' t change directories when building makedep.
by Alexandre Julliard 20 Jun '09

20 Jun '09

Module: tools Branch: master Commit: b8591704cf2f7f0ffa6f25273356beadaf1029f6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b8591704cf2f7f0ffa6f2527… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 19:31:26 2009 +0200 wine_release: Don't change directories when building makedep. Run mysql last in case since it should only be done once. --- wine_release | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wine_release b/wine_release index b5fd54c..11680a0 100755 --- a/wine_release +++ b/wine_release @@ -38,9 +38,6 @@ git clone -l -s -n git/wine.git wine-$version rm -f wine ln -s wine-$version wine -# add version to bugzilla table -echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql - # make cross reference database for LXR # note that we must have write permission in this directory echo "==== UPDATING LXR ====" @@ -65,7 +62,7 @@ then # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype - cd tools && make makedep + (cd tools && make makedep) manpages="\ loader/wine.man \ @@ -98,4 +95,7 @@ fi rm -rf .git +# add version to bugzilla table +echo "INSERT INTO bugs.versions (value, product_id) VALUES(\"$version\",1)" | mysql + # end

1 0

Maik Schulz : Website: German translation of release 1.1.24 news item
by Maik Schulz 20 Jun '09

20 Jun '09

Module: website Branch: master Commit: 68ee5992f6e4aaa26650edf13ec555ca7fb3a72e URL: http://source.winehq.org/git/website.git/?a=commit;h=68ee5992f6e4aaa26650ed… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Sat Jun 20 13:28:48 2009 +0200 Website: German translation of release 1.1.24 news item --- news/de/2009061901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009061901.xml b/news/de/2009061901.xml new file mode 100644 index 0000000..c68f398 --- /dev/null +++ b/news/de/2009061901.xml @@ -0,0 +1,17 @@ +<news> +<date>19. Juni 2009</date> +<title>Wine 1.1.24 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.24 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.24">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung von freedesktop Dateitypzuordnungen.</li> + <li>Unterstützung für 64-bit Exception Handling.</li> + <li>Verbesserte ARB Shader.</li> + <li>Fehlerbehebungen am FBO-Modus.</li> + <li>Viele Verbesserungen an listview.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.24.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.24
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: website Branch: master Commit: 804d1cc9b760f05511888fd44e183bf8c1e65b2d URL: http://source.winehq.org/git/website.git/?a=commit;h=804d1cc9b760f05511888f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:55:45 2009 +0200 Wine release 1.1.24 --- news/en/2009061901.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009061901.xml b/news/en/2009061901.xml new file mode 100644 index 0000000..8881cff --- /dev/null +++ b/news/en/2009061901.xml @@ -0,0 +1,17 @@ +<news> +<date>June 19, 2009</date> +<title>Wine 1.1.24 Released</title> +<body> + The Wine development release 1.1.24 is now available. + <a href="{$root}/announce/1.1.24">What's new</a> in this release: +<ul> + <li>Support for freedesktop file associations.</li> + <li>Support for exception handling on 64-bit.</li> + <li>Improved ARB shaders.</li> + <li>Fixes for the FBO mode.</li> + <li>Many listview improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.24.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.24 : Alexandre Julliard : Release 1.1.24
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: refs/tags/wine-1.1.24 Tag: 50bd0e4bf9d677613e022750edcba7268ed4480b URL: http://source.winehq.org/git/wine.git/?a=tag;h=50bd0e4bf9d677613e022750edcb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:49:16 2009 +0200 Release 1.1.24

1 0

Alexandre Julliard : Release 1.1.24.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: wine Branch: master Commit: 675e6e93b1d2b4555d05e311764510abf763d21d URL: http://source.winehq.org/git/wine.git/?a=commit;h=675e6e93b1d2b4555d05e3117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 19 17:49:15 2009 +0200 Release 1.1.24. --- ANNOUNCE | 1131 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 526 insertions(+), 625 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=675e6e93b1d2b4555d05e…

1 0

Alexandre Julliard :=?UTF-8?Q?=20Import=20the=20translati?= on checking tool written by Mikołaj Zalewski.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: cdef0966d91b0e3a579570a6d9a8edc33c7aa7d4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=cdef0966d91b0e3a579570a6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 18 14:54:48 2009 +0200 Import the translation checking tool written by Mikołaj Zalewski. ---

1 0

Alexandre Julliard : wine_release: Build makedep first to avoid warnings.
by Alexandre Julliard 19 Jun '09

19 Jun '09

Module: tools Branch: master Commit: 291bf49abea59c800bf30f1eb88c46e217a165ce URL: http://source.winehq.org/git/tools.git/?a=commit;h=291bf49abea59c800bf30f1e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 15 13:53:13 2009 +0200 wine_release: Build makedep first to avoid warnings. --- wine_release | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/wine_release b/wine_release index 0375494..b5fd54c 100755 --- a/wine_release +++ b/wine_release @@ -65,6 +65,7 @@ then # update man page and documentation echo "==== UPDATING DOCUMENTATION ====" ./configure --quiet --without-x --without-freetype + cd tools && make makedep manpages="\ loader/wine.man \

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 ?>. -<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 "".gen_resource_a($lang, $resfile, $type, $id, TRUE); echo "Compare with ".$MASTER_LANGUAGE_NAME." >></a>"; 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 "".gen_resource_a($lang, $resfile, $type, $id, FALSE); - echo "<< Hide compare with ".get_lang_name($MASTER_LANGUAGE)."</a>"; + echo "<< Hide compare with ".$MASTER_LANGUAGE_NAME."</a>"; 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009