December 2007 - Wine-Commits

Jeremy Newman : add missing WWN images
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: bb858c17566851923439f7cece778c120d387c12 URL: http://source.winehq.org/git/website.git/?a=commit;h=bb858c17566851923439f7… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 14:37:13 2007 -0600 add missing WWN images Original Author: Zachary Goldberg --- images/wwn_bronzebg.gif | Bin 0 -> 148 bytes images/wwn_garbagebg.gif | Bin 0 -> 148 bytes images/wwn_goldbg.gif | Bin 0 -> 148 bytes images/wwn_platinumbg.gif | Bin 148 -> 148 bytes images/wwn_silverbg.gif | Bin 148 -> 148 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/wwn_bronzebg.gif b/images/wwn_bronzebg.gif new file mode 100644 index 0000000..4dad1c4 Binary files /dev/null and b/images/wwn_bronzebg.gif differ diff --git a/images/wwn_garbagebg.gif b/images/wwn_garbagebg.gif new file mode 100644 index 0000000..4859b26 Binary files /dev/null and b/images/wwn_garbagebg.gif differ diff --git a/images/wwn_goldbg.gif b/images/wwn_goldbg.gif new file mode 100644 index 0000000..230376f Binary files /dev/null and b/images/wwn_goldbg.gif differ diff --git a/images/wwn_platinumbg.gif b/images/wwn_platinumbg.gif old mode 100755 new mode 100644 diff --git a/images/wwn_silverbg.gif b/images/wwn_silverbg.gif old mode 100755 new mode 100644

1 0

Alexandre Julliard : wine_release: snapshot date is now in a separate globals.conf file.
by Alexandre Julliard Dec. 10, 2007

Dec. 10, 2007

Module: tools Branch: master Commit: a461e49ac3bac62640e6e165c3912d32345e3e3a URL: http://source.winehq.org/git/tools.git/?a=commit;h=a461e49ac3bac62640e6e165… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 10 20:23:18 2007 +0100 wine_release: snapshot date is now in a separate globals.conf file. --- update-winehq | 20 ++------------------ wine_release | 7 ++++++- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/update-winehq b/update-winehq index 4e6d186..a91f7d7 100755 --- a/update-winehq +++ b/update-winehq @@ -23,7 +23,7 @@ sub xml_escape($) my $rel; my $changes = "\n"; -die "Not in lostwages dir?" unless -d "news" && -f "include/winehq.conf"; +die "Not in lostwages dir?" unless -d "news"; system("git", "pull") == 0 or die "git pull failed"; # Parse the ANNOUNCE file @@ -55,22 +55,6 @@ while (<ANNOUNCE>) } close ANNOUNCE; -# Update snapshot date in winehq.conf - -my @lines = (); -open CONF, "<include/winehq.conf" or die "cannot open include/winehq.conf"; -while (<CONF>) -{ - s/^snapshot_date:.*$/snapshot_date: $rel/; - push @lines, $_; -} -close CONF; - -open NEWCONF, ">include/winehq.conf" or die "cannot update include/winehq.conf"; -print NEWCONF @lines; -close NEWCONF; -print "Updated include/winehq.conf\n"; - # Create the news file my $newsdate = `date +%Y%m%d`; @@ -122,7 +106,7 @@ if (system("git", "add", $newsfile)) die "git add $newsfile failed"; } -if (system("git", "commit", "-m", "Wine release $rel", "include/winehq.conf", $newsfile)) +if (system("git", "commit", "-m", "Wine release $rel", $newsfile)) { system("git", "rm", "-f", $newsfile); die "git commit failed"; diff --git a/wine_release b/wine_release index 482c4d2..ece534c 100755 --- a/wine_release +++ b/wine_release @@ -17,11 +17,16 @@ fi oldver=$1 version=$2 -templates_dir="/home/winehq/opt/website/templates" +website_dir="/home/winehq/opt/website" +templates_dir=$website_dir/templates tools_dir="/home/winehq/opt/git-tools" cd /home/winehq/opt/source +# update website config + +echo "snapshot_date: $version" > globals.conf && mv -f globals.conf $website_dir/include/globals.conf + # nuke old attempt (if any) rm -rf wine-$version

