Module: tools
Branch: master
Commit: d6dc27434f5d1b480be3238ca525d6ed766571e9
URL: http://source.winehq.org/git/tools.git/?a=commit;h=d6dc27434f5d1b480be3238c…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue May 27 18:15:55 2008 +0200
winetest: Enforce that the build id is a valid commit SHA1.
Get rid of the winetest.builds file.
---
winetest/README | 8 +-------
winetest/dissect | 22 ++++++++--------------
winetest/service.cgi | 1 -
winetest/winetest.conf | 1 -
4 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/winetest/README b/winetest/README
index 2a0215d..49ca6d0 100644
--- a/winetest/README
+++ b/winetest/README
@@ -14,7 +14,6 @@ the destination for that and presents the results in an ordered form.
Configuration file, sets the following variables:
$queuedir - queue incoming submissions here
$datadir - processed data is served from here
-$builds - list of allowed build tags
* winetest.cgi
@@ -35,8 +34,7 @@ at processing this report. If everything goes flawlessly the whole
directory is renamed (based on the information learned in the process)
to $datadir/BUILD/VERSION_TAG_DIGIT where DIGIT is for resolving name
clashes and $datadir/BUILD/outdated is created to signal the change in
-the given build. Allowed builds are those in $builds. See also the
-head of the file.
+the given build. See also the head of the file.
* gather
@@ -50,9 +48,5 @@ removes the outdated file. See also the head of the file.
These files are referenced by the index.html files created by gather.
-* winetest.builds
-
-The file to have $builds point to.
-
Ferenc Wagner <wferi(a)afavant.elte.hu>, Wed, 18 Jan 2004 18:18:05 +0100
diff --git a/winetest/dissect b/winetest/dissect
index 6293c1c..bbfe982 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -2,8 +2,7 @@
#
# Searches for $queuedir/rep*/report.txt-s, preprocesses and moves
# them into the appropriate $datadir/build/version directories, and
-# creates $datadir/build/outdated. Allowed builds are read from
-# $builds. Each generated file has .txt extension.
+# creates $datadir/build/outdated. Each generated file has .txt extension.
#
# Files: winetest.conf
#
@@ -29,7 +28,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
use strict;
-use vars qw/$builds $queuedir $datadir $maxmult $maxfilesize/;
+use vars qw/$gitdir $queuedir $datadir $maxmult $maxfilesize/;
require "winetest.conf";
my $name0=$0;
@@ -44,6 +43,8 @@ my $summary_version=4;
use File::Temp qw/tempdir/;
use Errno qw/ENOTEMPTY/;
+$ENV{GIT_DIR} = $gitdir;
+
my ($report, $tmpdir);
sub mydie(@) {
@@ -76,17 +77,10 @@ print SUM "Version $summary_version\n";
$_ = <IN>;
/^Tests from build ([-.0-9a-zA-Z]+)\r?$/ or mydie "no build header: $_";
my $testbuild = $1;
-if (!open BUILDS, "<$builds") {
- print STDERR "$name0:error: unable to open '$builds' for reading: $!\n";
- exit 3;
-}
-while (<BUILDS>) {
- next if /^#/;
- chomp;
- last if $testbuild =~ "^$_\$";
-}
-close BUILDS;
-defined $_ or mydie "$1 not in $builds\n";
+$testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild";
+my $commit = `git rev-parse --verify $testbuild^0 2>/dev/null`;
+chomp $commit;
+$testbuild eq $commit or mydie "not an existing commit $testbuild";
$_ = <IN>;
/^Archive: (.*?)\r?$/ or mydie "no archive line: $_";
diff --git a/winetest/service.cgi b/winetest/service.cgi
index 14c79b7..9f34633 100755
--- a/winetest/service.cgi
+++ b/winetest/service.cgi
@@ -210,7 +210,6 @@ sub releases_make {
# all is good, store the cookie, and URL now, this activetes the release
&write_file(">$base_path/$name.cookie", &md5sum($cookie));
&write_file(">$base_path/$name.url", $url);
- &write_file(">>$data_root/$program.builds", $build);
return "OK";
}
diff --git a/winetest/winetest.conf b/winetest/winetest.conf
index e1b0297..b240ac0 100644
--- a/winetest/winetest.conf
+++ b/winetest/winetest.conf
@@ -1,7 +1,6 @@
# Hey Emacs! This is a -*-cperl-*- file!
$root = "/home/winehq/opt/winetest";
-$builds = "$root/winetest.builds";
# These two below should be on the same filesystem
$queuedir = "$root/queue";
$datadir = "$root/data";
Module: website
Branch: master
Commit: ed6ed67a9e1e4f3d5fab2a58ee97a031262c5989
URL: http://source.winehq.org/git/website.git/?a=commit;h=ed6ed67a9e1e4f3d5fab2a…
Author: Jeremy Newman <jnewman(a)codeweavers.com>
Date: Tue May 27 10:52:48 2008 -0500
oops, moved the wrong file
---
news/2008052301.xml | 21 +++++++++++++++++++++
news/2008052302.xml | 46 ----------------------------------------------
news/2008052701.xml | 49 +++++++++++++++++++++++++++++++++++++------------
3 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/news/2008052301.xml b/news/2008052301.xml
new file mode 100644
index 0000000..28fdd33
--- /dev/null
+++ b/news/2008052301.xml
@@ -0,0 +1,21 @@
+<news>
+<date>May 23, 2008</date>
+<title>Wine 1.0-rc2 Released</title>
+<body>
+<p>Wine 1.0-rc2 was released today, with the following main changes:</p>
+
+<ul>
+<li>Bug fixes only, we are in code freeze.</li>
+</ul>
+
+<p>
+Binary packages are in the process of being built and it may take a
+few days for them to appear, but the source is
+<a href="http://prdownloads.sourceforge.net/wine/wine-1.0-rc2.tar.bz2">available now</a>.
+You can find out more about this release in the
+<a href="?announce=1.0-rc2">announcement</a>. Check out our
+<a href="/site/download">download page</a> for packages for your
+distribution.
+</p>
+</body>
+</news>
diff --git a/news/2008052302.xml b/news/2008052302.xml
deleted file mode 100644
index 6e2c1f8..0000000
--- a/news/2008052302.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<news>
-<date>May 27, 2008</date>
-<title>Wine 1.0 Status</title>
-<body>
-<p>
-According to <a href="http://wiki.winehq.org/WineReleasePlan">http://wiki.winehq.org/WineReleasePlan</a>,
-wine-1.0.0-rc3 will be due out Friday, May 30th, 2008.
-</p>
-<p>
-Please help us find regressions, conformance test failures, and embarrassing problems in rc2!
-See the following three links for three different ways you can help:
-<ul>
-<li><a href="http://wiki.winehq.org/PlatinumRegressionHunt">PlatinumRegressionHunt</a>
-<li><a href="http://wiki.winehq.org/DogfoodChallenge">DogfoodChallenge</a>
-<li><a href="http://wiki.winehq.org/MakeTestFailures">MakeTestFailures</a>
-</ul>
-<a href="http://winehq.org/pipermail/wine-users/2008-May/034706.html">Dabski submitted</a>
-the best Regression from Platinum report during rc1, so I'm going to
-send him a Wine t-shirt (if it fits, he can have the very last Drunken Penguin t-shirt).
-Congratulations Dabski!
-</p>
-
-<h4>Bug Status</h4>
-<p>
-There are 26 open 1.0 bugs as of 23 May.
-(You can see the full list of current 1.0 bugs by navigating to Bugzilla in the WineHQ menu and clicking on "Wine 1.0".)
-Most of them will simply be rolled over to be fixed for a later release; we only have
-time to fix a few, and much as we'd like to fix the rest, most are not showstoppers.
-</p>
-<p>
-1.0 bugs fixed since last week:
-<ul>
-<li><a href="http://bugs.winehq.org/show_bug.cgi?id=2493">2493</a> Multi-select listview: Shift-arrow up only selects top two items
-<li><a href="http://bugs.winehq.org/show_bug.cgi?id=5024">5024</a> Thief: Deadly Shadows crashes:page fault on read access to 0x0000040c
-<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13168">13168</a> Update the README before the 1.0 release
-</ul>
-</p>
-<p>
-1.0 bugs new since last week:
-<ul>
-<li><a href="http://bugs.winehq.org/show_bug.cgi?id=12307">12307</a> firefox 3 crash on some web pages [dogfood]
-<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13277">13277</a> Return to Mysterious Island crashes
-</ul>
-</p>
-</body>
-</news>
diff --git a/news/2008052701.xml b/news/2008052701.xml
index 28fdd33..6e2c1f8 100644
--- a/news/2008052701.xml
+++ b/news/2008052701.xml
@@ -1,21 +1,46 @@
<news>
-<date>May 23, 2008</date>
-<title>Wine 1.0-rc2 Released</title>
+<date>May 27, 2008</date>
+<title>Wine 1.0 Status</title>
<body>
-<p>Wine 1.0-rc2 was released today, with the following main changes:</p>
-
+<p>
+According to <a href="http://wiki.winehq.org/WineReleasePlan">http://wiki.winehq.org/WineReleasePlan</a>,
+wine-1.0.0-rc3 will be due out Friday, May 30th, 2008.
+</p>
+<p>
+Please help us find regressions, conformance test failures, and embarrassing problems in rc2!
+See the following three links for three different ways you can help:
<ul>
-<li>Bug fixes only, we are in code freeze.</li>
+<li><a href="http://wiki.winehq.org/PlatinumRegressionHunt">PlatinumRegressionHunt</a>
+<li><a href="http://wiki.winehq.org/DogfoodChallenge">DogfoodChallenge</a>
+<li><a href="http://wiki.winehq.org/MakeTestFailures">MakeTestFailures</a>
</ul>
+<a href="http://winehq.org/pipermail/wine-users/2008-May/034706.html">Dabski submitted</a>
+the best Regression from Platinum report during rc1, so I'm going to
+send him a Wine t-shirt (if it fits, he can have the very last Drunken Penguin t-shirt).
+Congratulations Dabski!
+</p>
+<h4>Bug Status</h4>
+<p>
+There are 26 open 1.0 bugs as of 23 May.
+(You can see the full list of current 1.0 bugs by navigating to Bugzilla in the WineHQ menu and clicking on "Wine 1.0".)
+Most of them will simply be rolled over to be fixed for a later release; we only have
+time to fix a few, and much as we'd like to fix the rest, most are not showstoppers.
+</p>
<p>
-Binary packages are in the process of being built and it may take a
-few days for them to appear, but the source is
-<a href="http://prdownloads.sourceforge.net/wine/wine-1.0-rc2.tar.bz2">available now</a>.
-You can find out more about this release in the
-<a href="?announce=1.0-rc2">announcement</a>. Check out our
-<a href="/site/download">download page</a> for packages for your
-distribution.
+1.0 bugs fixed since last week:
+<ul>
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=2493">2493</a> Multi-select listview: Shift-arrow up only selects top two items
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=5024">5024</a> Thief: Deadly Shadows crashes:page fault on read access to 0x0000040c
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13168">13168</a> Update the README before the 1.0 release
+</ul>
+</p>
+<p>
+1.0 bugs new since last week:
+<ul>
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=12307">12307</a> firefox 3 crash on some web pages [dogfood]
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13277">13277</a> Return to Mysterious Island crashes
+</ul>
</p>
</body>
</news>
Module: website
Branch: master
Commit: 28c33a63b643c81ecdc2294929e4c61af414618d
URL: http://source.winehq.org/git/website.git/?a=commit;h=28c33a63b643c81ecdc229…
Author: Jeremy Newman <jnewman(a)codeweavers.com>
Date: Tue May 27 10:50:25 2008 -0500
some html cleanup
move article to todays date
---
news/2008052302.xml | 4 ++--
news/{2008052301.xml => 2008052701.xml} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/news/2008052302.xml b/news/2008052302.xml
index dce572b..6e2c1f8 100644
--- a/news/2008052302.xml
+++ b/news/2008052302.xml
@@ -1,5 +1,5 @@
<news>
-<date>May 23, 2008</date>
+<date>May 27, 2008</date>
<title>Wine 1.0 Status</title>
<body>
<p>
@@ -20,7 +20,7 @@ send him a Wine t-shirt (if it fits, he can have the very last Drunken Penguin t
Congratulations Dabski!
</p>
-<h2>Bug Status</h2>
+<h4>Bug Status</h4>
<p>
There are 26 open 1.0 bugs as of 23 May.
(You can see the full list of current 1.0 bugs by navigating to Bugzilla in the WineHQ menu and clicking on "Wine 1.0".)
diff --git a/news/2008052301.xml b/news/2008052701.xml
similarity index 100%
rename from news/2008052301.xml
rename to news/2008052701.xml
Module: website
Branch: master
Commit: c5bfa758fbe98176a963d3d5acf67ad9be006e1d
URL: http://source.winehq.org/git/website.git/?a=commit;h=c5bfa758fbe98176a963d3…
Author: Dan Kegel <dank(a)kegel.com>
Date: Fri May 23 15:08:46 2008 -0700
wine 1.0 status update
---
news/2008052302.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/news/2008052302.xml b/news/2008052302.xml
new file mode 100644
index 0000000..dce572b
--- /dev/null
+++ b/news/2008052302.xml
@@ -0,0 +1,46 @@
+<news>
+<date>May 23, 2008</date>
+<title>Wine 1.0 Status</title>
+<body>
+<p>
+According to <a href="http://wiki.winehq.org/WineReleasePlan">http://wiki.winehq.org/WineReleasePlan</a>,
+wine-1.0.0-rc3 will be due out Friday, May 30th, 2008.
+</p>
+<p>
+Please help us find regressions, conformance test failures, and embarrassing problems in rc2!
+See the following three links for three different ways you can help:
+<ul>
+<li><a href="http://wiki.winehq.org/PlatinumRegressionHunt">PlatinumRegressionHunt</a>
+<li><a href="http://wiki.winehq.org/DogfoodChallenge">DogfoodChallenge</a>
+<li><a href="http://wiki.winehq.org/MakeTestFailures">MakeTestFailures</a>
+</ul>
+<a href="http://winehq.org/pipermail/wine-users/2008-May/034706.html">Dabski submitted</a>
+the best Regression from Platinum report during rc1, so I'm going to
+send him a Wine t-shirt (if it fits, he can have the very last Drunken Penguin t-shirt).
+Congratulations Dabski!
+</p>
+
+<h2>Bug Status</h2>
+<p>
+There are 26 open 1.0 bugs as of 23 May.
+(You can see the full list of current 1.0 bugs by navigating to Bugzilla in the WineHQ menu and clicking on "Wine 1.0".)
+Most of them will simply be rolled over to be fixed for a later release; we only have
+time to fix a few, and much as we'd like to fix the rest, most are not showstoppers.
+</p>
+<p>
+1.0 bugs fixed since last week:
+<ul>
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=2493">2493</a> Multi-select listview: Shift-arrow up only selects top two items
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=5024">5024</a> Thief: Deadly Shadows crashes:page fault on read access to 0x0000040c
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13168">13168</a> Update the README before the 1.0 release
+</ul>
+</p>
+<p>
+1.0 bugs new since last week:
+<ul>
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=12307">12307</a> firefox 3 crash on some web pages [dogfood]
+<li><a href="http://bugs.winehq.org/show_bug.cgi?id=13277">13277</a> Return to Mysterious Island crashes
+</ul>
+</p>
+</body>
+</news>