Download as
Browse Code »

Commit b5d8a5ccb2dd6e3e32ffaa0dc78f67ecf84afe93

Authored by David Silva
1 parent ed6c7dc9
Exists in automates_core_packing

Gets package version from file

Showing 1 changed file with 14 additions and 16 deletions   Show diff stats
@@ -4,12 +4,10 @@ subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb @@ -4,12 +4,10 @@ subdirs = colab-spb-plugin colab-spb-theme-plugin noosfero-spb
4 noosfero_repo = 'git@softwarepublico.gov.br:softwarepublico/noosfero.git' 4 noosfero_repo = 'git@softwarepublico.gov.br:softwarepublico/noosfero.git'
5 colab_repo = 'https://github.com/colab/colab.git' 5 colab_repo = 'https://github.com/colab/colab.git'
6 6
7 -noosfero_remote_version = $(shell git ls-remote --tags $(noosfero_repo) | \  
8 - tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//') 7 +noosfero_version = $(shell sed -n '1,1p' ../CORE_VERSION)
9 #For some reason, the tag to use in the url request, is diferent from the 8 #For some reason, the tag to use in the url request, is diferent from the
10 #tag showed in gitlab interface. 9 #tag showed in gitlab interface.
11 -noosfero_gitlab_version = $(shell git ls-remote --tags ${noosfero_repo} | \  
12 - tail -n 1 | sed 's/^.*\///' | sed 's/\^{}//' | sed 's/+/%2B/') 10 +colab_version = $(shell sed -n '2,2p' ../CORE_VERSION)
13 11
14 dist_all = $(patsubst %, %-dist, $(subdirs)) 12 dist_all = $(patsubst %, %-dist, $(subdirs))
15 dist: $(dist_all) 13 dist: $(dist_all)
@@ -61,25 +59,25 @@ release_plugins: @@ -61,25 +59,25 @@ release_plugins:
61 59
62 packages=noosfero colab 60 packages=noosfero colab
63 core_packages = $(patsubst %, %-build, $(packages)) 61 core_packages = $(patsubst %, %-build, $(packages))
64 -noosfero_untar_project_name='noosfero.git'  
65 -colab_untar_project_name='colab-master'  
66 62
67 $(core_packages) : %-build : 63 $(core_packages) : %-build :
68 @if [ "$*" == 'noosfero' ]; then \ 64 @if [ "$*" == 'noosfero' ]; then \
69 wget https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/repository/archive.tar.gz?ref=stable-spb-1.3 \ 65 wget https://softwarepublico.gov.br/gitlab/softwarepublico/noosfero/repository/archive.tar.gz?ref=stable-spb-1.3 \
70 - --no-check-certificate -O pkg-rpm/$*/$*-12345.tar.gz ; \ 66 + --no-check-certificate -O pkg-rpm/$*/$*-$(noosfero_version).tar.gz ; \
71 else \ 67 else \
72 - wget https://github.com/colab/colab/archive/master.tar.gz -O pkg-rpm/$*/$*-12345.tar.gz; \ 68 + wget https://github.com/colab/colab/archive/master.tar.gz -O pkg-rpm/$*/$*-$(colab_version).tar.gz; \
73 fi 69 fi
74 - tar -xf pkg-rpm/$*/$*-12345.tar.gz -C pkg-rpm/$*/  
75 - rm pkg-rpm/$*/$*-12345.tar.gz 70 + tar -xf pkg-rpm/$*/*.tar.gz -C pkg-rpm/$*/
  71 + rm pkg-rpm/$*/*.tar.gz
76 @if [ "$*" == 'noosfero' ]; then \ 72 @if [ "$*" == 'noosfero' ]; then \
77 - mv pkg-rpm/$*/$*{.git,-12345}; \  
78 - (cd pkg-rpm/$*/ && tar -zcf $*-12345.tar.gz $*-12345 && rm -rf $*-12345); \ 73 + mv pkg-rpm/$*/$*{.git,-$(noosfero_version)}; \
  74 + (cd pkg-rpm/$*/ && tar -zcf $*-$(noosfero_version).tar.gz $*-$(noosfero_version) && rm -rf $*-$(noosfero_version)); \
  75 + sed -i -e 's/^\(Version:\s*\).*/\1$(noosfero_version)/' \
  76 + pkg-rpm/$*/$*.spec; \
79 else \ 77 else \
80 - mv pkg-rpm/$*/$*-{master,12345}; \  
81 - (cd pkg-rpm/$*/ && tar -zcf $*-12345.tar.gz $*-12345 && rm -rf $*-master-12345) \ 78 + mv pkg-rpm/$*/$*-{master,$(colab_version)}; \
  79 + (cd pkg-rpm/$*/ && tar -zcf $*-$(colab_version).tar.gz $*-$(colab_version) && rm -rf $*-$(colab_version)); \
  80 + sed -i -e 's/^\(Version:\s*\).*/\1$(colab_version)/' \
  81 + pkg-rpm/$*/$*.spec; \
82 fi 82 fi
83 - sed -i -e 's/^\(Version:\s*\).*/\112345/' \  
84 - pkg-rpm/$*/$*.spec  
85 $(MAKE) -C pkg-rpm/ $*-build 83 $(MAKE) -C pkg-rpm/ $*-build