Download as
Browse Code »

Commit 7749ec9deb1432ed52f75660096ce962a6e572a0

Authored by Antonio Terceiro
1 parent 68f57ff3
Exists in master and in 3 other branches deps_rails4, rails4, update_noosfero_deps

fix Makefile again

Showing 1 changed file with 6 additions and 3 deletions   Show diff stats
@@ -3,10 +3,10 @@ TARBALL = noosfero-deps-$(VERSION).tar.gz @@ -3,10 +3,10 @@ TARBALL = noosfero-deps-$(VERSION).tar.gz
3 PREFIX = /var 3 PREFIX = /var
4 WGET = wget 4 WGET = wget
5 NOOSFERO_BRANCH = master 5 NOOSFERO_BRANCH = master
6 -BUNDLE_OPTS = --verbose --without='development test cucumber' --deployment 6 +BUNDLE_OPTS = --verbose --without='development test cucumber'
7 7
8 all: 8 all:
9 - bundle install $(BUNDLE_OPTS) --local 9 + bundle install $(BUNDLE_OPTS) --local --deployment
10 grep -rl '/usr/local/bin/ruby' vendor/bundle/ruby/gems/*/ | xargs --no-run-if-empty sed -i -e '1,2 s|.*|#!/usr/bin/env ruby|' 10 grep -rl '/usr/local/bin/ruby' vendor/bundle/ruby/gems/*/ | xargs --no-run-if-empty sed -i -e '1,2 s|.*|#!/usr/bin/env ruby|'
11 11
12 dist: $(TARBALL) 12 dist: $(TARBALL)
@@ -23,7 +23,10 @@ install: all @@ -23,7 +23,10 @@ install: all
23 23
24 update: clean 24 update: clean
25 $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile 25 $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile
26 - bundle install $(BUNDLE_OPTS) 26 + $(RM) Gemfile.lock
  27 + bundle install $(BUNDLE_OPTS) --path vendor/bundle
  28 + mkdir -p vendor/cache
  29 + rsync -avp --delete --quiet vendor/bundle/*/*/cache/ vendor/cache/
27 30
28 clean: 31 clean:
29 $(RM) -r .bundle/ vendor/bundle/ $(TARBALL) 32 $(RM) -r .bundle/ vendor/bundle/ $(TARBALL)