X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=5c729bd4326c0428471a3a7f7d0038c98524bf28;hb=b2d850326af5c9ffc6486e4cc40bef6e1c051a6f;hp=da1378cc46b80877d5c0bb3f75f31fc692dbfca4;hpb=d1e17b2719ed8930caecb0c80e51e0c2fd813b7c;p=dcpomatic.git diff --git a/wscript b/wscript index da1378cc4..5c729bd43 100644 --- a/wscript +++ b/wscript @@ -39,7 +39,7 @@ libdcp_version = '1.8.5' libsub_version = '1.6.5' this_version = subprocess.Popen(shlex.split('git tag -l --points-at HEAD'), stdout=subprocess.PIPE).communicate()[0] -last_version = subprocess.Popen(shlex.split('git describe --tags --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] +last_version = subprocess.Popen(shlex.split('git describe --tags --match v* --abbrev=0'), stdout=subprocess.PIPE).communicate()[0] # Python 2/3 compatibility; I don't really understand what's going on here if not isinstance(this_version, str): @@ -664,10 +664,6 @@ def create_version_cc(version, cxx_flags): def post(ctx): if ctx.cmd == 'install' and ctx.env.TARGET_LINUX: ctx.exec_command('/sbin/ldconfig') - # setuid root executable - exe = os.path.join(ctx.env['INSTALL_PREFIX'], 'bin/%s/dcpomatic2_disk_writer') - if os.path.exists(exe): - os.chmod(exe, 0o4755) def pot(bld): bld.recurse('src')