0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure that both recipes include revision.hpp in the tarball.

Browse source
This commit is contained in:
Eric S. Raymond 2008-03-29 13:28:34 +00:00
parent b5cea4b58a
commit 69de349ab1
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -167,6 +167,7 @@ BINARY_STAGING=/tmp/$(PACKAGE)-$(VERSION)-staging
BINARY_DIST=/tmp/$(PACKAGE)-binary-$(VERSION).tar.gz
DATA_DIST=/tmp/$(PACKAGE)-data-$(VERSION).tar.gz
# *** Not yet covered by scons recipe
binary-dist:
@rm -rf $(BINARY_STAGING) $(BINARY_DIST)
@make install-exec DESTDIR=$(BINARY_STAGING)
@ -174,6 +175,7 @@ binary-dist:
@rm -rf $(BINARY_STAGING)
@echo "Precompiled binary tarball is in $(BINARY_DIST)"
# *** Not yet covered by scons recipe
data-dist:
@rm -rf $(BINARY_STAGING) $(DATA_DIST)
@make install-data DESTDIR=$(BINARY_STAGING)
@ -183,7 +185,7 @@ data-dist:
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config/config.rpath config/mkinstalldirs config/py-compile
EXTRA_DIST = config/config.rpath config/mkinstalldirs config/py-compile src/revision.hpp
if PYTHON_INSTALL
pkgpython_PYTHON = data/tools/wesnoth/wmltools.py \

4
SConstruct
View file

@ -14,6 +14,7 @@
# 4. Desktop entry and icon installation.
# 5. Translations handling other than installation (pot-update).
# 6. Construction of Apple application bundles.
# 7. Making binary and data-only distribution tarballs
import os, sys, commands, shutil, sets
from SCons.Script import *
@ -716,6 +717,7 @@ r = env.Command("src/revision.hpp", [],
lambda target, source, env: open(str(target[0]), "w").write("#define REVISION \"%s\"\n" % env["svnrev"]))
env.AlwaysBuild(r)
env.TargetSignatures('content')
env.Clean(all, "src/revision.hpp")
#
# File inventory, for archive makes abd analysis tools
@ -998,7 +1000,7 @@ def manifest():
# filenames with tildes in them (Emacs backup files) just in case.
lst.append("data/")
return lst
tarball = env.Tar('wesnoth.tar.bz2', manifest())
tarball = env.Tar('wesnoth.tar.bz2', manifest() + ["src/revision.hpp"])
env.Append(TARFLAGS='-j --exclude=".svn" --exclude="~"',
TARCOMSTR="Making tarball...")
env.Clean(all, 'wesnoth.tar.bz2')