Download as
Browse Code »

Commit e345f97a6c96fdacdbc71f55f14c4731c4d82d71

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

Fix installation/update

Showing 2 changed files with 3 additions and 5 deletions   Show diff stats
Makefile
  Diff comments   View file @e345f97
... ... @@ -3,11 +3,10 @@ TARBALL = noosfero-deps-$(VERSION).tar.gz
3 3 PREFIX = /usr
4 4 WGET = wget
5 5 NOOSFERO_BRANCH = master
6   -BUNDLE_OPTS = --verbose --without='development test'
  6 +BUNDLE_OPTS = --verbose --without='development test cucumber' --deployment
7 7  
8 8 all:
9   - mkdir -p vendor/prototype_legacy_helper
10   - bundle install $(BUNDLE_OPTS) --local --deployment
  9 + bundle install $(BUNDLE_OPTS) --local
11 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|'
12 11  
13 12 dist: $(TARBALL)
... ... @@ -17,7 +16,6 @@ $(TARBALL):
17 16  
18 17 install: all
19 18 mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor
20   - mkdir -p $(DESTDIR)$(PREFIX)/lib/noosfero/vendor/prototype_legacy_helper
21 19 install -m 0644 Gemfile $(DESTDIR)$(PREFIX)/lib/noosfero
22 20 install -m 0644 Gemfile.lock $(DESTDIR)$(PREFIX)/lib/noosfero
23 21 cp -r .bundle $(DESTDIR)$(PREFIX)/lib/noosfero/.bundle
... ... @@ -25,7 +23,7 @@ install: all
25 23  
26 24 update: clean
27 25 $(WGET) -O Gemfile https://gitlab.com/noosfero/noosfero/raw/$(NOOSFERO_BRANCH)/Gemfile
28   - bundle install $(BUNDLE_OPTS) --path vendor/bundle
  26 + bundle install $(BUNDLE_OPTS)
29 27  
30 28 clean:
31 29 $(RM) -r .bundle/ vendor/bundle/ $(TARBALL)
... ...
vendor/prototype_legacy_helper/.gitkeep 0 → 100644
  Diff comments   View file @e345f97