FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Do not update meson by default and fix setting -Werror=true

Browse Source
This commit is contained in:
Thibault Saunier 2016-10-14 11:53:21 +02:00
parent b991036624
commit 57680a0dd3
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
configure vendored
View File

@ -16,13 +16,15 @@ PROJECTNAME = "GStreamer 'all'"
ROOTDIR = os.path.abspath(os.path.dirname(__file__)) ROOTDIR = os.path.abspath(os.path.dirname(__file__))
def get_meson(): def get_meson(update_meson):
print("Updating meson submodule... ", end='') meson = os.path.join(ROOTDIR, 'meson', 'meson.py')
sys.stdout.flush() if update_meson or not os.path.exists(meson):
git('submodule', 'update', '--init', repository_path=ROOTDIR) print("Updating meson submodule... ", end='')
print("DONE") sys.stdout.flush()
git('submodule', 'update', '--init', repository_path=ROOTDIR)
print("DONE")
return os.path.join(ROOTDIR, 'meson', 'meson.py') return meson
def accept_command(commands): def accept_command(commands):
@ -38,12 +40,12 @@ def accept_command(commands):
def get_configs(meson): def get_configs(meson):
return ['-Dwerror=true'] return ['-D', 'werror=true']
def configure_meson(args): def configure_meson(args, options):
"""Configures meson and generate the Makefile.""" """Configures meson and generate the Makefile."""
meson = get_meson() meson = get_meson(options.update_meson)
if not meson: if not meson:
print("Install mesonbuild to build %s: http://mesonbuild.com/\n" print("Install mesonbuild to build %s: http://mesonbuild.com/\n"
"You can simply install it with:\n" "You can simply install it with:\n"
@ -59,10 +61,11 @@ def configure_meson(args):
build_dir = os.path.join(ROOTDIR, "build") build_dir = os.path.join(ROOTDIR, "build")
shutil.rmtree(build_dir, True) shutil.rmtree(build_dir, True)
os.mkdir(build_dir) os.mkdir(build_dir)
os.chdir(build_dir)
try: try:
subprocess.check_call([meson, "../"] + args + get_configs(meson)) subprocess.check_call([meson, "../"] + args, cwd=build_dir)
subprocess.check_call([os.path.join(ROOTDIR, 'meson', 'mesonconf.py')]
+ get_configs(meson), cwd=build_dir)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
print("EXIT meson return %s" % e.returncode) print("EXIT meson return %s" % e.returncode)
exit(1) exit(1)
@ -73,6 +76,8 @@ if __name__ == "__main__":
parser.add_argument("--no-reconfigure", action='store_true', parser.add_argument("--no-reconfigure", action='store_true',
default=False, help='Avoid removing the build dir' default=False, help='Avoid removing the build dir'
' if not necessary.') ' if not necessary.')
parser.add_argument("-u", "--update-meson", action='store_true',
default=False, help='Do not update meson')
options, args = parser.parse_known_args() options, args = parser.parse_known_args()
if options.no_reconfigure: if options.no_reconfigure:
if os.path.exists( if os.path.exists(
@ -81,4 +86,4 @@ if __name__ == "__main__":
print("Not reconfiguring") print("Not reconfiguring")
exit(0) exit(0)
configure_meson(args) configure_meson(args, options)