From e0414901988a12d32d23b901a76a2c725ea49cc8 Mon Sep 17 00:00:00 2001 From: David Carlos Date: Tue, 19 Jan 2016 15:19:24 -0200 Subject: [PATCH] Packing noosfero using last created tag --- src/Makefile | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 7d7e2b9..149884c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,13 +1,13 @@ VERSION = $(shell cat ../VERSION) -VERSION = $(shell cat ../VERSION) subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb -NOOSFERO_REPO = 'git@softwarepublico.gov.br:softwarepublico/noosfero.git' -FILTER_LAST_TAG = $(shell tail -n 1 | sed 's/^.*\///') -NOOSFERO_REMOTE_VERSION = $(shell git ls-remote --tags 'git@softwarepublico.gov.br:softwarepublico/noosfero.git' | tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//') -NOOSFERO_GITLAB_VERSION = $(shell git ls-remote --tags 'git@softwarepublico.gov.br:softwarepublico/noosfero.git' | tail -n 1 | sed 's/^.*\///'| sed 's/+/%2B/' | sed 's/\^{}//') -#NOOSFERO_GITLAB_VERSION = $(shell $(NOOSFERO_REMOTE_VERSION) | sed 's/+/%2B/') -ACTUAL_NOOSFERO_VERSION = $(shell cat pkg-rpm/noosfero/noosfero.spec | grep Version | sed 's/^.*\s//') +noosfero_repo = 'git@softwarepublico.gov.br:softwarepublico/noosfero.git' +NOOSFERO_REMOTE_VERSION = $(shell git ls-remote --tags $(noosfero_repo) | \ + tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//') +#For some reason, the tag to use in the url request, is diferent from the +#tag showed in gitlab interface. +NOOSFERO_GITLAB_VERSION = $(shell git ls-remote --tags ${noosfero_repo} | \ + tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//' | sed 's/+/%2B/') dist_all = $(patsubst %, %-dist, $(subdirs)) dist: $(dist_all) @@ -58,6 +58,10 @@ release_plugins: release_noosfero: wget https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/repository/archive.tar.gz?ref=$(NOOSFERO_GITLAB_VERSION) --no-check-certificate -O pkg-rpm/noosfero/noosfero-$(NOOSFERO_REMOTE_VERSION).tar.gz + tar -xf pkg-rpm/noosfero/noosfero-$(NOOSFERO_REMOTE_VERSION).tar.gz -C pkg-rpm/noosfero/ + rm pkg-rpm/noosfero/noosfero-$(NOOSFERO_REMOTE_VERSION).tar.gz + mv pkg-rpm/noosfero/noosfero{.git,-$(NOOSFERO_REMOTE_VERSION)} + (cd pkg-rpm/noosfero/ && tar -zcf noosfero-$(NOOSFERO_REMOTE_VERSION).tar.gz noosfero-$(NOOSFERO_REMOTE_VERSION) && rm -rf noosfero-$(NOOSFERO_REMOTE_VERSION)) sed -i -e 's/^\(Version:\s*\).*/\1$(NOOSFERO_REMOTE_VERSION)/' \ pkg-rpm/noosfero/noosfero.spec $(MAKE) -C pkg-rpm/ noosfero-build -- libgit2 0.21.2