summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--src/mozclient/xulrunner-1.9.1.conf2
-rw-r--r--src/mozclient/xulrunner-2.0.conf2
3 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 687c31f..3fca0f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ mozilla-devscripts (0.09) UNRELEASED; urgency=low
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
+ + Make xulrunner-1.9.1 and xulrunner-2.0 use embedded tarballs
+ - update src/mozclient/xulrunner-{1.9.1,2.0}.conf
* [ compare ]
+ Add build-tree/dist to the list of directories for compare1
diff --git a/src/mozclient/xulrunner-1.9.1.conf b/src/mozclient/xulrunner-1.9.1.conf
index 1f946e2..22bdc65 100644
--- a/src/mozclient/xulrunner-1.9.1.conf
+++ b/src/mozclient/xulrunner-1.9.1.conf
@@ -23,5 +23,5 @@ 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 "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-#MOZCLIENT_EMBEDDED = 1
+MOZCLIENT_EMBEDDED = 1
MOZCLIENT_WANTMOZDIR = 1
diff --git a/src/mozclient/xulrunner-2.0.conf b/src/mozclient/xulrunner-2.0.conf
index 2acc2e8..f28a24a 100644
--- a/src/mozclient/xulrunner-2.0.conf
+++ b/src/mozclient/xulrunner-2.0.conf
@@ -23,5 +23,5 @@ 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 "%04d%02d%02dr%d\n", $3, $$m{$2}, $1, $4 }; '
-#MOZCLIENT_EMBEDDED = 1
+MOZCLIENT_EMBEDDED = 1
MOZCLIENT_WANTMOZDIR = 1