Alexandre Julliard : wine_release: snapshot date is now in a separate globals.conf file.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: a461e49ac3bac62640e6e165c3912d32345e3e3a
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=a461e49ac3bac62640e6e165c3912d32345e3e3a

Author: Alexandre Julliard <julliard at 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