From 4078ca33cc467d3d3a72df23832466ccf59dabab Mon Sep 17 00:00:00 2001 From: Lucas Kanashiro Date: Thu, 14 Jan 2016 16:49:19 -0200 Subject: [PATCH] Use unified version, start to use 'make release' --- src/colab-spb-plugin/setup.py | 2 +- src/colab-spb-theme-plugin/Makefile | 2 +- src/noosfero-spb/Makefile | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/colab-spb-plugin/setup.py b/src/colab-spb-plugin/setup.py index e2b8061..fbb0b1c 100644 --- a/src/colab-spb-plugin/setup.py +++ b/src/colab-spb-plugin/setup.py @@ -15,7 +15,7 @@ version = open('VERSION').read().strip() setup( name='colab-spb-plugin', - version='0.2.6', + version=version, author='Macartur Sousa', author_email='macartur.sc@gmail.com', url='https://portal.softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/', diff --git a/src/colab-spb-theme-plugin/Makefile b/src/colab-spb-theme-plugin/Makefile index 5115791..a86e37b 100644 --- a/src/colab-spb-theme-plugin/Makefile +++ b/src/colab-spb-theme-plugin/Makefile @@ -1,5 +1,5 @@ PACKAGE = colab-spb-theme -VERSION = 0.3.12 +VERSION = $(shell cat VERSION) DISTDIR = dist PACKAGE_NAME = $(PACKAGE)-$(VERSION) TARBALL = $(PACKAGE_NAME).tar.gz diff --git a/src/noosfero-spb/Makefile b/src/noosfero-spb/Makefile index 84b8a85..649a2f1 100644 --- a/src/noosfero-spb/Makefile +++ b/src/noosfero-spb/Makefile @@ -1,5 +1,5 @@ PACKAGE = noosfero-spb -VERSION = 4.2.13 +VERSION = $(shell cat VERSION) DISTDIR = $(PACKAGE)-$(VERSION) TARBALL = $(DISTDIR).tar.gz @@ -11,9 +11,10 @@ themes_dir=/usr/lib/noosfero/public/designs/themes noosfero_dir=/usr/lib/noosfero dist: clean - mkdir $(DISTDIR) - tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd $(DISTDIR) && tar xaf -) - tar --exclude=.git -czf $(TARBALL) $(DISTDIR) + mkdir -p dist/$(DISTDIR) + tar --exclude=.git --exclude=$(DISTDIR) -cf - * | (cd dist/$(DISTDIR) && tar xaf -) + cd dist/ && tar --exclude=.git -czf $(TARBALL) $(DISTDIR) + $(RM) -r $(DISTDIR) clean: $(RM) -r dist/ -- libgit2 0.21.2