Module: tools
Branch: master
Commit: 5dd43ebdd3f3073f9ec9ef09c699b1c10bcf90ad
URL: http://source.winehq.org/git/tools.git/?a=commit;h=5dd43ebdd3f3073f9ec9ef09…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue Jun 17 19:56:29 2008 +0200
git-to-cvs: Improve support for multiple branches and merges.
Use the array form for shell commands throughout.
---
git-to-cvs | 59 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 25 deletions(-)
diff --git a/git-to-cvs b/git-to-cvs
index 246fee3..8bc6127 100755
--- a/git-to-cvs
+++ b/git-to-cvs
@@ -10,11 +10,9 @@
# the License, or (at your option) any later version.
#
#
-# Usage: git-to-cvs [last-commit-tag [branch]]
+# Usage: git-to-cvs [branch]
#
# Optional parameters:
-# last-commit-tag: tag to use to keep track of cvs
-# commits, default is LAST_CVS_COMMIT
# branch: where to get the git commits from, default is 'master'
#
# This script needs to be run from the root of the checked-out CVS tree,
@@ -40,8 +38,8 @@ my %ignore_patterns =
"TAGS" => 1
);
-my $last_commit = $ARGV[0] || "LAST_CVS_COMMIT";
-my $branch = $ARGV[1] || "master";
+my $branch = $ARGV[0] || "master";
+my $last_commit = "last-cvs-commit/$branch";
# run a shell command and die on error
sub shell(@)
@@ -50,6 +48,17 @@ sub shell(@)
system(@args) == 0 or die "system @args failed: $?";
}
+# run a shell command and return the first line of output
+sub shell_output(@)
+{
+ my @args = @_;
+ open OUT, "-|" or exec @args or die join(' ', "exec", @args);
+ my $ret = <OUT>;
+ chomp $ret;
+ close OUT or die join(' ', "broken pipe", @args);
+ return $ret;
+}
+
# add a dir and all its parents
sub create_dir($)
{
@@ -225,7 +234,7 @@ sub cvs_commit($@)
# convert log message according to Wine CVS conventions
- open COMMIT, "git-cat-file commit $commit |" or die "cannot run git-cat-file";
+ open COMMIT, "-|" or exec "git", "cat-file", "commit", $commit or die "cannot run git cat-file";
while (<COMMIT>)
{
chomp;
@@ -248,13 +257,13 @@ sub cvs_commit($@)
print LOGFILE utf8(join("\n",@log), "\n")->latin1;
close LOGFILE;
- print "commit $commit\n";
+ print "branch $branch commit $commit\n";
print "$author\n";
print join("\n",@log), "\n";
print "\n";
shell "cvs", "-Q", "commit", "-F", ".logfile", @files;
unlink ".logfile";
- shell "git-update-ref", $last_commit, $commit;
+ shell "git", "update-ref", $last_commit, $commit;
if (defined $tags{$commit}) { cvs_tag($tags{$commit}); }
}
@@ -270,9 +279,8 @@ sub apply_git_commit($)
my @gitignores = ();
my @gitignores_deleted = ();
- $commit = `git-rev-parse $commit^\{commit\}`;
- chomp $commit;
- open COMMIT, "git-diff-tree --name-status -r $commit |" or die "cannot run git-diff-tree";
+ $commit = shell_output "git", "rev-parse", "$commit^\{commit\}";
+ open COMMIT, "-|" or exec "git", "diff-tree", "--name-status", "-r", $last_commit, $commit or die "cannot run git diff-tree";
while (<COMMIT>)
{
chomp;
@@ -292,8 +300,8 @@ sub apply_git_commit($)
close COMMIT;
# get the modified files
- shell "git-read-tree", "--reset", $commit;
- shell "git-checkout-index", "-f", "-u", "--", @added, @modified, @gitignores if (@added || @modified || @gitignores);
+ shell "git", "read-tree", "--reset", $commit;
+ shell "git", "checkout-index", "-f", "-u", "--", @added, @modified, @gitignores if (@added || @modified || @gitignores);
unlink @gitignores_deleted if (@gitignores_deleted);
foreach my $file (@added)
@@ -336,16 +344,19 @@ sub apply_commits()
{
my @commits = ();
- my $base = `git-merge-base $last_commit $branch`;
- my $commit = `git-rev-parse $last_commit^\{commit\}`;
+ my $base = shell_output "git", "merge-base", $last_commit, $branch;
+ my $commit = shell_output "git", "rev-parse", "$last_commit^\{commit\}";
die "$last_commit is not a parent of $branch" unless ($base eq $commit);
- # read the tree of the first commit and make sure we are up to date
- shell "git-read-tree", "--reset", $last_commit;
- shell "git-update-index", "--refresh";
- shell "git-checkout-index", "-q", "-f", "-u", "-a";
+ if (! -f $ENV{"GIT_INDEX_FILE"})
+ {
+ # read the tree of the first commit and make sure we are up to date
+ shell "git-read-tree", "--reset", $last_commit;
+ shell "git-update-index", "--refresh";
+ shell "git-checkout-index", "-q", "-f", "-u", "-a";
+ }
- open LIST, "git-rev-list $last_commit..$branch |" or die "cannot run git-rev-list";
+ open LIST, "-|" or exec "git", "rev-list", "$last_commit..$branch" or die "cannot run git rev-list";
while (<LIST>)
{
chomp;
@@ -369,13 +380,12 @@ sub apply_commits()
# build a list of all commits that are pointed to by a tag
sub read_tags()
{
- open LIST, "-|" or exec "git-for-each-ref", "refs/tags/wine*" or die "cannot run git-for-each-ref";
+ open LIST, "-|" or exec "git", "for-each-ref", "refs/tags/wine*" or die "cannot run git for-each-ref";
while (<LIST>)
{
next unless /^[0-9a-f]{40} tag\trefs\/tags\/(.*)$/;
my $tag = $1;
- my $commit = `git-rev-parse $tag^{commit}`;
- chomp $commit;
+ my $commit = shell_output "git", "rev-parse", "$tag^{commit}";
$tags{$commit} = $tag;
}
close LIST;
@@ -383,6 +393,7 @@ sub read_tags()
# if we have a .git symlink in CVS/ use that as GIT_DIR
$ENV{"GIT_DIR"} = "CVS/.git" if -d "CVS/.git";
+$ENV{"GIT_WORK_TREE"} = ".";
# use a tmp index file to avoid touching the main one
$ENV{"GIT_INDEX_FILE"} = "CVS/.git-index";
@@ -394,5 +405,3 @@ $ENV{"GIT_INDEX_FILE"} = "CVS/.git-index";
read_tags();
apply_commits();
-
-unlink "CVS/.git-index";
Module: tools
Branch: master
Commit: 018444225acf27a5d0c42e38ab4cc519732fad44
URL: http://source.winehq.org/git/tools.git/?a=commit;h=018444225acf27a5d0c42e38…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue Jun 17 12:10:25 2008 +0200
update-winehq: Pass the release name as argument instead of trying to guess it from the ANNOUNCE file.
---
update-winehq | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/update-winehq b/update-winehq
index b5eef47..6a359a6 100755
--- a/update-winehq
+++ b/update-winehq
@@ -4,7 +4,7 @@
#
# Copyright 2006 Alexandre Julliard
#
-# Usage: update-winehq [announce-file]
+# Usage: update-winehq release [announce-file]
#
# Must be run from the top-level dir of a git checkout of the website module
#
@@ -24,7 +24,7 @@ sub xml_escape($)
return $str;
}
-my $rel;
+my $rel = $ARGV[0];
my @text;
die "Not in website dir?" unless -d "news/en";
@@ -32,7 +32,7 @@ system("git", "pull") == 0 or die "git pull failed";
# Parse the ANNOUNCE file
-open ANNOUNCE, $ARGV[0] || "ANNOUNCE" or die "cannot open ANNOUNCE";
+open ANNOUNCE, $ARGV[1] || "ANNOUNCE" or die "cannot open ANNOUNCE";
my $whats_new = 0;
my $first = 1;
@@ -43,10 +43,6 @@ while (<ANNOUNCE>)
chomp;
if (!$whats_new)
{
- if (!$rel && /release (\S*) /)
- {
- $rel = $1;
- }
if (/^What's new in this release/)
{
$whats_new = 1;
Module: appdb
Branch: master
Commit: 250296e23774ddd1da7afc92f3eaa094bfafaea7
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=250296e23774ddd1da7afc92…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
Date: Wed Jun 18 00:33:19 2008 +0200
db_filter_ui: Restrict number of active filters
---
include/db_filter_ui.php | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/include/db_filter_ui.php b/include/db_filter_ui.php
index 61a6d93..a2644ce 100644
--- a/include/db_filter_ui.php
+++ b/include/db_filter_ui.php
@@ -15,6 +15,8 @@ define('FILTER_VALUES_ENUM', 2);
define('FILTER_VALUES_BOOL', 3);
define('FILTER_VALUES_OPTION', 4);
+define('MAX_FILTERS', 50);
+
/* Info describing an available filter: what column it applies to,
and what comparison options are available */
class FilterInfo
@@ -436,10 +438,18 @@ class FilterInterface
The given TableFilterSet defines available options */
public function readInput($aClean)
{
+ $iCount = 0; // We set a maximum for how many filters a user can add,
+ // otherwise we may get a too long SQL query
+
foreach($this->getFilterInfo() as $oOption)
{
foreach($this->readInputForColumn($aClean, $oOption) as $oNewFilter)
+ {
+ $iCount ++;
$this->AddFilterObject($oNewFilter);
+ if($iCount > MAX_FILTERS)
+ break;
+ }
}
}
Module: docs
Branch: master
Commit: 9716d7bea7c4571b7309b6bf2dc939025e480792
URL: http://source.winehq.org/git/docs.git/?a=commit;h=9716d7bea7c4571b7309b6bf2…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue Jun 17 16:46:33 2008 +0200
Release 1.0.
---
ANNOUNCE | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++---------
VERSION | 2 +-
configure | 18 ++++----
3 files changed, 144 insertions(+), 33 deletions(-)
diff --git a/ANNOUNCE b/ANNOUNCE
index 1ebf852..ca17f51 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,28 +1,139 @@
-This is release 20050725 of Wine Docs, a collection of guides and
-their respective translations for Wine 20050725.
-
-WHAT'S NEW with winedocs-20050725:
- - Separate distribution from the main Wine package.
- - French translations for the FAQ, Winelib User Guide,
- and Wine User Guide.
- - Cleanups and spelling fixes.
-
-WHAT'S OBSOLETE in winedocs-20050725:
- - The Wine User Guide speaks of a configuration file.
- This file is no longer used by this Wine release.
- Work is being done to rectify the affected documentation.
- - The Winelib User Guide is obsolete.
- The recommended way of using Winelib is via winegcc.
- Please refer to winegcc's man page available in the
- main Wine distribution for details on how to use it.
- We hope to correct the Winelib User Guide in the
- near future.
+This is release 1.0 of the Wine documentation, a collection of guides
+and their respective translations for Wine 1.0.
See the README file in the distribution for installation instructions.
-Because of lags created by using mirrors, this message may reach you before
-the release is available at the ftp sites. The sources will be available
-from the following location:
+The source is available from the following location:
- http://prdownloads.sourceforge.net/wine/winedocs-20050725.tar.gz
+ http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-1.0.tar.bz2
+Pre-formatted documentation in various formats is available at:
+
+ http://www.winehq.org/site/documentation
+
+----------------------------------------------------------------
+
+Changes since 20070725:
+
+Alexandre Julliard (8):
+ Removed a # character that breaks the build on WineHQ for some
+ Fixed a typo in a closing tag.
+ Updated the sourceforge repository address.
+ The FAQ is maintained on the wiki now.
+ Convert the .cvsignore files to .gitignore.
+ makefiles: Add rules for automatically rebuilding makefiles.
+ configure: Cosmetic changes. Regenerated with autoconf 2.61.
+ wineusr-guide: Removed some obsolete information.
+
+Brian Vincent (4):
+ Add FAQ about updating the FAQ and submitting patches.
+ Update Winw User Guide to reflect the switch from the
+ wine.userreg no longer exists and the system administration tips
+ Explicitly address Intel Mac OS X.
+
+Dan Kegel (1):
+ Add instructions on how to build tests standalone on Windows
+
+Detlef Riekenberg (3):
+ Fix wine release rate and Emulator-URLs.
+ - Fix a link and the source-archive suffix
+ - Fix system32, winecfg and Printers.
+
+Dimi Paun (21):
+ Initial import of the Wine SGML documentation
+ Merge branch upstream/po4a.
+ Import of PO4A release 0.21
+ Add missing <qandaentry>
+ Ignore autoconf cache.
+ Move the PO4_* stuff into Make.rules.in; remove unused variables
+ Import of SGMLSpm 1.03ii.
+ Fix --version option.
+ Import of PO4A release cvs-20050630
+ Merge branch upstream/po4a.
+ Ignore config.* files
+ Add a little bit more about building the documentation.
+ Release 20050725.
+ Properly close paragraph.
+ Redirect FAQ questions to wine-devel for now, they are few and far between.
+ Disable the keymap table example, it breaks PS and PDF generation.
+ Disable French docs for now, they don't build.
+ A bit more on how to build the docs.
+ Add a few words on adding a new directory to the wine tree.
+ Simple rephrasing and some formatting fixes.
+ Fix formatting.
+
+Eric Pouech (1):
+ - fixed a broken HTML reference
+
+François Gouget (22):
+ Tweak the link to WineHQ's CVS page
+ Use the proper markup instead of non-ascii trademark characters.
+ The documentation is covered by the LGPL.
+ Add .cvsignore files.
+ Move the DB2xxx variables to Make.rules.in. That's where they are
+ Specify the language DocBook should use on the <book> and <article>
+ Make 'all' depend on Make.rules.
+ Add the standard TOPSRCDIR & co variables so we can correctly refer
+ Assorted spelling fixes.
+ Add a framework to handle the translation of Wine's documentation using po4a.
+ Ignore wine-faq's generated files.
+ Warn the user if docbook2html is missing. Offer hints as to which
+ Regenerate the configure script.
+ Fix DLLs vs. DLL's
+ Now that Po4a can translate attributes we don't need the posgml+sed
+ Check for nsgmls and warn the user if it is missing.
+ Remove a stray reference to posgml. Fixes the dependencies of the
+ Integrate the Wine User Guide translation with the WineDocs framework.
+ Integrate the Wine User Guide translation with the WineDocs framework.
+ Rename LANG to DOCLOCALE to avoid messing with the $LANG environment
+ Some 'Wine User Guide' source files have been removed.
+ Assorted spelling fixes.
+
+Jeff Latimer (5):
+ Document the "info all_regs" command.
+ Add info about getting the Windows DDK to provide libs that don't ship
+ Add a reference as where to obtain instructions for getting
+ Fixed a typo.
+ Add a Quick start to the Wine User Guide.
+
+Jonathan Ernst (9):
+ - document WINEDLLOVERRIDES
+ - improve the registry section a bit.
+ - regedit is a tool, registry is to be edited
+ - fix dead links in the faqs
+ - Some more deadlinks
+ - one more deadlinks
+ - one more deadlink
+ - user user -> user
+ - CST -> CDT
+
+Lei Zhang (1):
+ We should mention AUDIODEV, MIXERDEV, and MIDIDEV in the environment
+
+Mike McCormack (4):
+ Update the FAQ to reference Git.
+ Describe using Git to send patches.
+ Change a few more references from CVS to Git.
+ Update regression testing procedure to use Git.
+
+Molle Bestefich (2):
+ Fix up winedev-debugger doc to match 0.9.
+ - Link to AppDB for IDA Pro.
+
+Roger Ye (1):
+ Fix trivial typo.
+
+Tom Wickline (3):
+ Spelling fixes, typo fixes.
+ Trademark Bricscad.
+ Update current CX Pro price.
+
+Tony Lambregts (1):
+ Change wine -v to wine -version since wine -v does not work.
+
+Zhangrong Huang (1):
+ Add the wineesd documentation to the multimedia section.
+
+--
+Alexandre Julliard
+julliard(a)winehq.org
diff --git a/VERSION b/VERSION
index 4ae3a64..fa0c819 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-WineDocs version 20050725
+Wine documentation version 1.0
diff --git a/configure b/configure
index c7ac246..c4cb43c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for wine-docs 20050725.
+# Generated by GNU Autoconf 2.61 for wine-docs 1.0.
#
# Report bugs to <wine-devel(a)winehq.org>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='wine-docs'
PACKAGE_TARNAME='wine-docs'
-PACKAGE_VERSION='20050725'
-PACKAGE_STRING='wine-docs 20050725'
+PACKAGE_VERSION='1.0'
+PACKAGE_STRING='wine-docs 1.0'
PACKAGE_BUGREPORT='wine-devel(a)winehq.org'
ac_subst_vars='SHELL
@@ -1129,7 +1129,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wine-docs 20050725 to adapt to many kinds of systems.
+\`configure' configures wine-docs 1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1190,7 +1190,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wine-docs 20050725:";;
+ short | recursive ) echo "Configuration of wine-docs 1.0:";;
esac
cat <<\_ACEOF
@@ -1255,7 +1255,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-wine-docs configure 20050725
+wine-docs configure 1.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1269,7 +1269,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wine-docs $as_me 20050725, which was
+It was created by wine-docs $as_me 1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2340,7 +2340,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by wine-docs $as_me 20050725, which was
+This file was extended by wine-docs $as_me 1.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2383,7 +2383,7 @@ Report bugs to <bug-autoconf(a)gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wine-docs config.status 20050725
+wine-docs config.status 1.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Module: website
Branch: master
Commit: 7c17dcc85ed6c4db8114d8c3427428a6745b7860
URL: http://source.winehq.org/git/website.git/?a=commit;h=7c17dcc85ed6c4db8114d8…
Author: Alexandre Julliard <julliard(a)winehq.org>
Date: Tue Jun 17 16:20:03 2008 +0200
Wine release 1.0
---
news/en/2008061701.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/news/en/2008061701.xml b/news/en/2008061701.xml
new file mode 100644
index 0000000..a83284a
--- /dev/null
+++ b/news/en/2008061701.xml
@@ -0,0 +1,9 @@
+<news>
+<date>June 17, 2008</date>
+<title>Wine 1.0 Released</title>
+<body>
+<p> The Wine team is proud to announce that Wine 1.0 is now available. This is the first stable release of Wine after 15 years of development and beta testing. Many thanks to everybody who helped us along that long road!</p>
+<p> While compatibility is not perfect yet, thousands of applications have been reported to work very well. Check <a href="http://appdb.winehq.org">http://appdb.winehq.org</a> to see the details for your favorite applications.</p>
+<p><p>The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.0.tar.bz2">available now</a>.
+Binary packages are in the process of being built, and will appear soon at their respective <a href="/site/download">download locations</a>.
+</p></body></news>