1 0

Jeremy Newman : removing download redhat page, no longer updated
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 1ea181b83905cb84be25530f0e5cfcabd9b7736a URL: http://source.winehq.org/git/website.git/?a=commit;h=1ea181b83905cb84be2553… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 12:50:36 2007 -0600 removing download redhat page, no longer updated making globals.conf a non-commit file --- include/.gitignore | 1 + include/globals.conf | 7 - include/globals.conf.sample | 5 + templates/en/download-rh.template | 319 ------------------------------------- templates/en/download.template | 2 +- 5 files changed, 7 insertions(+), 327 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=1ea181b83905cb84be…

1 0

Jeremy Newman : adding RSS news feed to local page
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 19e9f1cf97a2f65dff47c60fb9be22d6f44ac19a URL: http://source.winehq.org/git/website.git/?a=commit;h=19e9f1cf97a2f65dff47c6… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 11:35:36 2007 -0600 adding RSS news feed to local page --- include/html.php | 88 ++++++++++++++++++-------- include/themes/winehq/content.template | 5 +- include/themes/winehq/content_print.template | 19 ++++++ include/winehq.conf | 35 ---------- site | 73 +++++++++++++++++++++- templates/en/global/xml/rss.template | 22 +++++++ templates/en/global/xml/rss_row.template | 8 +++ 7 files changed, 184 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=19e9f1cf97a2f65dff…

1 0

Jeremy Newman : ignore local version of winehq.conf
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: a05e1f8bd33408b75fe91e5bdb4dd1c2b309f6ef URL: http://source.winehq.org/git/website.git/?a=commit;h=a05e1f8bd33408b75fe91e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 11:34:22 2007 -0600 ignore local version of winehq.conf --- include/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/.gitignore b/include/.gitignore new file mode 100644 index 0000000..a13fe53 --- /dev/null +++ b/include/.gitignore @@ -0,0 +1 @@ +winehq.conf

1 0

Jeremy Newman : updating config to parse multiple config files
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 5ba1e596b973f71fb2184ab96cce41928d79a583 URL: http://source.winehq.org/git/website.git/?a=commit;h=5ba1e596b973f71fb2184a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 11:33:23 2007 -0600 updating config to parse multiple config files moving global vars to seperate config file rename winehq.conf to winehq.conf.sample this will allow my local development version to have its own config file --- include/config.php | 23 +++++++++++++++-------- include/globals.conf | 7 +++++++ include/incl.php | 2 +- include/winehq.conf.sample | 29 +++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 9 deletions(-) diff --git a/include/config.php b/include/config.php index 9d71ad9..c1c6d2e 100644 --- a/include/config.php +++ b/include/config.php @@ -11,17 +11,24 @@ class config { - function config ($path = "") + function config () { - // exit if config not found - if (!file_exists($path)) + // get files passed + $files = func_get_args(); + + // loop and parse files + foreach ($files as $path) { - echo 'config file not found!'; - exit(); - } + // exit if config not found + if (!file_exists($path)) + { + echo 'config file not found!'; + exit(); + } - // read global config file - $this->readConfig($path); + // read global config file + $this->readConfig($path); + } // navigation $this->nav = array( diff --git a/include/globals.conf b/include/globals.conf new file mode 100644 index 0000000..28029a8 --- /dev/null +++ b/include/globals.conf @@ -0,0 +1,7 @@ +# Website Global Vars File + +# Snapshot Date +snapshot_date: 0.9.50 + +# Current RH Packages Snapshot Date +snapshot_date_rh: 0.9.2 diff --git a/include/incl.php b/include/incl.php index 2782197..b63a085 100644 --- a/include/incl.php +++ b/include/incl.php @@ -14,7 +14,7 @@ require($file_root."/include/"."config.php"); // create config object -$config = new config($file_root."/include/"."winehq.conf"); +$config = new config($file_root."/include/"."winehq.conf", $file_root."/include/"."globals.conf"); // load global libs require($file_root."/include/"."html.php"); diff --git a/include/winehq.conf.sample b/include/winehq.conf.sample new file mode 100644 index 0000000..5048496 --- /dev/null +++ b/include/winehq.conf.sample @@ -0,0 +1,29 @@ +# Website Configuration File + +# turns debug mode on/off +debug: 0 +web_debug: 0 + +# title of this site +site_name: Wine HQ + +# default theme +theme: winehq + +# default language +lang: en + +# available themes +(a)themes: winehq + +# available languages +(a)languages: en + +# base URL for website +base_url: http://www.winehq.org + +# Path to WWN XML files +news_xml_path: news + +# Path to WWN XML files +wwn_xml_path: wwn

