From 42bc23772059e663a8195a086e0b5b3c32366a92 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 27 May 2016 21:09:58 -0400 Subject: move everything into build-aux --- build-aux/Makefile.once.head/00-dist.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 build-aux/Makefile.once.head/00-dist.mk (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk new file mode 100644 index 0000000..5be9c72 --- /dev/null +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -0,0 +1,16 @@ +# Copyright (C) 2016 Luke Shumaker +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +$(_am)distexts ?= .tar.gz -- cgit v1.2.3-54-g00ecf From 7d1baa39157b6ab5e9f0cb6b5413f6fc1e2d4eea Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 May 2016 16:05:16 -0400 Subject: work on things --- build-aux/Makefile.each.tail/00-dist.mk | 2 +- build-aux/Makefile.once.head/00-dist.mk | 17 +---------------- build-aux/Makefile.once.tail/00-dist.mk | 30 +++++++++++++++++------------- 3 files changed, 19 insertions(+), 30 deletions(-) (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.each.tail/00-dist.mk b/build-aux/Makefile.each.tail/00-dist.mk index 042af23..1ab7568 100644 --- a/build-aux/Makefile.each.tail/00-dist.mk +++ b/build-aux/Makefile.each.tail/00-dist.mk @@ -14,5 +14,5 @@ # along with this program. If not, see . ifeq ($(outdir),$(topoutdir)) -$(_am)clean_files += $(addprefix $(PACKAGE)-*,$($(_am)distexts) /) +std.clean_files += $(addprefix $(PACKAGE)-*,$(dist.exts) /) endif diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk index 5be9c72..314f7f8 100644 --- a/build-aux/Makefile.once.head/00-dist.mk +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -1,16 +1 @@ -# Copyright (C) 2016 Luke Shumaker -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -$(_am)distexts ?= .tar.gz +dist.exts ?= .tar.gz diff --git a/build-aux/Makefile.once.tail/00-dist.mk b/build-aux/Makefile.once.tail/00-dist.mk index 2527404..d8fa226 100644 --- a/build-aux/Makefile.once.tail/00-dist.mk +++ b/build-aux/Makefile.once.tail/00-dist.mk @@ -17,10 +17,7 @@ .PHONY: dist dist: $(addprefix $(topoutdir)/$(PACKAGE)-$(VERSION),$($(_am)distexts) -$(topoutdir)/$(PACKAGE)-$(VERSION).tar: $(topoutdir)/$(PACKAGE)-$(VERSION) - $(TAR) cf $@ -C $( $@ + +CP ?= cp +GZIP ?= gzip +MKDIR ?= mkdir +MKDIR_P ?= mkdir -p +MV ?= mv +RM ?= rm -f +RMDIR_P ?= rmdir -p +TAR ?= tar +TRUE ?= true + +GZIP_ENV ?= --best -- cgit v1.2.3-54-g00ecf From cbe8694c76ea68d56073ffe3e74359a5db4d997a Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 May 2016 17:29:02 -0400 Subject: tidy --- build-aux/Makefile.each.tail/00-dist.mk | 4 +++- build-aux/Makefile.once.head/00-dist.mk | 36 +++++++++++++++++++++++++++++++++ build-aux/Makefile.once.tail/00-dist.mk | 26 +++++------------------- 3 files changed, 44 insertions(+), 22 deletions(-) (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.each.tail/00-dist.mk b/build-aux/Makefile.each.tail/00-dist.mk index 1ab7568..6e6a5cb 100644 --- a/build-aux/Makefile.each.tail/00-dist.mk +++ b/build-aux/Makefile.each.tail/00-dist.mk @@ -14,5 +14,7 @@ # along with this program. If not, see . ifeq ($(outdir),$(topoutdir)) -std.clean_files += $(addprefix $(PACKAGE)-*,$(dist.exts) /) +std.clean_files += $(addprefix $(PACKAGE)-*,$(dist.exts) .tar /) endif + +$(outdir)/dist: $(addprefix $(topoutdir)/$(PACKAGE)-$(VERSION),$(dist.exts)) diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk index 314f7f8..98fc6b3 100644 --- a/build-aux/Makefile.once.head/00-dist.mk +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -1 +1,37 @@ +# Copyright (C) 2015-2016 Luke Shumaker +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +# Developer configuration + dist.exts ?= .tar.gz +PACKAGE ?= YOUR_PACKAGE_NAME +VERSION ?= 0.0.1 + +# User configuration + +CP ?= cp +GZIP ?= gzip +MKDIR ?= mkdir +MKDIR_P ?= mkdir -p +MV ?= mv +RM ?= rm -f +TAR ?= tar + +GZIPFLAGS ?= $(GZIP_ENV) +GZIP_ENV ?= --best + +# Implementation + +at.phony += dist diff --git a/build-aux/Makefile.once.tail/00-dist.mk b/build-aux/Makefile.once.tail/00-dist.mk index d8fa226..ef3ecb1 100644 --- a/build-aux/Makefile.once.tail/00-dist.mk +++ b/build-aux/Makefile.once.tail/00-dist.mk @@ -13,32 +13,16 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -# Add the `dist` target -.PHONY: dist -dist: $(addprefix $(topoutdir)/$(PACKAGE)-$(VERSION),$($(_am)distexts) - -_am_copyfile = $(MKDIR_P) $(dir $2) && $(CP) -T $1 $2 -_am_addfile = $(call _am_copyfile,$3,$2/$(call _am_relto,$1,$3)) -$(topoutdir)/$(PACKAGE)-$(VERSION): $(_am_src_files/$(topoutdir)) $(_am_gen_files/$(topoutdir)) +_dist.copyfile = $(MKDIR_P) $(dir $2) && $(CP) -T $1 $2 +_dist.addfile = $(call _dist.copyfile,$3,$2/$(call at.relto,$1,$3)) +$(topoutdir)/$(PACKAGE)-$(VERSION): $(std.src_files/$(topoutdir)) $(std.gen_files/$(topoutdir)) $(RM) -r $@ @PS4='' && set -x && \ $(MKDIR) $(@D)/tmp.$(@F).$$$$ && \ - $(foreach f,$^,$(call _am_addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ + $(foreach f,$^,$(call _dist.addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ $(MV) $(@D)/tmp.$(@F).$$$$ $@ || $(RM) -r $(@D)/tmp.$(@F).$$$$ $(topoutdir)/$(PACKAGE)-$(VERSION).tar: $(topoutdir)/$(PACKAGE)-$(VERSION) $(TAR) cf $@ -C $( $@ - -CP ?= cp -GZIP ?= gzip -MKDIR ?= mkdir -MKDIR_P ?= mkdir -p -MV ?= mv -RM ?= rm -f -RMDIR_P ?= rmdir -p -TAR ?= tar -TRUE ?= true - -GZIP_ENV ?= --best + $(GZIP) $(GZIPFLAGS) < $< > $@ -- cgit v1.2.3-54-g00ecf From 37b88c702ebe46611435f528b087d82c53dfcc77 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 May 2016 17:37:41 -0400 Subject: rename PACKAGE->dist.name VERSION->dist.version --- build-aux/Makefile.each.tail/00-dist.mk | 4 ++-- build-aux/Makefile.once.head/00-dist.mk | 11 +++++++++-- build-aux/Makefile.once.tail/00-dist.mk | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.each.tail/00-dist.mk b/build-aux/Makefile.each.tail/00-dist.mk index 6e6a5cb..d85ecc0 100644 --- a/build-aux/Makefile.each.tail/00-dist.mk +++ b/build-aux/Makefile.each.tail/00-dist.mk @@ -14,7 +14,7 @@ # along with this program. If not, see . ifeq ($(outdir),$(topoutdir)) -std.clean_files += $(addprefix $(PACKAGE)-*,$(dist.exts) .tar /) +std.clean_files += $(addprefix $(dist.name)-*,$(dist.exts) .tar /) endif -$(outdir)/dist: $(addprefix $(topoutdir)/$(PACKAGE)-$(VERSION),$(dist.exts)) +$(outdir)/dist: $(addprefix $(topoutdir)/$(dist.name)-$(dist.version),$(dist.exts)) diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk index 98fc6b3..6a54b7d 100644 --- a/build-aux/Makefile.once.head/00-dist.mk +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -16,8 +16,15 @@ # Developer configuration dist.exts ?= .tar.gz -PACKAGE ?= YOUR_PACKAGE_NAME -VERSION ?= 0.0.1 +dist.name ?= $(PACKAGE) +dist.version ?= $(VERSION) + +ifeq ($(dist.name),) +$(error dist.name must be set) +endif +ifeq ($(dist.version),) +$(error dist.name must be set) +endif # User configuration diff --git a/build-aux/Makefile.once.tail/00-dist.mk b/build-aux/Makefile.once.tail/00-dist.mk index ef3ecb1..ee28fac 100644 --- a/build-aux/Makefile.once.tail/00-dist.mk +++ b/build-aux/Makefile.once.tail/00-dist.mk @@ -15,14 +15,14 @@ _dist.copyfile = $(MKDIR_P) $(dir $2) && $(CP) -T $1 $2 _dist.addfile = $(call _dist.copyfile,$3,$2/$(call at.relto,$1,$3)) -$(topoutdir)/$(PACKAGE)-$(VERSION): $(std.src_files/$(topoutdir)) $(std.gen_files/$(topoutdir)) +$(topoutdir)/$(dist.name)-$(dist.version): $(std.src_files/$(topoutdir)) $(std.gen_files/$(topoutdir)) $(RM) -r $@ @PS4='' && set -x && \ $(MKDIR) $(@D)/tmp.$(@F).$$$$ && \ $(foreach f,$^,$(call _dist.addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ $(MV) $(@D)/tmp.$(@F).$$$$ $@ || $(RM) -r $(@D)/tmp.$(@F).$$$$ -$(topoutdir)/$(PACKAGE)-$(VERSION).tar: $(topoutdir)/$(PACKAGE)-$(VERSION) +$(topoutdir)/$(dist.name)-$(dist.version).tar: $(topoutdir)/$(dist.name)-$(dist.version) $(TAR) cf $@ -C $( $@ -- cgit v1.2.3-54-g00ecf From c53ae3285fb85d3b70870692a0206ab0c6521796 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 May 2016 18:38:08 -0400 Subject: oops --- build-aux/Makefile.once.head/00-dist.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk index 6a54b7d..2f1da66 100644 --- a/build-aux/Makefile.once.head/00-dist.mk +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -23,7 +23,7 @@ ifeq ($(dist.name),) $(error dist.name must be set) endif ifeq ($(dist.version),) -$(error dist.name must be set) +$(error dist.version must be set) endif # User configuration -- cgit v1.2.3-54-g00ecf From 68affbbe3a2258510f48c62400cc95ad042c959d Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 29 May 2016 18:38:23 -0400 Subject: Rename dist.name -> dist.pkgname --- build-aux/Makefile.each.tail/00-dist.mk | 4 ++-- build-aux/Makefile.once.head/00-dist.mk | 6 +++--- build-aux/Makefile.once.tail/00-dist.mk | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'build-aux/Makefile.once.head/00-dist.mk') diff --git a/build-aux/Makefile.each.tail/00-dist.mk b/build-aux/Makefile.each.tail/00-dist.mk index d85ecc0..a094305 100644 --- a/build-aux/Makefile.each.tail/00-dist.mk +++ b/build-aux/Makefile.each.tail/00-dist.mk @@ -14,7 +14,7 @@ # along with this program. If not, see . ifeq ($(outdir),$(topoutdir)) -std.clean_files += $(addprefix $(dist.name)-*,$(dist.exts) .tar /) +std.clean_files += $(addprefix $(dist.pkgname)-*,$(dist.exts) .tar /) endif -$(outdir)/dist: $(addprefix $(topoutdir)/$(dist.name)-$(dist.version),$(dist.exts)) +$(outdir)/dist: $(addprefix $(topoutdir)/$(dist.pkgname)-$(dist.version),$(dist.exts)) diff --git a/build-aux/Makefile.once.head/00-dist.mk b/build-aux/Makefile.once.head/00-dist.mk index 2f1da66..d5bfcd3 100644 --- a/build-aux/Makefile.once.head/00-dist.mk +++ b/build-aux/Makefile.once.head/00-dist.mk @@ -16,11 +16,11 @@ # Developer configuration dist.exts ?= .tar.gz -dist.name ?= $(PACKAGE) +dist.pkgname ?= $(PACKAGE) dist.version ?= $(VERSION) -ifeq ($(dist.name),) -$(error dist.name must be set) +ifeq ($(dist.pkgname),) +$(error dist.pkgname must be set) endif ifeq ($(dist.version),) $(error dist.version must be set) diff --git a/build-aux/Makefile.once.tail/00-dist.mk b/build-aux/Makefile.once.tail/00-dist.mk index ee28fac..3990f57 100644 --- a/build-aux/Makefile.once.tail/00-dist.mk +++ b/build-aux/Makefile.once.tail/00-dist.mk @@ -15,14 +15,14 @@ _dist.copyfile = $(MKDIR_P) $(dir $2) && $(CP) -T $1 $2 _dist.addfile = $(call _dist.copyfile,$3,$2/$(call at.relto,$1,$3)) -$(topoutdir)/$(dist.name)-$(dist.version): $(std.src_files/$(topoutdir)) $(std.gen_files/$(topoutdir)) +$(topoutdir)/$(dist.pkgname)-$(dist.version): $(std.src_files/$(topoutdir)) $(std.gen_files/$(topoutdir)) $(RM) -r $@ @PS4='' && set -x && \ $(MKDIR) $(@D)/tmp.$(@F).$$$$ && \ $(foreach f,$^,$(call _dist.addfile,$(topsrcdir),$(@D)/tmp.$(@F).$$$$,$f) &&) \ $(MV) $(@D)/tmp.$(@F).$$$$ $@ || $(RM) -r $(@D)/tmp.$(@F).$$$$ -$(topoutdir)/$(dist.name)-$(dist.version).tar: $(topoutdir)/$(dist.name)-$(dist.version) +$(topoutdir)/$(dist.pkgname)-$(dist.version).tar: $(topoutdir)/$(dist.pkgname)-$(dist.version) $(TAR) cf $@ -C $( $@ -- cgit v1.2.3-54-g00ecf