[csw-devel] SF.net SVN: gar:[12269] csw/mgar/gar/v2-uwatch2/gar.lib.mk
wbonnet at users.sourceforge.net
wbonnet at users.sourceforge.net
Sun Jan 9 00:13:49 CET 2011
Revision: 12269
http://gar.svn.sourceforge.net/gar/?rev=12269&view=rev
Author: wbonnet
Date: 2011-01-08 23:13:48 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Rename target get-current-version to get-gar-version. It's logical since displayed version is version from local build description.
Modified Paths:
--------------
csw/mgar/gar/v2-uwatch2/gar.lib.mk
Modified: csw/mgar/gar/v2-uwatch2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:01:38 UTC (rev 12268)
+++ csw/mgar/gar/v2-uwatch2/gar.lib.mk 2011-01-08 23:13:48 UTC (rev 12269)
@@ -249,6 +249,7 @@
########################################################
# Retrieve the newest upstream version
#
+LATESTVERSION:=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS))
get-upstream-latest-version:
@if [ '$(ENABLE_UPSTREAM_WATCH)' -ne '1' ] ; then \
echo "$(NAME) - Upstream Watch is disabled" ; \
@@ -265,9 +266,9 @@
echo "$(NAME) - Error VERSION is not set" ; \
false; \
fi; \
- LATESTVERSION:=$(shell http_proxy=$(http_proxy) ftp_proxy=$(ftp_proxy) $(GARBIN)/upstream_watch get-upstream-latest-version $(UW_ARGS) $(REGEXP_ARGS)); \
- if [ -n "$$LATESTVERSION" ] ; then \
- echo $$LATESTVERSION ; \
+ LATEST=$(LATESTVERSION) ; \
+ if [ -n "$$LATEST" ] ; then \
+ echo $$LATEST ; \
else \
echo "No version found. Please check UPSTREAM_MASTER_SITES and UFILES_REGEX variables in the Makefile" ; \
fi ; \
@@ -345,12 +346,12 @@
########################################################
#
-get-current-version:
+get-gar-version:
@if [ ! -n '$(VERSION)' ]; then \
echo "$(NAME) - VERSION is not defined" ; \
false; \
else \
- echo "$(NAME) - Current version is $(VERSION)" ; \
+ echo "$(NAME) - GAR version is $(VERSION)" ; \
fi ;
upgrade-to-latest-upstream-%:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list