1 0

Jeremy Newman : rename WWN news article so the sort is correct
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 4302fa046434cbebb0036dc162edf30ae15a90db URL: http://source.winehq.org/git/website.git/?a=commit;h=4302fa046434cbebb0036d… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Mon Dec 10 10:27:25 2007 -0600 rename WWN news article so the sort is correct --- news/{200712301.xml => 2007120301.xml} | 0 1 files changed, 0 insertions(+), 0 deletions(-) diff --git a/news/200712301.xml b/news/2007120301.xml similarity index 100% rename from news/200712301.xml rename to news/2007120301.xml

1 0

Zachary Goldberg : wwn 334
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 240c5b88ef2ba1aa91f5712ca044eb32999590ea URL: http://source.winehq.org/git/website.git/?a=commit;h=240c5b88ef2ba1aa91f571… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 10 03:08:39 2007 -0500 wwn 334 WWN #334 -- Zachary Goldberg Computer Science & Engineering Electrical Captain of Penn Electric Race Team School of Engineering at the University of Pennsylvania >From 58775971342087c9ff0a5c55a17e72a07e9f16c6 Mon Sep 17 00:00:00 2001 From: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon, 10 Dec 2007 03:05:20 -0500 Subject: [WineHQ][WWN] wwn 334 To: wine-patches <wine-patches(a)winehq.org> --- news/2007121001.xml | 7 + wwn/wn20071210_334.xml | 784 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 791 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=240c5b88ef2ba1aa91…

1 0

