diff options
author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-11-01 10:57:10 +0100 |
---|---|---|
committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2014-11-01 11:00:03 +0100 |
commit | fba8fedf6678d786031b9b1f90a5589d99f524f9 (patch) | |
tree | bd959c4251d9a71131129a6bb1e524f4a83a4488 /wscript_build.py | |
parent | dab6cbca163910abf7bff93dec73b21d0a99b473 (diff) | |
download | mpv-fba8fedf6678d786031b9b1f90a5589d99f524f9.tar.bz2 mpv-fba8fedf6678d786031b9b1f90a5589d99f524f9.tar.xz |
build: remove bundle support from waf
Use TOOLS/osxbundle.py instead. It's just better and less hacky.
Diffstat (limited to 'wscript_build.py')
-rw-r--r-- | wscript_build.py | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/wscript_build.py b/wscript_build.py index 73280a3b1f..56be7a36da 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -418,24 +418,6 @@ def build(ctx): ctx.path.find_node('osdep/mpv.rc'), ctx.path.find_node(node)) - cprog_kwargs = {} - if ctx.dependency_satisfied('macosx-bundle'): - import os - basepath = 'TOOLS/osxbundle/mpv.app/Contents' - cprog_kwargs['mac_app'] = True - cprog_kwargs['mac_plist'] = os.path.join(basepath, 'Info.plist') - - resources_glob = os.path.join(basepath, 'Resources', '*') - resources_nodes = ctx.srcnode.ant_glob(resources_glob) - resources = [node.srcpath() for node in resources_nodes] - cprog_kwargs['mac_resources'] = resources - - for resource in resources: - res_basename = os.path.basename(resource) - install_name = '/mpv.app/Contents/Resources/' + res_basename - ctx.install_as(ctx.env.BINDIR + install_name, resource) - - if ctx.dependency_satisfied('cplayer'): ctx( target = "mpv", @@ -444,8 +426,7 @@ def build(ctx): includes = [ctx.bldnode.abspath(), ctx.srcnode.abspath()] + \ ctx.dependencies_includes(), features = "c cprogram", - install_path = ctx.env.BINDIR, - **cprog_kwargs + install_path = ctx.env.BINDIR ) for f in ['example.conf', 'input.conf', 'mplayer-input.conf', \ 'restore-old-bindings.conf']: @@ -542,10 +523,6 @@ def build(ctx): wrapctx.env.CFLAGS = wrapflags wrapctx.env.LAST_LINKFLAGS = wrapflags - if ctx.dependency_satisfied('macosx-bundle'): - from waflib import Utils - ctx.install_files(ctx.env.BINDIR, 'mpv', chmod=Utils.O755) - if ctx.dependency_satisfied("vf-dlopen-filters"): dlfilters = "showqscale telecine tile rectangle framestep \ ildetect".split() |