diff options
| author | wm4 <wm4@nowhere> | 2016-12-17 13:24:05 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-12-17 15:43:15 +0100 |
| commit | ff9f5e06ff203c055d968087956026ef9204218b (patch) | |
| tree | 883725191398913cc97bd441b7110bcf68237e28 /waftools | |
| parent | 2b8b17402ed59815019b309051b277ba4de82f3b (diff) | |
| download | mpv-ff9f5e06ff203c055d968087956026ef9204218b.tar.bz2 mpv-ff9f5e06ff203c055d968087956026ef9204218b.tar.xz | |
Revert "Port several python scripts to Perl"
This reverts commit fae73079310eef9dce9737f2e37ff4b80c8830ee.
Before the waf build system was used, we had a configure script written
in shell. To drop the build dependency on Python, someone rewrote the
Python scripts we had to Perl. Now the shell configure script is gone,
and it makes no sense to have a build dependency on both Perl and
Python.
This isn't just a straight revert. It adds the new Matroska EBML
elements to the old Python scripts, adjusts the waf build system, and of
course doesn't add anything back needed by the old build system.
It would be better if this used matroska.py/file2string.py directly by
importing them as modules, instead of calling them via "python". But for
now this is simpler.
Diffstat (limited to 'waftools')
| -rw-r--r-- | waftools/generators/sources.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/waftools/generators/sources.py b/waftools/generators/sources.py index 6f1521036a..b6af693e65 100644 --- a/waftools/generators/sources.py +++ b/waftools/generators/sources.py @@ -2,11 +2,11 @@ from waflib.Build import BuildContext import os def __file2string_cmd__(ctx): - return '"${{BIN_PERL}}" "{0}/TOOLS/file2string.pl" "${{SRC}}" > "${{TGT}}"' \ + return '"${{BIN_PYTHON}}" "{0}/TOOLS/file2string.py" "${{SRC}}" > "${{TGT}}"' \ .format(ctx.srcnode.abspath()) def __matroska_cmd__(ctx, argument): - return '"${{BIN_PERL}}" "{0}/TOOLS/matroska.pl" "{1}" "${{SRC}}" > "${{TGT}}"' \ + return '"${{BIN_PYTHON}}" "{0}/TOOLS/matroska.py" "{1}" "${{SRC}}" > "${{TGT}}"' \ .format(ctx.srcnode.abspath(), argument) def __zshcomp_cmd__(ctx, argument): |