Zachary Goldberg : Add new wwn images for "AppDB Status Changes"
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: 551822619890728e5897a9cbfedcfab9b5d6f2ad URL: http://source.winehq.org/git/website.git/?a=commit;h=551822619890728e5897a9… Author: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Mon Dec 10 03:07:59 2007 -0500 Add new wwn images for "AppDB Status Changes" These images are used so that the AppDB Status table (in wwn334+) isn't horribly, horribly ugly. Instead its only kinda ugly. Suggestions for making it pretty welcome. -- Zachary Goldberg Computer Science & Engineering Electrical Captain of Penn Electric Race Team School of Engineering at the University of Pennsylvania >From e102d451d3e71d79fdf39e93459654812c8ea088 Mon Sep 17 00:00:00 2001 From: Zachary Goldberg <zgs(a)seas.upenn.edu> Date: Fri, 7 Dec 2007 16:57:52 -0500 Subject: [WineHQ][WWN] Add new wwn images for "AppDB Status Changes" To: wine-patches <wine-patches(a)winehq.org> --- images/wwn_bronzebg.gif | Bin 0 -> 148 bytes images/wwn_garbagebg.gif | Bin 0 -> 148 bytes images/wwn_goldbg.gif | Bin 0 -> 148 bytes images/wwn_platinumbg.gif | Bin 0 -> 148 bytes images/wwn_silverbg.gif | Bin 0 -> 148 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 images/wwn_bronzebg.gif create mode 100755 images/wwn_garbagebg.gif create mode 100755 images/wwn_goldbg.gif create mode 100755 images/wwn_platinumbg.gif create mode 100755 images/wwn_silverbg.gif diff --git a/images/wwn_bronzebg.gif b/images/wwn_bronzebg.gif new file mode 100755 index 0000000000000000000000000000000000000000..4dad1c4cdd7a1fdeab662dc9f0939801b533c1d7 GIT binary patch literal 148 zcmZ?wbhEHbWMmLwIKsg29|RbH(a)IM2H17rayAf7+jdHxjV`IDUI^*hb$b(+`hIJeDV zUWen%X8VaXHZ>VW-KCaIxu(+_?55P&_E%b$CmFOCnis|Dfs8`}ia%Kx85pD)bU<Pt cI~iC76DBE~I%Lw%92!>QE2)|o#lc_=0Gxm^vH$=8 literal 0 HcmV?d00001 diff --git a/images/wwn_garbagebg.gif b/images/wwn_garbagebg.gif new file mode 100755 index 0000000000000000000000000000000000000000..4859b26b4c3cab5a7303b4b15531624f8abd20bc GIT binary patch literal 148 zcmZ?wbhEHbWMmLwIKsg29|RbH(a)IM2H17rayAf7a7Qh$GcUteEOPfurOXIooaOG`^r zQ&U4jLw$XHRaI4ad3jk`S#fc3etv#VPELAydP+)4LPA1xbTr6B7*PDl!pOiN!=M8a d0NKgFDyT3?gZr`tzlf)BXr%bG%xDe<YXGuKG;{y} literal 0 HcmV?d00001 diff --git a/images/wwn_goldbg.gif b/images/wwn_goldbg.gif new file mode 100755 index 0000000000000000000000000000000000000000..230376f10c970197fbb547c02e222befd8909f6f GIT binary patch literal 148 zcmZ?wbhEHbWMmLwIKsg29|RbH(a)IM2H17ray5Pl~7|GDu02g3iK3je<?^#7{R|5Jkh z&k6oND)4;||CgQoZ#VM&IVkX93;)X%Ja5+UK3T|hYZCi|SsYh-*gz)2fZ|UUMg|5M g1|5(9$W8`U!GtCquFE!jF0MhQv0}?oqd6F?0n$o4bN~PV literal 0 HcmV?d00001 --- images/wwn_platinumbg.gif | Bin 0 -> 148 bytes images/wwn_silverbg.gif | Bin 0 -> 148 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/wwn_platinumbg.gif b/images/wwn_platinumbg.gif new file mode 100755 index 0000000..5317e07 Binary files /dev/null and b/images/wwn_platinumbg.gif differ diff --git a/images/wwn_silverbg.gif b/images/wwn_silverbg.gif new file mode 100755 index 0000000..d054760 Binary files /dev/null and b/images/wwn_silverbg.gif differ

1 0

Alexander Nicolaysen Sørnes : Add file to verify our identity on freenode (resend)
by Jeremy Newman Dec. 10, 2007

Dec. 10, 2007

Module: website Branch: master Commit: b17fe64eb561feea1c02f1d48e551535e170c1b9 URL: http://source.winehq.org/git/website.git/?a=commit;h=b17fe64eb561feea1c02f1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Dec 10 12:22:10 2007 +0100 Add file to verify our identity on freenode (resend) We need this to verify our ownership of the wine irc channels. From Ben Hodgetts. Alexander N. Sørnes >From 610c5e2c150b021d970952903e35141a49e2f7bd Mon Sep 17 00:00:00 2001 From: =?utf-8?q?Alexander=20Nicolaysen=20S=C3=B8rnes?= <alexander(a)alex.alexstyrt> Date: Fri, 7 Dec 2007 01:33:35 +0100 Subject: [PATCH] Add file to verify our identity on freenode --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/freenode.uP4Y16UYccnE.html b/freenode.uP4Y16UYccnE.html new file mode 100644 index 0000000..e69de29

1 0