ryanc/lume
1
0
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

Add revisions to packages

Browse Source
This commit is contained in:
Ryan Cavicchioni 2021-04-16 21:09:38 +00:00
parent c01c342945
commit 8cc556024f
Signed by: ryanc
GPG Key ID: 877EEDAF9245103D
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -6,11 +6,14 @@ DESTDIR=bin
BUILDDIR=$(CURDIR)/build BUILDDIR=$(CURDIR)/build
MANDIR=$(PREFIX)/share/man/man1 MANDIR=$(PREFIX)/share/man/man1
PKGREVISION=1
DEBBUILDDIR=$(BUILDDIR)/deb DEBBUILDDIR=$(BUILDDIR)/deb
DEBTMPLDIR=$(CURDIR)/packaging/debian DEBTMPLDIR=$(CURDIR)/packaging/debian
DEBDATE=$(shell date -R) DEBDATE=$(shell date -R)
DEBORIGSRC=lume_$(DEBVERSION).orig.tar.xz DEBORIGSRC=lume_$(DEBVERSION).orig.tar.xz
DEBORIGSRCDIR=lume-$(DEBVERSION) DEBORIGSRCDIR=lume-$(DEBVERSION)
DEBREVISION=$(PKGREVISION)
RPMVERSION=$(subst -,_,$(LUME_VERSION)) RPMVERSION=$(subst -,_,$(LUME_VERSION))
RPMBUILDDIR=$(BUILDDIR)/rpm RPMBUILDDIR=$(BUILDDIR)/rpm
@ -18,6 +21,7 @@ RPMTMPLDIR=$(CURDIR)/packaging/rpm
RPMDATE=$(shell date "+%a %b %d %Y") RPMDATE=$(shell date "+%a %b %d %Y")
RPMORIGSRC=lume-$(RPMVERSION).tar.xz RPMORIGSRC=lume-$(RPMVERSION).tar.xz
RPMORIGSRCDIR=lume-$(RPMVERSION) RPMORIGSRCDIR=lume-$(RPMVERSION)
RPMREVISION=$(PKGREVISION)
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
EXE=$(BINDIR)/lume.exe EXE=$(BINDIR)/lume.exe
@ -60,15 +64,15 @@ install: install-man
$(Q) install -p -D -m 0644 .lumerc.sample $(DESTDIR)${PREFIX}/share/lume/lumerc $(Q) install -p -D -m 0644 .lumerc.sample $(DESTDIR)${PREFIX}/share/lume/lumerc
.PHONY: deb .PHONY: deb
deb: deb: deb-clean
$(Q) mkdir -p $(DEBBUILDDIR) $(Q) mkdir -p $(DEBBUILDDIR)
$(Q) git archive --format tar --prefix lume-$(DEBVERSION)/ $(LUME_VERSION) | xz > $(DEBBUILDDIR)/$(DEBORIGSRC) $(Q) git archive --format tar --prefix lume-$(DEBVERSION)/ $(LUME_VERSION) | xz > $(DEBBUILDDIR)/$(DEBORIGSRC)
$(Q) tar xf $(DEBBUILDDIR)/$(DEBORIGSRC) -C $(DEBBUILDDIR) $(Q) tar xf $(DEBBUILDDIR)/$(DEBORIGSRC) -C $(DEBBUILDDIR)
$(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian $(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian
$(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source $(Q) mkdir $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source
$(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' $(DEBTMPLDIR)/rules > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules $(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' -e 's/__REVISION__/$(DEBREVISION)/g' $(DEBTMPLDIR)/rules > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules
$(Q) chmod 0755 $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules $(Q) chmod 0755 $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/rules
$(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' -e 's/__DATE__/$(DEBDATE)/g' $(DEBTMPLDIR)/changelog > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/changelog $(Q) sed -e 's/__VERSION__/$(DEBVERSION)/g' -e 's/__DATE__/$(DEBDATE)/g' -e 's/__REVISION__/$(DEBREVISION)/g' $(DEBTMPLDIR)/changelog > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/changelog
$(Q) echo 10 > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/compat $(Q) echo 10 > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/compat
$(Q) echo "3.0 (quilt)" > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source/format $(Q) echo "3.0 (quilt)" > $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/source/format
$(Q) cp $(DEBTMPLDIR)/control $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/control $(Q) cp $(DEBTMPLDIR)/control $(DEBBUILDDIR)/$(DEBORIGSRCDIR)/debian/control
@ -82,10 +86,10 @@ deb:
$(Q) mv $(DEBBUILDDIR)/*.tar.* $(BUILDDIR) $(Q) mv $(DEBBUILDDIR)/*.tar.* $(BUILDDIR)
.PHONY: rpm .PHONY: rpm
rpm: rpm: rpm-clean
$(Q) mkdir -p $(RPMBUILDDIR)/SPECS $(Q) mkdir -p $(RPMBUILDDIR)/SPECS
$(Q) mkdir -p $(RPMBUILDDIR)/SOURCES $(Q) mkdir -p $(RPMBUILDDIR)/SOURCES
$(Q) sed -e 's/__VERSION__/$(RPMVERSION)/g' -e 's/__DATE__/$(RPMDATE)/g' $(RPMTMPLDIR)/lume.spec > $(RPMBUILDDIR)/SPECS/lume.spec $(Q) sed -e 's/__VERSION__/$(RPMVERSION)/g' -e 's/__DATE__/$(RPMDATE)/g' -e 's/__REVISION__/$(RPMREVISION)/g' $(RPMTMPLDIR)/lume.spec > $(RPMBUILDDIR)/SPECS/lume.spec
$(Q) git archive --format tar --prefix $(RPMORIGSRCDIR)/ $(LUME_VERSION) | xz > $(RPMBUILDDIR)/SOURCES/$(RPMORIGSRC) $(Q) git archive --format tar --prefix $(RPMORIGSRCDIR)/ $(LUME_VERSION) | xz > $(RPMBUILDDIR)/SOURCES/$(RPMORIGSRC)
$(Q) rpmbuild --define "_topdir $(RPMBUILDDIR)" -ba $(RPMBUILDDIR)/SPECS/lume.spec $(Q) rpmbuild --define "_topdir $(RPMBUILDDIR)" -ba $(RPMBUILDDIR)/SPECS/lume.spec
$(Q) mv $(RPMBUILDDIR)/RPMS/*/*.rpm $(BUILDDIR) $(Q) mv $(RPMBUILDDIR)/RPMS/*/*.rpm $(BUILDDIR)

2
packaging/debian/changelog
View File

@ -1,4 +1,4 @@
lume (__VERSION__) unstable; urgency=medium lume (__VERSION__-__REVISION__) unstable; urgency=medium
* Package generated with make deb * Package generated with make deb

3
packaging/debian/rules
View File

@ -2,7 +2,8 @@
DISTRIBUTION = $(shell lsb_release -sr) DISTRIBUTION = $(shell lsb_release -sr)
VERSION = __VERSION__ VERSION = __VERSION__
PACKAGEVERSION = $(VERSION) REVISION = __REVISION__
PACKAGEVERSION = $(VERSION)-$(REVISION)
%: %:
dh $@ dh $@

2
packaging/rpm/lume.spec
View File

@ -1,6 +1,6 @@
Name: lume Name: lume
Version: __VERSION__ Version: __VERSION__
Release: 1%{?dist} Release: __REVISION__%{?dist}
Summary: A CLI tool for the LIFX HTTP API Summary: A CLI tool for the LIFX HTTP API
License: MPL License: MPL