From 8d94253e2cccbcb4f5217e3a4f82fd691f4c824d Mon Sep 17 00:00:00 2001 From: Fabien Tassin Date: Mon, 19 May 2008 18:28:22 +0200 Subject: * Add a mozclient-version target producing a VERSION=foo string on stdout - update src/mozclient.mk.in * Fix nspr and nss conf files to fetch xulrunner versdion file using MOZCLIENT_FILE instead of MOZCLIENT_MODULES - update src/nspr.mk.in - update src/nss.mk.in --- src/nss.mk.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nss.mk.in') diff --git a/src/nss.mk.in b/src/nss.mk.in index 2436a0e..7a33ad9 100644 --- a/src/nss.mk.in +++ b/src/nss.mk.in @@ -21,8 +21,8 @@ MOZCLIENT_TARGET := nss-orig MOZCLIENT_APPNAME := nss MOZCLIENT_PROJECT := $(NULL) 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 -E '^\#define NSS_V(MAJOR|MINOR|PATCH)' $(MOZCLIENT_FILE) | awk '{print $$3}' | tr '\n' '.' | sed -e 's,\.$$,,' +MOZCLIENT_FILE := mozilla/security/nss/lib/nss/nss.h mozilla/config/milestone.txt +MOZCLIENT_GETVERSION := ( grep -E '^\#define NSS_V(MAJOR|MINOR|PATCH)' $(MOZCLIENT_FILE) | awk '{print $$3}' | tr '\n' '.' | sed -e 's,\.$$,+,' ; tail -1 mozilla/config/milestone.txt | sed -e 's/pre//') | tr -d '\n' MOZCLIENT_URL := 'http://bonsai.mozilla.org/cvsquery.cgi?treeid=NSS&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Fdbm+mozilla%2Fsecurity%2Fnss+mozilla%2Fsecurity%2Fcoreconf+mozilla%2Fsecurity%2Fdbm&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=month&mindate=&maxdate=&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/ /t/' MOZCLIENT_WANTMOZDIR := 1 -- cgit v1.2.3