summaryrefslogtreecommitdiff
path: root/src/nspr.mk.in
diff options
context:
space:
mode:
authorFabien Tassin <fta@sofaraway.org>2008-03-10 21:52:03 +0100
committerFabien Tassin <fta@sofaraway.org>2008-03-10 21:52:03 +0100
commit23b2a2f6be825f020a7008886872cbda5f881bd4 (patch)
tree4c30e64a28bf80d249c8f1fb0326b500729fdcba /src/nspr.mk.in
parent6919bbd4e32fdd547224a52f354c97af1fc1f819 (diff)
* Change nspr version in mozclient to contain the full version from upstream
- update src/nspr.mk.in
Diffstat (limited to 'src/nspr.mk.in')
-rw-r--r--src/nspr.mk.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/nspr.mk.in b/src/nspr.mk.in
index 1233245..8f8de94 100644
--- a/src/nspr.mk.in
+++ b/src/nspr.mk.in
@@ -1,6 +1,6 @@
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright (c) 2007 Fabien Tassin <fta@sofaraway.org>
+# Copyright (c) 2007-2008 Fabien Tassin <fta@sofaraway.org>
# Description: Project NSPR
#
# This program is free software; you can redistribute it and/or
@@ -21,10 +21,11 @@ MOZCLIENT_TARGET := nspr-orig
MOZCLIENT_APPNAME := nspr
MOZCLIENT_PROJECT := $(NULL)
MOZCLIENT_MODULES := mozilla/nsprpub
-MOZCLIENT_FILE := mozilla/nsprpub/configure.in
-MOZCLIENT_GETVERSION := grep -E '^MOD_(MAJOR|MINOR|PATCH)_VERSION' $(MOZCLIENT_FILE) | cut -d= -f2 | tr '\n' '.' | sed -e 's,\.$$,~,'
+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_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