[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: Makefile.maint
From: |
Akim Demaille |
Subject: |
FYI: Makefile.maint |
Date: |
17 Jul 2001 10:44:21 +0200 |
User-agent: |
Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Academic Rigor) |
Jim, in CVS Autoconf there are some more modifications compared to
CPPI. I think it is completely up to date with your own copy. Below
are the diffs between CPPI and CVS Autoconf.
Index: ChangeLog
from Akim Demaille <address@hidden>
* Makefile.maint: Sync. with cppi 1.10.
Index: Makefile.maint
===================================================================
RCS file: /cvs/autoconf/Makefile.maint,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile.maint
--- Makefile.maint 2001/07/17 07:29:35 1.9
+++ Makefile.maint 2001/07/17 08:42:21
@@ -25,6 +25,9 @@
## Sanity checks. ##
## --------------- ##
+# Checks that don't require cvs.
+local-check: changelog-check po-check writable-files copyright-check
+
changelog-check:
if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
:; \
@@ -56,8 +59,13 @@
done; \
test "$$fail" && exit 1 || :
-# Checks that don't require cvs.
-local-check: changelog-check po-check writable-files check-copyright
+# Make sure that the copyright date in lib/version-etc.c is up to date.
+copyright-check:
+ @if test -f lib/version-etc.c; then \
+ grep 'N_("Copyright (C) $(shell date +%Y) Free' lib/version-etc.c \
+ >/dev/null \
+ || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }; \
+ fi
# Sanity checks with the CVS repository.
@@ -137,10 +145,13 @@
url_dir_list = $(foreach x,$(hosts),ftp://$($(x)_host)/$($(x)_url_dir))
-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/ -//')
-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/ -//')
-tgz-size = $(shell du --human $(my_distdir).tar.gz|sed 's/M.*/MB/')
-xd-size = $(shell du --human $(xd-delta)|sed 's/M.*/MB/')
+tgz-md5 = $(shell md5sum < $(my_distdir).tar.gz|sed 's/ -//')
+tgz-sha1 = $(shell sha1sum < $(my_distdir).tar.gz|sed 's/ -//')
+bz2-md5 = $(shell md5sum < $(my_distdir).tar.bz2|sed 's/ -//')
+bz2-sha1 = $(shell sha1sum < $(my_distdir).tar.bz2|sed 's/ -//')
+tgz-size = $(shell du --human $(my_distdir).tar.gz|sed 's/\([Mk]\).*/ \1B/')
+bz2-size = $(shell du --human $(my_distdir).tar.bz2|sed 's/\([Mk]\).*/ \1B/')
+xd-size = $(shell du --human $(xd-delta)|sed 's/\([Mk]\).*/ \1B/')
rel-check:
tarz=/tmp/rel-check-tarz-$$$$; \
@@ -153,8 +164,16 @@
prev-tgz = $(PACKAGE)-$(PREV_VERSION).tar.gz
xd-delta = $(PACKAGE)-$(PREV_VERSION)-$(VERSION).xdelta
+
+GZIP = gzip
+BZIP2 = bzip2
+$(my_distdir).tar.bz2: $(my_distdir).tar.gz
+ $(GZIP) -dc $< > $(my_distdir).tar
+ rm -f $@
+ $(BZIP2) -9 $(my_distdir).tar
-announcement: NEWS ChangeLog $(distdir).tar.gz
+rel-files = $(xd-delta) $(distdir).tar.bz2 $(distdir).tar.gz
+announcement: NEWS ChangeLog $(rel-files)
@( \
echo Subject: $(my_distdir) released; \
echo; \
@@ -162,6 +181,7 @@
echo; \
for url in $(url_dir_list); do \
echo " $$url/$(my_distdir).tar.gz ($(tgz-size))"; \
+ echo " $$url/$(my_distdir).tar.bz2 ($(bz2-size))"; \
done; \
echo; \
echo And here are xdelta-style diffs; \
@@ -170,13 +190,15 @@
echo " $$url/$(xd-delta) ($(xd-size))"; \
done; \
echo; \
- echo "Here are the MD5 and SHA1 signatures for the .tar.gz file"; \
+ echo "Here are the MD5 and SHA1 signatures for the compressed tar
files:"; \
echo; \
- echo "$(md5) $(my_distdir).tar.gz"; \
- echo "$(sha1) $(my_distdir).tar.gz"; \
+ echo "$(tgz-md5) $(my_distdir).tar.gz"; \
+ echo "$(bz2-md5) $(my_distdir).tar.bz2"; \
+ echo "$(tgz-sha1) $(my_distdir).tar.gz"; \
+ echo "$(bz2-sha1) $(my_distdir).tar.bz2"; \
echo; \
echo NEWS:; \
- sed -n "/$(THIS_VERSION_REGEXP)/,/^\[$(PREV_VERSION_REGEXP)/p" NEWS \
+ sed -n "/$(THIS_VERSION_REGEXP)[]:]/,/$(PREV_VERSION_REGEXP)[]:]/p"
NEWS \
| grep -v '^\['; \
echo; \
echo ChangeLog entries:; \
@@ -233,29 +255,22 @@
echo =====================================
echo =====================================
echo 'for host in $(a_host) $(b_host); do \'
- echo ' rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.gz \'
- echo ' $$host:$(real_dir); done'
+ echo ' rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.bz2 \'
+ echo ' $(my_distdir).tar.gz $$host:$(real_dir); done'
echo '# send the /tmp/announcement e-mail'
echo =====================================
echo =====================================
endef
-# Make sure that the copyright date in lib/version-etc.c is up to date.
-check-copyright:
- @if test -f lib/version-etc.c; then \
- grep 'N_("Copyright (C) $(shell date +%Y) Free' lib/version-etc.c >
/dev/null \
- || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }; \
- fi
+$(xd-delta): $(release-archive-dir)/$(prev-tgz) $(distdir).tar.gz
+ xdelta delta -9 $^ $@ || :
alpha: local-check
$(MAKE) cvs-dist
+ $(MAKE) $(xd-delta)
$(MAKE) -s announcement > /tmp/announce-$(my_distdir)
- ln $(distdir).tar.gz $(release_archive_dir)
- chmod a-w $(distdir).tar.gz
- cd $(release_archive_dir) \
- && xdelta delta -9 $(prev-tgz) $(distdir).tar.gz $(xd-delta) || :
- ln $(release_archive_dir)/$(xd-delta) .
- chmod a-w $(release_archive_dir)/$(xd-delta)
+ ln $(rel-files) $(release_archive_dir)
+ chmod a-w $(rel-files)
echo $(VERSION) > $(prev_version_file)
cvs ci -m. $(prev_version_file)
@$(emit-rsync-commands)
----------------------------------------------------------------------
| --- ../cppi-1.10/Makefile.maint Sat Jul 14 20:21:27 2001
| +++ ./Makefile.maint Tue Jul 17 10:41:16 2001
| @@ -17,7 +17,7 @@
|
| # Old releases are stored here.
| # Used for diffs and xdeltas.
| -release-archive-dir ?= ../release
| +release_archive_dir ?= ../release
|
Because I don't want to use ../release, but ./releases, so I need to
be able to define it in Makefile.am, hence I need a valid non GNU Make
name.
| @@ -25,6 +25,9 @@
| ## Sanity checks. ##
| ## --------------- ##
|
| +# Checks that don't require cvs.
| +local-check: changelog-check po-check writable-files copyright-check
| +
| changelog-check:
| if head ChangeLog | grep 'Version $(VERSION)' >/dev/null; then \
| :; \
| @@ -44,20 +47,25 @@
|
| # Check that `make alpha' will not fail at the end of the process.
| writable-files:
| - if test -d $(release-archive-dir); then :; else \
| - mkdir $(release-archive-dir); \
| + if test -d $(release_archive_dir); then :; else \
| + mkdir $(release_archive_dir); \
| fi
| for file in $(distdir).tar.gz $(xd-delta) \
| - $(release-archive-dir)/$(distdir).tar.gz \
| - $(release-archive-dir)/$(xd-delta); do \
| + $(release_archive_dir)/$(distdir).tar.gz \
| + $(release_archive_dir)/$(xd-delta); do \
| test -e $$file || continue; \
| test -w $$file \
| || { echo ERROR: $$file is not writable; fail=1; }; \
| done; \
| test "$$fail" && exit 1 || :
|
| -# Checks that don't require cvs.
| -local-check: changelog-check po-check writable-files check-copyright
| +# Make sure that the copyright date in lib/version-etc.c is up to date.
| +copyright-check:
| + @if test -f lib/version-etc.c; then \
| + grep 'N_("Copyright (C) $(shell date +%Y) Free' lib/version-etc.c \
| + >/dev/null \
| + || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }; \
| + fi
|
|
| # Sanity checks with the CVS repository.
| @@ -254,14 +262,6 @@
| echo =====================================
| endef
|
| -# Make sure that the copyright date in lib/version-etc.c is up to date.
| -check-copyright:
| - @if test -f lib/version-etc.c; then \
| - grep 'N_("Copyright (C) $(shell date +%Y) Free' lib/version-etc.c \
| - > /dev/null \
| - || { echo 'out of date copyright in $<; update it' 1>&2; exit 1; }; \
| - fi
| -
| $(xd-delta): $(release-archive-dir)/$(prev-tgz) $(distdir).tar.gz
| xdelta delta -9 $^ $@ || :
|
| @@ -269,7 +269,7 @@
| $(MAKE) cvs-dist
| $(MAKE) $(xd-delta)
| $(MAKE) -s announcement > /tmp/announce-$(my_distdir)
| - ln $(rel-files) $(release-archive-dir)
| + ln $(rel-files) $(release_archive_dir)
| chmod a-w $(rel-files)
| echo $(VERSION) > $(prev_version_file)
| cvs ci -m. $(prev_version_file)
BTW, don't you want $(rel-files) here?
| echo 'for host in $(a_host) $(b_host); do \'
| echo ' rsync -e ssh --pro -av $(xd-delta) $(my_distdir).tar.bz2 \'
| echo ' $(my_distdir).tar.gz $$host:$(real_dir); done'