summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-06-06 15:21:22 +0200
committerFabien Tassin <fta@sofaraway.org>2008-06-06 15:21:22 +0200
commit705330e592cd154dddf882c8ab6699f2be8aa087 (patch)
tree3212f5925b8b27cb68c347b8184bdcde9e3a9408 /src
parenta6ad8b5bb1899b8526457f1eb9c54f0f4d1b94e4 (diff)
* [mozclient] Change MOZCLIENT_CVS_LOC and MOZCLIENT_HG_LOC into a common
MOZCLIENT_VCS_LOC and make it mandatory - update src/mozclient.pl - update src/src/mozclient/*.conf - update README
Diffstat (limited to 'src')
-rwxr-xr-xsrc/mozclient.pl7
-rw-r--r--src/mozclient/firefox-3.0-full.conf1
-rw-r--r--src/mozclient/firefox-3.0.conf1
-rw-r--r--src/mozclient/firefox-3.1.conf1
-rw-r--r--src/mozclient/firefox-4.0.conf1
-rw-r--r--src/mozclient/lib/MozClient/CVS.pm8
-rw-r--r--src/mozclient/lib/MozClient/Mercurial.pm4
-rw-r--r--src/mozclient/lightning-sunbird.conf1
-rw-r--r--src/mozclient/nspr.conf1
-rw-r--r--src/mozclient/nss.conf1
-rw-r--r--src/mozclient/seamonkey-2.0.conf1
-rw-r--r--src/mozclient/thunderbird-2.0.conf1
-rw-r--r--src/mozclient/thunderbird-3.0.conf1
-rw-r--r--src/mozclient/xulrunner-1.8.conf1
-rw-r--r--src/mozclient/xulrunner-1.9.1.conf1
-rw-r--r--src/mozclient/xulrunner-1.9.conf1
-rw-r--r--src/mozclient/xulrunner-2.0.conf1
17 files changed, 22 insertions, 11 deletions
diff --git a/src/mozclient.pl b/src/mozclient.pl
index c367cdf..d4050a3 100755
--- a/src/mozclient.pl
+++ b/src/mozclient.pl
@@ -48,17 +48,14 @@ my $patches_dir = "$pkg_conf_dir/patches";
my $work_dir = "mozclient-tmp";
my @conf_mandatory = qw(MOZCLIENT_APPNAME MOZCLIENT_FILE MOZCLIENT_GETVERSION
- MOZCLIENT_GETDATE MOZCLIENT_VCS);
+ MOZCLIENT_GETDATE MOZCLIENT_VCS MOZCLIENT_VCS_LOC);
my @conf_optional = qw(MOZCLIENT_MODULES MOZCLIENT_PROJECT MOZCLIENT_BRANCH
MOZCLIENT_POSTCOCMD MOZCLIENT_EMBEDDED
MOZCLIENT_WANTMOZDIR MOZCLIENT_WANTPATCH
- MOZCLIENT_DYNTAG MOZCLIENT_DYNTAG_FILES
- MOZCLIENT_CVS_LOC MOZCLIENT_HG_LOC);
+ MOZCLIENT_DYNTAG MOZCLIENT_DYNTAG_FILES);
my @conf_list = qw(MOZCLIENT_FILE);
my $defaults = {
- 'MOZCLIENT_CVS_LOC' => ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot',
- 'MOZCLIENT_HG_LOC' => 'http://hg.mozilla.org/',
'MOZCLIENT_EXCLUDE_SCRIPT' => 'remove.binonly.sh',
'MOZILLA_CLIENT' => 'mozilla/client.mk',
'MOZCLIENT_PATCHES' => "$patches_dir",
diff --git a/src/mozclient/firefox-3.0-full.conf b/src/mozclient/firefox-3.0-full.conf
index e4c28ad..6dfe537 100644
--- a/src/mozclient/firefox-3.0-full.conf
+++ b/src/mozclient/firefox-3.0-full.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = firefox-3.0
MOZCLIENT_PROJECT = browser
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/browser/config/version.txt
MOZCLIENT_GETVERSION = sed -e 's/pre//; s/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/' mozilla/browser/config/version.txt
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/firefox-3.0.conf b/src/mozclient/firefox-3.0.conf
index 4213cc9..7e5de7c 100644
--- a/src/mozclient/firefox-3.0.conf
+++ b/src/mozclient/firefox-3.0.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = firefox-3.0
MOZCLIENT_PROJECT = xulbrowser
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/browser/config/version.txt
MOZCLIENT_GETVERSION = sed -e 's/pre//; s/a\([0-9]*\)/~alpha\1/; s/b\([0-9]*\)/~b\1/' mozilla/browser/config/version.txt
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/firefox-3.1.conf b/src/mozclient/firefox-3.1.conf
index b4514bf..ae2a48e 100644
--- a/src/mozclient/firefox-3.1.conf
+++ b/src/mozclient/firefox-3.1.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = firefox-3.1
MOZCLIENT_PROJECT = mozilla-central
MOZCLIENT_VCS = hg
+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
diff --git a/src/mozclient/firefox-4.0.conf b/src/mozclient/firefox-4.0.conf
index 49b166e..7912bc9 100644
--- a/src/mozclient/firefox-4.0.conf
+++ b/src/mozclient/firefox-4.0.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = firefox-4.0
MOZCLIENT_PROJECT = mozilla-central
MOZCLIENT_VCS = hg
+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
diff --git a/src/mozclient/lib/MozClient/CVS.pm b/src/mozclient/lib/MozClient/CVS.pm
index 7c946a3..72a5917 100644
--- a/src/mozclient/lib/MozClient/CVS.pm
+++ b/src/mozclient/lib/MozClient/CVS.pm
@@ -33,7 +33,7 @@ sub list_tags {
$self->LOG("MozClient::CVS::list_tags()");
$self->chdir($self->work_dir);
- $self->run_system("cvs -d " . $self->{'MOZCLIENT_CVS_LOC'} . " co " .
+ $self->run_system("cvs -d " . $self->{'MOZCLIENT_VCS_LOC'} . " co " .
(join ' ', @{$self->{'MOZCLIENT_FILE'}}));
my $file = ${$self->{'MOZCLIENT_FILE'}}[0];
$file =~ s,^([^/]*)/,,;
@@ -55,7 +55,7 @@ sub do_dynamic_tag {
$date = '-D "' . $self->convert_revdate($self->{'have_date'}) . '"'
if defined $self->{'have_date'};
undef $self->{'have_date'};
- my $cmd = sprintf "cvs -d %s co %s", $self->{'MOZCLIENT_CVS_LOC'},
+ my $cmd = sprintf "cvs -d %s co %s", $self->{'MOZCLIENT_VCS_LOC'},
$self->{'MOZCLIENT_DYNTAG_FILES'};
$self->run_system($cmd);
chomp($self->{'want_tag'} = `$self->{'MOZCLIENT_DYNTAG'}`);
@@ -72,7 +72,7 @@ sub get_client {
"-r " . $self->{'want_branch'} : "";
$self->chdir($self->work_dir);
- my $cmd = sprintf "cvs -d %s co %s %s %s %s", $self->{'MOZCLIENT_CVS_LOC'},
+ my $cmd = sprintf "cvs -d %s co %s %s %s %s", $self->{'MOZCLIENT_VCS_LOC'},
$tbranch, $self->{'mozclient_date'}, $self->{'co_tag'},
$self->{'MOZILLA_CLIENT'};
$self->run_system($cmd);
@@ -127,7 +127,7 @@ sub checkout {
}
else {
my $cmd = sprintf "cvs -d %s -q -z 3 co -P -A %s %s %s",
- $self->{'MOZCLIENT_CVS_LOC'}, $self->{'mozclient_date'},
+ $self->{'MOZCLIENT_VCS_LOC'}, $self->{'mozclient_date'},
$self->{'co_tag'}, $self->{'MOZCLIENT_MODULES'};
$self->run_system($cmd);
}
diff --git a/src/mozclient/lib/MozClient/Mercurial.pm b/src/mozclient/lib/MozClient/Mercurial.pm
index 54fd9dd..d034a8a 100644
--- a/src/mozclient/lib/MozClient/Mercurial.pm
+++ b/src/mozclient/lib/MozClient/Mercurial.pm
@@ -61,11 +61,11 @@ sub checkout {
my $modules = [];
if (defined $self->{'MOZCLIENT_PROJECT'}) {
push @$modules,
- $self->{'MOZCLIENT_HG_LOC'} . $self->{'MOZCLIENT_PROJECT'} . "/";
+ $self->{'MOZCLIENT_VCS_LOC'} . $self->{'MOZCLIENT_PROJECT'} . "/";
}
else {
for my $module (@{$self->{'MOZCLIENT_MODULES'}}) {
- push @$modules, (sprintf " %s%s/%s", $self->{'MOZCLIENT_HG_LOC'},
+ push @$modules, (sprintf " %s%s/%s", $self->{'MOZCLIENT_VCS_LOC'},
$self->{'MOZCLIENT_PROJECT'}, $module);
}
}
diff --git a/src/mozclient/lightning-sunbird.conf b/src/mozclient/lightning-sunbird.conf
index 5d5a05d..d316851 100644
--- a/src/mozclient/lightning-sunbird.conf
+++ b/src/mozclient/lightning-sunbird.conf
@@ -19,6 +19,7 @@ MOZCLIENT_APPNAME = lightning-sunbird
MOZCLIENT_PROJECT = calendar
MOZCLIENT_BRANCH = MOZILLA_1_8_BRANCH
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/calendar/sunbird/config/version.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/calendar/sunbird/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=CalendarClient&branch=MOZILLA_1_8_BRANCH&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/nspr.conf b/src/mozclient/nspr.conf
index 36ad1e3..070d6c0 100644
--- a/src/mozclient/nspr.conf
+++ b/src/mozclient/nspr.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = nspr
MOZCLIENT_PROJECT = # null
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_MODULES = mozilla/nsprpub
MOZCLIENT_FILE = mozilla/nsprpub/pr/include/prinit.h
MOZCLIENT_GETVERSION = ( grep -E '^\#define PR_VERSION' mozilla/nsprpub/pr/include/prinit.h | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/beta /beta/' -e 's/ */~/g' -e 's/$/+/' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre/~cvs/') | tr -d '\n'
diff --git a/src/mozclient/nss.conf b/src/mozclient/nss.conf
index 14a7a3e..7a8f617 100644
--- a/src/mozclient/nss.conf
+++ b/src/mozclient/nss.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = nss
MOZCLIENT_PROJECT = # null
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_MODULES = mozilla/dbm mozilla/security/coreconf mozilla/security/dbm mozilla/security/nss
MOZCLIENT_FILE = mozilla/security/nss/lib/nss/nss.h
MOZCLIENT_GETVERSION = ( grep '^\#define NSS_VERSION' mozilla/security/nss/lib/nss/nss.h | cut -d'"' -f2 | sed -e 's,$,+,' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre/~cvs/') | tr -d '\n'
diff --git a/src/mozclient/seamonkey-2.0.conf b/src/mozclient/seamonkey-2.0.conf
index ec75a85..cb0c696 100644
--- a/src/mozclient/seamonkey-2.0.conf
+++ b/src/mozclient/seamonkey-2.0.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = seamonkey-2.0
MOZCLIENT_PROJECT = suite
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/suite/config/version.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/suite/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/thunderbird-2.0.conf b/src/mozclient/thunderbird-2.0.conf
index e48c4cc..4ccf185 100644
--- a/src/mozclient/thunderbird-2.0.conf
+++ b/src/mozclient/thunderbird-2.0.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = thunderbird
MOZCLIENT_PROJECT = mail
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_BRANCH = MOZILLA_1_8_BRANCH
MOZCLIENT_FILE = mozilla/mail/config/version.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/mail/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
diff --git a/src/mozclient/thunderbird-3.0.conf b/src/mozclient/thunderbird-3.0.conf
index 8af133e..91c97a3 100644
--- a/src/mozclient/thunderbird-3.0.conf
+++ b/src/mozclient/thunderbird-3.0.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = thunderbird-3.0
MOZCLIENT_PROJECT = mail
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/mail/config/version.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/mail/config/version.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyMailNews&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/xulrunner-1.8.conf b/src/mozclient/xulrunner-1.8.conf
index aefd8e2..3d62d12 100644
--- a/src/mozclient/xulrunner-1.8.conf
+++ b/src/mozclient/xulrunner-1.8.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = xulrunner
MOZCLIENT_PROJECT = xulrunner
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_BRANCH = MOZILLA_1_8_BRANCH
MOZCLIENT_FILE = mozilla/config/milestone.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
diff --git a/src/mozclient/xulrunner-1.9.1.conf b/src/mozclient/xulrunner-1.9.1.conf
index d65aeba..0cda563 100644
--- a/src/mozclient/xulrunner-1.9.1.conf
+++ b/src/mozclient/xulrunner-1.9.1.conf
@@ -20,6 +20,7 @@ MOZCLIENT_PROJECT = mozilla-central
MOZCLIENT_FILE = mozilla/config/milestone.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
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_EMBEDDED = 1
diff --git a/src/mozclient/xulrunner-1.9.conf b/src/mozclient/xulrunner-1.9.conf
index ad67d4b..caa4eeb 100644
--- a/src/mozclient/xulrunner-1.9.conf
+++ b/src/mozclient/xulrunner-1.9.conf
@@ -18,6 +18,7 @@
MOZCLIENT_APPNAME = xulrunner-1.9
MOZCLIENT_PROJECT = xulrunner
MOZCLIENT_VCS = cvs
+MOZCLIENT_VCS_LOC = :pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot
MOZCLIENT_FILE = mozilla/config/milestone.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=SeaMonkeyBrowser&branch=HEAD&branchtype=match&dir=&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot' 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
diff --git a/src/mozclient/xulrunner-2.0.conf b/src/mozclient/xulrunner-2.0.conf
index 4d4c865..72d49ad 100644
--- a/src/mozclient/xulrunner-2.0.conf
+++ b/src/mozclient/xulrunner-2.0.conf
@@ -20,6 +20,7 @@ MOZCLIENT_PROJECT = mozilla-central
MOZCLIENT_FILE = mozilla/config/milestone.txt
MOZCLIENT_GETVERSION = tail -1 mozilla/config/milestone.txt | sed -e 's/pre//; s/\([ab]\)\([0-9]*\)/~\1\2/'
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_EMBEDDED = 1