diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mozclient.mk.in | 7 | ||||
-rw-r--r-- | src/nspr.mk.in | 4 | ||||
-rw-r--r-- | src/nss.mk.in | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/src/mozclient.mk.in b/src/mozclient.mk.in index 9f7369c..f2b826d 100644 --- a/src/mozclient.mk.in +++ b/src/mozclient.mk.in @@ -155,12 +155,17 @@ mozclient-status: list-tags list-tags: mozclient-deps mozclient-dir ifeq ($(MOZCLIENT_VCS),cvs) cd $(MOZCLIENT_TMP) && cvs -d $(MOZCLIENT_CVS_LOC) co $(MOZCLIENT_FILE) - cd $(MOZCLIENT_TMP)/mozilla && cvs status -v $(subst mozilla/,,$(MOZCLIENT_FILE)) + cd $(MOZCLIENT_TMP)/mozilla && cvs status -v $(firstword $(subst mozilla/,,$(MOZCLIENT_FILE))) else $(error '$@' not supported for '$(MOZCLIENT_VCS)' yet) endif rm -rf $(MOZCLIENT_TMP) +# Get version, and just that +mozclient-version: mozclient-deps mozclient-dir + cd $(MOZCLIENT_TMP) && cvs -d $(MOZCLIENT_CVS_LOC) co $(MOZCLIENT_FILE) + cd $(MOZCLIENT_TMP) && echo -n VERSION= && $(MOZCLIENT_GETVERSION) + # Patch # - don't patch when a branch name is specified mozclient-patch: $(MOZCLIENT_TMP)/$(MOZCLIENT_STAMP) diff --git a/src/nspr.mk.in b/src/nspr.mk.in index 438b64a..4c7c5d8 100644 --- a/src/nspr.mk.in +++ b/src/nspr.mk.in @@ -20,8 +20,8 @@ MOZCLIENT_TARGET := nspr-orig MOZCLIENT_APPNAME := nspr MOZCLIENT_PROJECT := $(NULL) -MOZCLIENT_MODULES := mozilla/nsprpub mozilla/config/milestone.txt -MOZCLIENT_FILE := mozilla/nsprpub/pr/include/prinit.h +MOZCLIENT_MODULES := mozilla/nsprpub +MOZCLIENT_FILE := mozilla/nsprpub/pr/include/prinit.h mozilla/config/milestone.txt 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//') | 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/ /t/' 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 |