13
0

Recognize dist, distcheck better to set app name

Previously, `dist` had to be the first argument to waf. If it came in a
different position (e.g. `APPNAME=Ardour ./waf tarball dist`) or
`distcheck` was used instead of `dist`, the resulting archive was named
`noname-....tar.bz2`.

Signed-off-by: Nils Philippsen <nils@tiptoe.de>
This commit is contained in:
Nils Philippsen 2020-04-25 12:36:00 +02:00 committed by Paul Davis
parent 02e5605cdd
commit 845d7d3a3b

View File

@ -222,9 +222,9 @@ VERSION = sanitize(V)
PROGRAM_VERSION = sanitize(MAJOR)
del sanitize
if len (sys.argv) > 1 and sys.argv[1] == 'dist':
if any(arg in ('dist', 'distcheck') for arg in sys.argv[1:]):
if not 'APPNAME' in os.environ:
print ("You must define APPNAME in the environment when running ./waf dist")
print ("You must define APPNAME in the environment when running ./waf dist/distcheck")
sys.exit (1)
APPNAME = os.environ['APPNAME'];