From bed561fbee8fb75deb7f9e7d76bf9014f162d770 Mon Sep 17 00:00:00 2001 From: Greg Blomquist Date: Tue, 24 Jun 2008 18:14:39 -0400 Subject: Added Makefile to everestd to build RPM from tools directory Updated everestd Rakefile to clean the gem package data before RPM build Updated cloudmasterd Rakefile to correctly clean the gem package data before RPM build --- cloudmasterd/Makefile | 2 +- everestd/Makefile | 34 ++++++++++++++++++++++++++++++++++ everestd/Rakefile | 1 + 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 everestd/Makefile diff --git a/cloudmasterd/Makefile b/cloudmasterd/Makefile index 7f58763..71ce272 100644 --- a/cloudmasterd/Makefile +++ b/cloudmasterd/Makefile @@ -25,7 +25,7 @@ rpm: clean gem $(RPM_TOPDIR) $(SPECFILE) $(RPMBUILD) --clean $(RPM_OPTS) -bb $(SPECFILE) gem: - rake clean package + rake clobber_package package clean: @rm -rfv *~ *.rpm $(RPM_TOPDIR) $(ARCHIVE) diff --git a/everestd/Makefile b/everestd/Makefile new file mode 100644 index 0000000..b87d44e --- /dev/null +++ b/everestd/Makefile @@ -0,0 +1,34 @@ +NAME := everestd +SPECFILE = extra/$(NAME).spec +VERSION := $(shell rpm -q --qf "%{VERSION}\n" --specfile $(SPECFILE)| head -1) +RELEASE := $(shell rpm -q --qf "%{RELEASE}\n" --specfile $(SPECFILE)| head -1) +UPSTREAM_NAME = $(PROJECT) + +TAG = $(subst .,_,$(NAME)-$(VERSION)-$(RELEASE)) + +CVS = cvs +RPMBUILD = rpmbuild +INSTALL = /usr/bin/install +INSTALL_DIR = $(INSTALL) --verbose -d -m 755 + +RPM_TOPDIR = /tmp/$(NAME)-$(VERSION)-$(RELEASE)-build +_RPM_OPTS = --define "_topdir $(RPM_TOPDIR)" \ + --define "_builddir %{_topdir}" \ + --define "_sourcedir $(shell pwd)/pkg" \ + --define "_specdir $(shell pwd)" \ + --define "_rpmdir $(shell pwd)" \ + --define "_srcrpmdir $(shell pwd)" \ + --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' +RPM_OPTS = $(strip $(_RPM_OPTS)) + +rpm: clean gem $(RPM_TOPDIR) $(SPECFILE) + $(RPMBUILD) --clean $(RPM_OPTS) -bb $(SPECFILE) + +gem: + rake clobber_package package + +clean: + @rm -rfv *~ *.rpm $(RPM_TOPDIR) $(ARCHIVE) + +$(RPM_TOPDIR): + @$(INSTALL_DIR) $@ diff --git a/everestd/Rakefile b/everestd/Rakefile index 82d5030..8d55c9c 100644 --- a/everestd/Rakefile +++ b/everestd/Rakefile @@ -1,5 +1,6 @@ require 'rubygems' require 'rake/gempackagetask' +require 'rake/clean' require 'rubygems/specification' require 'date' -- cgit