Skip to content

Commit

Permalink
[W32] Buildsystem may use wrong Python interpreter
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=143755

Patch by Руслан Ижбулатов <lrn1986@gmail.com> on 2015-04-15
Reviewed by Carlos Garcia Campos.

Use confgured Python interpreter

Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
use the interpretor they provide (which is overridable by user by
the way of passing PYTHON=... to configure) instead of the first
thing found in PATH.

Otherwise wrong version of Python might be used. Mingw-python,
for example, which has commandline length limit, which results in
errors like:
/usr/bin/env: python: Argument list too long
GNUmakefile:82317: recipe for target
'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed

Source/WebInspectorUI:

* GNUmakefile.am:

Tools:

* gtk/GNUmakefile.am:
  • Loading branch information
LRN authored and carlosgcampos committed May 19, 2015
1 parent 52b3236 commit 206e00f
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 2 deletions.
23 changes: 23 additions & 0 deletions Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,26 @@
2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>

[W32] Buildsystem may use wrong Python interpreter
https://bugs.webkit.org/show_bug.cgi?id=143755

Reviewed by Carlos Garcia Campos.

Use confgured Python interpreter

Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
use the interpretor they provide (which is overridable by user by
the way of passing PYTHON=... to configure) instead of the first
thing found in PATH.

Otherwise wrong version of Python might be used. Mingw-python,
for example, which has commandline length limit, which results in
errors like:
/usr/bin/env: python: Argument list too long
GNUmakefile:82317: recipe for target
'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed

* GNUmakefile.am:

2014-09-25 Carlos Garcia Campos <cgarcia@igalia.com>

Unreviewed. Fix make distcheck.
Expand Down
2 changes: 1 addition & 1 deletion Source/WebInspectorUI/GNUmakefile.am
Expand Up @@ -13,7 +13,7 @@ ${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.xml: GNUmakefile \
$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py
$(AM_V_GEN)
$(AM_V_at)mkdir -p ${GENSOURCES_WEBINSPECTOR_UI}
$(AM_V_at)$(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)
$(AM_V_at)$(PYTHON) $(srcdir)/Tools/gtk/generate-inspector-gresource-manifest.py --output $@ $(inspector_files)

${GENSOURCES_WEBINSPECTOR_UI}/GResourceBundle.c: DerivedSources/WebInspectorUI/GResourceBundle.xml
$(AM_V_GEN)
Expand Down
23 changes: 23 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,26 @@
2015-04-15 Руслан Ижбулатов <lrn1986@gmail.com>

[W32] Buildsystem may use wrong Python interpreter
https://bugs.webkit.org/show_bug.cgi?id=143755

Reviewed by Carlos Garcia Campos.

Use confgured Python interpreter

Configure script has tests for Python (AC_PATH_PROG(PYTHON, python)),
use the interpretor they provide (which is overridable by user by
the way of passing PYTHON=... to configure) instead of the first
thing found in PATH.

Otherwise wrong version of Python might be used. Mingw-python,
for example, which has commandline length limit, which results in
errors like:
/usr/bin/env: python: Argument list too long
GNUmakefile:82317: recipe for target
'DerivedSources/WebInspectorUI/GResourceBundle.xml' failed

* gtk/GNUmakefile.am:

2014-11-28 Carlos Garcia Campos <cgarcia@igalia.com>

[GTK] Use custom JavaScript instead of DBus to implement WebProcess tests
Expand Down
2 changes: 1 addition & 1 deletion Tools/gtk/GNUmakefile.am
Expand Up @@ -35,7 +35,7 @@ docs_build_dependencies += \
gtkdoc-webkitdom.cfg

docs-build.stamp: $(docs_build_dependencies)
CC=$(CC) $(srcdir)/Tools/gtk/generate-gtkdoc
CC=$(CC) $(PYTHON) $(srcdir)/Tools/gtk/generate-gtkdoc
@touch docs-build.stamp

clean-local: doc-clean-local
Expand Down

0 comments on commit 206e00f

Please sign in to comment.