openstack/fuel-main
Code Issues Proposed changes

[naily] Added naily module/gem to build system

Browse Source
This commit is contained in:
Maxim Kulkin 2012-10-03 19:13:14 +04:00
parent ddd48f38e6
commit ce62a3ee3e
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
BUILD_DIR:=build BUILD_DIR:=build
MODULES=gnupg bootstrap nailgun test os os/centos os/ubuntu iso packages/rpm MODULES=gnupg bootstrap nailgun test os os/centos os/ubuntu iso packages/rpm naily
.PHONY: all clean test test-unit help mirror FORCE .PHONY: all clean test test-unit help mirror FORCE

5
iso/module.mk
View File

@ -341,9 +341,10 @@ $(ISOROOT)/eggs:
mkdir -p $@ mkdir -p $@
cp $(LOCAL_MIRROR)/eggs/* $(ISOROOT)/eggs/ cp $(LOCAL_MIRROR)/eggs/* $(ISOROOT)/eggs/
$(ISOROOT)/gems/gems: $(ISOROOT)/gems/gems: $(BUILD_DIR)/gems/naily.gem
mkdir -p $@ mkdir -p $@
cp $(LOCAL_MIRROR)/gems/* $(ISOROOT)/gems/gems cp $(LOCAL_MIRROR)/gems/* $@
cp $(filter %.gem,$^) $@
gem generate_index -d $(ISOROOT)/gems gem generate_index -d $(ISOROOT)/gems
# MAIN ISO RULE # MAIN ISO RULE

11
naily/module.mk Normal file
View File

@ -0,0 +1,11 @@
/:=$(BUILD_DIR)/gems/
$/naily.gem: naily/naily.gemspec \
$(addprefix naily/bin/,$(call find-files,naily/bin)) \
$(addprefix naily/lib/,$(call find-files,naily/lib))
@mkdir -p $(@D)
cd $(<D) && \
gem build $(<F)
mv $(<D)/naily-*.gem $@