From 7e2edad8efea55e8df1faa695d1389ef4e326d7c Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 16 Jul 2013 13:28:28 +0200 Subject: switch the build system to waf This commit adds a new build system based on waf. configure and Makefile are deprecated effective immediately and someday in the future they will be removed (they are still available by running ./old-configure). You can find how the choice for waf came to be in `DOCS/waf-buildsystem.rst`. TL;DR: we couldn't get the same level of abstraction and customization with other build systems we tried (CMake and autotools). For guidance on how to build the software now, take a look at README.md and the cross compilation guide. CREDITS: This is a squash of ~250 commits. Some of them are not by me, so here is the deserved attribution: - @wm4 contributed some Windows fixes, renamed configure to old-configure and contributed to the bootstrap script. Also, GNU/Linux testing. - @lachs0r contributed some Windows fixes and the bootstrap script. - @Nikoli contributed a lot of testing and discovered many bugs. - @CrimsonVoid contributed changes to the bootstrap script. --- waftools/generators/__init__.py | 0 waftools/generators/headers.py | 36 ++++++++++++++++++++++++++++++++++++ waftools/generators/sources.py | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 waftools/generators/__init__.py create mode 100644 waftools/generators/headers.py create mode 100644 waftools/generators/sources.py (limited to 'waftools/generators') diff --git a/waftools/generators/__init__.py b/waftools/generators/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/waftools/generators/headers.py b/waftools/generators/headers.py new file mode 100644 index 0000000000..13f124a2dd --- /dev/null +++ b/waftools/generators/headers.py @@ -0,0 +1,36 @@ +def __get_version__(ctx): + import subprocess + process = subprocess.Popen(["sh", "./version.sh", "--print"], + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + cwd=ctx.srcnode.abspath()) + process.wait() + (version, err) = process.communicate() + return version.strip() + +def __get_build_date__(): + import time + return time.strftime("%Y-%m-%dT%H:%M:%S", time.gmtime()) + +def __write_config_h__(ctx): + ctx.start_msg("Writing configuration header:") + ctx.write_config_header('config.h') + ctx.end_msg("config.h", "PINK") + +def __write_version_h__(ctx): + ctx.start_msg("Writing header:") + ctx.env.VERSION = __get_version__(ctx) + ctx.define("VERSION", ctx.env.VERSION) + ctx.define("BUILDDATE", __get_build_date__()) + ctx.write_config_header("version.h") + ctx.end_msg("version.h", "PINK") + +def __add_mplayer_defines__(ctx): + from sys import argv + ctx.define("CONFIGURATION", " ".join(argv)) + ctx.define("MPLAYER_CONFDIR", ctx.env.CONFDIR) + +def configure(ctx): + __add_mplayer_defines__(ctx) + __write_config_h__(ctx) + __write_version_h__(ctx) diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py new file mode 100644 index 0000000000..1248ad90b4 --- /dev/null +++ b/waftools/generators/sources.py @@ -0,0 +1,37 @@ +from waflib.Build import BuildContext +import os + +def __file2string_cmd__(ctx): + return "${{BIN_PERL}} {0}/TOOLS/file2string.pl ${{SRC}} > ${{TGT}}" \ + .format(ctx.srcnode.abspath()) + +def __matroska_cmd__(ctx, argument): + return "${{BIN_PERL}} {0}/TOOLS/matroska.pl {1} ${{SRC}} > ${{TGT}}" \ + .format(ctx.srcnode.abspath(), argument) + +def __file2string__(ctx, **kwargs): + ctx( + rule = __file2string_cmd__(ctx), + before = ("c",), + name = os.path.basename(kwargs['target']), + **kwargs + ) + +def __matroska_header__(ctx, **kwargs): + ctx( + rule = __matroska_cmd__(ctx, '--generate-header'), + before = ("c",), + name = os.path.basename(kwargs['target']), + **kwargs + ) + +def __matroska_definitions__(ctx, **kwargs): + ctx( + rule = __matroska_cmd__(ctx, '--generate-definitions'), + before = ("c",), + **kwargs + ) + +BuildContext.file2string = __file2string__ +BuildContext.matroska_header = __matroska_header__ +BuildContext.matroska_definitions = __matroska_definitions__ -- cgit v1.2.3