Title: [259949] releases/WebKitGTK/webkit-2.28
- Revision
- 259949
- Author
- [email protected]
- Date
- 2020-04-12 06:03:07 -0700 (Sun, 12 Apr 2020)
Log Message
Merge r258808 - [GTK] Use ${PYTHON_EXECUTABLE} to run generate-gtkdoc
https://bugs.webkit.org/show_bug.cgi?id=208970
Patch by Michael Catanzaro <[email protected]> on 2020-03-21
Reviewed by Konstantin Tokarev.
.:
There's no need to rely on shebangs when executing python scripts from CMake. This should
ensure the script always works even if the shebang does not.
* Source/cmake/GtkDoc.cmake:
Tools:
We are allowed to use /usr/bin/env in this script because it's not installed (so not
packaged). Therefore we can make the shebang compatible with FreeBSD in this particularl
case.
* gtkdoc/generate-gtkdoc:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.28/ChangeLog (259948 => 259949)
--- releases/WebKitGTK/webkit-2.28/ChangeLog 2020-04-12 13:03:02 UTC (rev 259948)
+++ releases/WebKitGTK/webkit-2.28/ChangeLog 2020-04-12 13:03:07 UTC (rev 259949)
@@ -1,3 +1,15 @@
+2020-03-21 Michael Catanzaro <[email protected]>
+
+ [GTK] Use ${PYTHON_EXECUTABLE} to run generate-gtkdoc
+ https://bugs.webkit.org/show_bug.cgi?id=208970
+
+ Reviewed by Konstantin Tokarev.
+
+ There's no need to rely on shebangs when executing python scripts from CMake. This should
+ ensure the script always works even if the shebang does not.
+
+ * Source/cmake/GtkDoc.cmake:
+
2020-03-12 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.28.0 release
Modified: releases/WebKitGTK/webkit-2.28/Source/cmake/GtkDoc.cmake (259948 => 259949)
--- releases/WebKitGTK/webkit-2.28/Source/cmake/GtkDoc.cmake 2020-04-12 13:03:02 UTC (rev 259948)
+++ releases/WebKitGTK/webkit-2.28/Source/cmake/GtkDoc.cmake 2020-04-12 13:03:07 UTC (rev 259949)
@@ -4,7 +4,7 @@
add_custom_command(
OUTPUT "${CMAKE_BINARY_DIR}/${_stamp_name}"
DEPENDS ${DocumentationDependencies}
- COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
+ COMMAND ${CMAKE_COMMAND} -E env "CC=${CMAKE_C_COMPILER}" "CFLAGS=${CMAKE_C_FLAGS} -Wno-unused-parameter" "LDFLAGS=${CMAKE_EXE_LINKER_FLAGS}" ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/Tools/gtkdoc/generate-gtkdoc ${_extra_args}
COMMAND touch ${_stamp_name}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
VERBATIM
Modified: releases/WebKitGTK/webkit-2.28/Tools/ChangeLog (259948 => 259949)
--- releases/WebKitGTK/webkit-2.28/Tools/ChangeLog 2020-04-12 13:03:02 UTC (rev 259948)
+++ releases/WebKitGTK/webkit-2.28/Tools/ChangeLog 2020-04-12 13:03:07 UTC (rev 259949)
@@ -1,3 +1,16 @@
+2020-03-21 Michael Catanzaro <[email protected]>
+
+ [GTK] Use ${PYTHON_EXECUTABLE} to run generate-gtkdoc
+ https://bugs.webkit.org/show_bug.cgi?id=208970
+
+ Reviewed by Konstantin Tokarev.
+
+ We are allowed to use /usr/bin/env in this script because it's not installed (so not
+ packaged). Therefore we can make the shebang compatible with FreeBSD in this particularl
+ case.
+
+ * gtkdoc/generate-gtkdoc:
+
2020-03-12 Michael Catanzaro <[email protected]>
[GTK] Use #!/usr/bin/python3 shebang to run generate-gtkdoc
Modified: releases/WebKitGTK/webkit-2.28/Tools/gtkdoc/generate-gtkdoc (259948 => 259949)
--- releases/WebKitGTK/webkit-2.28/Tools/gtkdoc/generate-gtkdoc 2020-04-12 13:03:02 UTC (rev 259948)
+++ releases/WebKitGTK/webkit-2.28/Tools/gtkdoc/generate-gtkdoc 2020-04-12 13:03:07 UTC (rev 259949)
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
# Copyright (C) 2011 Igalia S.L.
#
# This library is free software; you can redistribute it and/or
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
