openstack
/
fuel-web
Code Issues Proposed changes

bundling Naily without building it; wipe potentially invalid caches

This commit is contained in:
Alexander Pavlenko 2013-04-15 19:48:12 +04:00
parent c81c92f0da
commit a9795ab95a
3 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mirror/gems/module.mk
View File

@ -8,17 +8,22 @@ $(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile:
$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: $(call depv,MIRROR_GEMS)
$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile: \
$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile.lock \
$(BUILD_DIR)/packages/gems/build.done \
$(BUILD_DIR)/packages/rpm/build.done
mkdir -p $(@D)
echo -n > $@
for i in $(MIRROR_GEMS); do \
echo "source \"file://$(LOCAL_MIRROR_GEMS)\"" >> $@; \
echo "source \"$$i\"" >> $@; \
done
echo "gem 'naily', '$(NAILY_VERSION)'" >> $@
echo "source \"file://$(LOCAL_MIRROR_GEMS)\"" >> $@
echo "gemspec :path => \"$(SOURCE_DIR)/naily\"" >> $@
$(ACTION.TOUCH)
$(BUILD_DIR)/mirror/gems/gems-bundle/naily/Gemfile.lock: \
$(SOURCE_DIR)/naily/Gemfile.lock
cp $(SOURCE_DIR)/naily/Gemfile.lock $@
$(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \
$(SOURCE_DIR)/requirements-gems.txt \
$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile \
@ -30,6 +35,7 @@ $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done: \
$(ACTION.TOUCH)
$(BUILD_DIR)/mirror/gems/gems-bundle.done: $(BUILD_DIR)/mirror/gems/gems-bundle-gemfile.done
find $(BUILD_DIR)/mirror/gems \( -name "naily*.gem*" -o -name "astute*.gem*" \) -exec rm '{}' \+
( cd $(BUILD_DIR)/mirror/gems/gems-bundle && bundle install --path=. && bundle package )
( cd $(BUILD_DIR)/mirror/gems/gems-bundle/naily && bundle install --path=. && bundle package )
( cd $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/ && \

3
naily/Gemfile Normal file
View File

@ -0,0 +1,3 @@
source 'https://rubygems.org'
gemspec

43
naily/Gemfile.lock Normal file
View File

@ -0,0 +1,43 @@
PATH
remote: .
specs:
naily (0.1.0)
amqp (= 0.9.10)
astute
json (= 1.6.1)
raemon (= 0.3.0)
symboltable (= 1.0.2)
GEM
specs:
activesupport (3.0.10)
amq-client (0.9.12)
amq-protocol (>= 1.2.0)
eventmachine
amq-protocol (1.2.0)
amqp (0.9.10)
amq-client (~> 0.9.12)
amq-protocol (~> 1.2.0)
eventmachine
astute (0.0.1)
activesupport (= 3.0.10)
mcollective-client (= 2.3.1)
symboltable (= 1.0.2)
eventmachine (1.0.3)
i18n (0.6.4)
json (1.6.1)
mcollective-client (2.3.1)
i18n
json
stomp
systemu
raemon (0.3.0)
stomp (1.2.8)
symboltable (1.0.2)
systemu (2.5.2)
PLATFORMS
ruby
DEPENDENCIES
naily!