From 03df45407631a1382d1ac252330021be4eec6135 Mon Sep 17 00:00:00 2001
From: Fabien Tassin <fta@sofaraway.org>
Date: Sat, 7 Jun 2008 02:32:49 +0200
Subject: * [mozclient] change version of all hg project to have YYYYMMDDrRRR
 instead of   RRR~YYYMMDD which was different from all other VCS   - update
 src/mozclient/lib/MozClient/Mercurial.pm   - update
 src/mozclient/{xulrunner,firefox}-{1.9.1,3.1}.conf

---
 src/mozclient/firefox-3.1.conf           | 2 +-
 src/mozclient/firefox-4.0.conf           | 2 +-
 src/mozclient/lib/MozClient/Mercurial.pm | 2 +-
 src/mozclient/xulrunner-1.9.1.conf       | 2 +-
 src/mozclient/xulrunner-2.0.conf         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mozclient/firefox-3.1.conf b/src/mozclient/firefox-3.1.conf
index ae2a48e..1a0e487 100644
--- a/src/mozclient/firefox-3.1.conf
+++ b/src/mozclient/firefox-3.1.conf
@@ -22,6 +22,6 @@ MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
 MOZCLIENT_FILE       = mozilla/browser/config/version.txt
 MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt
 MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%d~%04d%02d%02d\n", $4, $3, $$m{$2}, $1 }; '
+MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
 MOZCLIENT_EMBEDDED   = 1
 MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/firefox-4.0.conf b/src/mozclient/firefox-4.0.conf
index 7912bc9..e41d47c 100644
--- a/src/mozclient/firefox-4.0.conf
+++ b/src/mozclient/firefox-4.0.conf
@@ -22,6 +22,6 @@ MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
 MOZCLIENT_FILE       = mozilla/browser/config/version.txt
 MOZCLIENT_GETVERSION = sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/' mozilla/browser/config/version.txt
 MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%d~%04d%02d%02d\n", $4, $3, $$m{$2}, $1 }; '
+MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
 MOZCLIENT_EMBEDDED   = 1
 MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/lib/MozClient/Mercurial.pm b/src/mozclient/lib/MozClient/Mercurial.pm
index d034a8a..f5f5c2d 100644
--- a/src/mozclient/lib/MozClient/Mercurial.pm
+++ b/src/mozclient/lib/MozClient/Mercurial.pm
@@ -39,7 +39,7 @@ sub convert_revdate {
   my $arg = shift;
 
   $self->LOG("MozClient::Mercurial::convert_revdate($arg)");
-  $arg =~ s,^(\d+).*,$1,;
+  $arg =~ s,^\d+r,,;
   $arg;
 }
 
diff --git a/src/mozclient/xulrunner-1.9.1.conf b/src/mozclient/xulrunner-1.9.1.conf
index 0cda563..1f946e2 100644
--- a/src/mozclient/xulrunner-1.9.1.conf
+++ b/src/mozclient/xulrunner-1.9.1.conf
@@ -22,6 +22,6 @@ MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s
 MOZCLIENT_VCS        = hg
 MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
 MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%d~%04d%02d%02d\n", $4, $3, $$m{$2}, $1 }; '
+MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
 #MOZCLIENT_EMBEDDED  = 1
 MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/xulrunner-2.0.conf b/src/mozclient/xulrunner-2.0.conf
index 72d49ad..2acc2e8 100644
--- a/src/mozclient/xulrunner-2.0.conf
+++ b/src/mozclient/xulrunner-2.0.conf
@@ -22,6 +22,6 @@ MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s
 MOZCLIENT_VCS        = hg
 MOZCLIENT_VCS_LOC    = http://hg.mozilla.org/
 MOZCLIENT_POSTCOCMD  = cd mozilla && python client.py checkout
-MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%d~%04d%02d%02d\n", $4, $3, $$m{$2}, $1 }; '
+MOZCLIENT_GETDATE    = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 http://hg.mozilla.org/index.cgi/mozilla-central/log 2> /dev/null | grep cite | head -1 | sed -e 's,.*</cite>,,' | perl -e '$m = { "Jan" => 1, "Feb" => 2, "Mar" => 3, "Apr" => 4, "May" => 5, "Jun" => 6, "Jul" => 7, "Aug" => 8, "Sep" => 9, "Oct" => 10, "Nov" => 11, "Dec" => 12 } ; $a = <>; $a =~ m/^ - \S+,\s+(\d+) (\S+) (\d+) \S+ \S+ - rev (\d+)/ && do { printf "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
 #MOZCLIENT_EMBEDDED  = 1
 MOZCLIENT_WANTMOZDIR = 1
-- 
cgit v1.2.3