[csw-devel] SF.net SVN: gar:[21242] csw/mgar/gar/v2

[pfelecan at users.sourceforge.net]

Revision: 21242
          http://gar.svn.sourceforge.net/gar/?rev=21242&view=rev
Author:   pfelecan
Date:     2013-06-03 08:51:06 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
.buildsys/v2: changed GITHUB_BRANCH to GITHUB_REFERENCE as per Maciej
suggestion and tweaked the download process.

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.mk
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2013-06-03 07:55:31 UTC (rev 21241)
+++ csw/mgar/gar/v2/gar.conf.mk	2013-06-03 08:51:06 UTC (rev 21242)
@@ -767,8 +767,8 @@
 ifdef GITHUB_USER
 GITHUB_PROJECT	?=	$(NAME)
 GITHUB_BALL		?=	tar
-GITHUB_BRANCH	?=	master
-GITHUB_MIRROR	?=	https://$(GITHUB_HOST)/repos/$(GITHUB_USER)/$(GITHUB_PROJECT)/$(GITHUB_BALL)ball/$(GITHUB_BRANCH)
+GITHUB_REFERENCE?=	master
+GITHUB_MIRROR	?=	https://$(GITHUB_HOST)/repos/$(GITHUB_USER)/$(GITHUB_PROJECT)/$(GITHUB_BALL)ball/$(GITHUB_REFERENCE)
 GITHUB_BALL_EXT	:=	.$(GITHUB_BALL)
 ifeq ($(GITHUB_BALL),tar)
 GITHUB_BALL_EXT	:=	$(GITHUB_BALL_EXT).gz

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2013-06-03 07:55:31 UTC (rev 21241)
+++ csw/mgar/gar/v2/gar.lib.mk	2013-06-03 08:51:06 UTC (rev 21242)
@@ -60,9 +60,10 @@
 			$(MAKE) -s `echo $$i | tr -d :` || continue; \
 			case $$i in \
 				*$(GITHUB_HOST)*) \
-				mv $(PARTIALDIR)/$(GITHUB_BRANCH) $(PARTIALDIR)/$(DISTNAME)$(GITHUB_BALL_EXT) ;; \
+					mv $(PARTIALDIR)/$(GITHUB_REFERENCE) $@ ;; \
+				*) \
+					mv $(PARTIALDIR)/$* $@ ;; \
 			esac; \
-			mv $(PARTIALDIR)/$* $@; \
 			break; \
 		done; ) 2>&1 | grep -v '^$(MAKE)'; \
 		if test -r $@ ; then : ; else \

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.