(dist): Implement. The client tarball doesn't work yet.

(TARNAME, VERSION, tarball, acdist, src_distgen, bld_distgen)
(dist-source, dist-client, dist-info, check-version): New.

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 53485185e7db3a76cfdb33e2f0badd6cb29ad99b..050cc6b41acf0d438e5599cc064382bc15ad5bd5 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -34,6 +34,9 @@
 
 # The real meat is in Make.mk, which see.
 
 
 # The real meat is in Make.mk, which see.
 

+TARNAME := @PACKAGE_TARNAME@
+VERSION := @PACKAGE_VERSION@
+

 CC := @CC@
 have_gcc := @GCC@
 CFLAGS := @CFLAGS@
 CC := @CC@
 have_gcc := @GCC@
 CFLAGS := @CFLAGS@

diff --git a/Make.mk b/Make.mk
index 3327fe140cd430cb77041285d5252fce051e95a2..28d4f2119d010cd46af3e1347a445bdc270fbeaf 100644 (file)
--- a/Make.mk
+++ b/Make.mk
@@ -63,10 +63,13 @@ subjects.html := $(addprefix info.html/, $(addsuffix .html, $(subjects)))
 topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
 scripts = $(srcdir)/src/scripts
 depcomp = $(SHELL) $(srcdir)/depcomp
 topics.html := $(addprefix info.html/, $(addsuffix .html, $(topics)))
 scripts = $(srcdir)/src/scripts
 depcomp = $(SHELL) $(srcdir)/depcomp

+tarball = $(SHELL) $(scripts)/tarball

 econfig := $(sysconfdir)/empire/econfig
 edatadir := $(localstatedir)/empire
 einfodir := $(datadir)/empire/info.nr
 ehtmldir := $(datadir)/empire/info.html
 econfig := $(sysconfdir)/empire/econfig
 edatadir := $(localstatedir)/empire
 einfodir := $(datadir)/empire/info.nr
 ehtmldir := $(datadir)/empire/info.html

+
+# How to substitute Autoconf output variables

 # Recursively expanded so that $@ and $< work.
 subst.in = sed \
        -e 's?@configure_input\@?$(notdir $@).  Generated from $(notdir $<) by GNUmakefile.?g' \
 # Recursively expanded so that $@ and $< work.
 subst.in = sed \
        -e 's?@configure_input\@?$(notdir $@).  Generated from $(notdir $<) by GNUmakefile.?g' \


@@ -77,9 +80,11 @@ subst.in = sed \
        -e 's/@EMPIREPORT\@/$(EMPIREPORT)/g'
 
 # Generated files
        -e 's/@EMPIREPORT\@/$(EMPIREPORT)/g'
 
 # Generated files

+# See `Cleanliness' below

 mk := sources.mk subjects.mk
 ac := $(srcdir)/autom4te.cache config.h config.log config.status       \
 stamp-h $(basename $(filter %.in, $(src)))
 mk := sources.mk subjects.mk
 ac := $(srcdir)/autom4te.cache config.h config.log config.status       \
 stamp-h $(basename $(filter %.in, $(src)))

+acdist := aclocal.m4 config.h.in configure stamp-h.in

 obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o))
 # TODO AIX needs lwpInit.o lwpRestore.o lwpSave.o unless UCONTEXT
 deps := $(obj:.o=.d)
 obj := $(csrc:.c=.o) $(filter %.o, $(ac:.c=.o))
 # TODO AIX needs lwpInit.o lwpRestore.o lwpSave.o unless UCONTEXT
 deps := $(obj:.o=.d)


@@ -105,11 +110,17 @@ empth_obj := src/lib/empthread/ntthread.o
 empth_lib :=
 endif
 
 empth_lib :=
 endif
 

+# Cleanliness
+# Each generated file should be in one of the following sets.

 # Removed by clean:
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)   \
 $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
 # Removed by distclean:
 distclean := $(ac)
 # Removed by clean:
 clean := $(obj) $(deps) $(libs) $(util) $(client) $(server) $(tsubj)   \
 $(ttop) $(info.nr) $(info.html) $(empth_obj) $(empth_lib)
 # Removed by distclean:
 distclean := $(ac)

+# Distributed by dist from $(srcdir)
+src_distgen := $(acdist)
+# Distributed by dist from .
+bld_distgen := $(mk)

 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.
 
 # Compiler flags
 CPPFLAGS += -I$(srcdir)/include -I.


@@ -171,8 +182,7 @@ uninstall:
        false # FIXME
 
 .PHONY: dist
        false # FIXME
 
 .PHONY: dist

-dist:
-       false # FIXME
+dist: dist-source dist-client dist-info

 
 
 ### Implicit rules
 
 
 ### Implicit rules


@@ -254,6 +264,24 @@ sources.mk: $(scripts)/cvsfiles.awk $(addprefix $(srcdir)/, $(addsuffix CVS/Entr
        echo 'src := ' `cd $(srcdir) && $(AWK) -f src/scripts/cvsfiles.awk` >$@
 endif
 
        echo 'src := ' `cd $(srcdir) && $(AWK) -f src/scripts/cvsfiles.awk` >$@
 endif
 

+.PHONY: dist-source
+dist-source: check-version
+       $(tarball) $(TARNAME)-$(VERSION) $(bld_distgen) -C $(srcdir) $(src_distgen) $(src)
+
+.PHONY: dist-client
+dist-client:
+       $(tarball) $(TARNAME)-client-$(VERSION) -C $(srcdir) $(filter src/client/%, $(src))
+
+.PHONY: dist-info
+dist-info: info html
+       $(tarball) $(TARNAME)-info-text-$(VERSION) -C info.nr $(info)
+       $(tarball) $(TARNAME)-info-html-$(VERSION) -C info.html $(addsuffix .html, $(info))
+
+check-version:
+       if [ $(VERSION) != `sed -n '/EMP_VERS_/s/#define EMP_VERS_\([A-Z]*\)[ \t]*//p' <include/version.h | tr '\012' . | sed 's/\.$$//'` ]; \
+       then echo version.h does not match configure.ac >&2; false; \
+       fi
+

 ifneq ($(deps),)
 -include $(deps)
 endif
 ifneq ($(deps),)
 -include $(deps)
 endif

diff --git a/src/scripts/tarball b/src/scripts/tarball
new file mode 100755 (executable)
index 0000000..1484c06
--- /dev/null
+++ b/src/scripts/tarball
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+if [ $# = 0 ]; then
+    echo "Usage: $0 NAME (FILE | -C DIR)..."
+    exit 1
+fi
+
+name=$1; shift
+
+# arrange cleanup
+trap 'rm -rf "$name"' 0
+
+mkdir -p $name
+
+dir=.
+until [ $# = 0 ]; do
+    if [ "$1" = -C ]; then
+       dir="$2"
+       if shift 2; then continue; fi
+       echo "-C requires an argument" >&2
+       exit 1
+    fi
+    mkdir -p `dirname "$name/$1"`
+    ln "$dir/$1" "$name/$1"
+    shift
+done
+
+tar -czf $name.tar.gz --owner=0 --group=0 --mode=ug+w,a+rX $name