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/mozclient.mk.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/mozclient.mk.in') 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) -- cgit v1.2.3