summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-03-14 00:17:07 +0100
committerFabien Tassin <fta@sofaraway.org>2008-03-14 00:17:07 +0100
commit11143e76a4f0e97a4ef4902e8da9ffa3b2f87fb3 (patch)
treecf08efd34144ab1c64380a3db4a47c6b0a9d0aa2 /src
parent23b2a2f6be825f020a7008886872cbda5f881bd4 (diff)
* Update mozclient/nspr to generate a version containing the gecko
version, such as 4.7.1~beta~1.9b5~cvs20080310t1054 - update src/nspr.mk.in
Diffstat (limited to 'src')
-rw-r--r--src/nspr.mk.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nspr.mk.in b/src/nspr.mk.in
index 8f8de94..8518ed1 100644
--- a/src/nspr.mk.in
+++ b/src/nspr.mk.in
@@ -20,12 +20,11 @@
MOZCLIENT_TARGET := nspr-orig
MOZCLIENT_APPNAME := nspr
MOZCLIENT_PROJECT := $(NULL)
-MOZCLIENT_MODULES := mozilla/nsprpub
+MOZCLIENT_MODULES := mozilla/nsprpub mozilla/config/milestone.txt
MOZCLIENT_FILE := mozilla/nsprpub/pr/include/prinit.h
-MOZCLIENT_GETVERSION := grep -E '^\#define PR_VERSION' $(MOZCLIENT_FILE) | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/ */~/g' -e 's/$$/~/'
+MOZCLIENT_GETVERSION := ( grep -E '^\#define PR_VERSION' mozilla/nsprpub/pr/include/prinit.h | cut -d\" -f2 | tr 'A-Z' 'a-z' | sed -e 's/ */~/g' -e 's/$$/~/' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre//') | tr -d '\n'
MOZCLIENT_URL := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fnsprpub&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=explicit&mindate=1177522884&maxdate=1588258884&cvsroot=%2Fcvsroot'
MOZCLIENT_GETDATE = wget -O - -q --read-timeout=10 --user-agent='' --tries=3 $(MOZCLIENT_URL) 2> /dev/null | grep "href='http://webtools" | head -1 | tr '<>' '@' | cut -d@ -f5 | tr -d ':-' | sed -e 's/&nbsp;/t/'
MOZCLIENT_WANTMOZDIR := 1
-$(info $(MOZCLIENT_GETVERSION))
include mozclient.mk.in