[GTK] Fix gtk-doc generation with gtk-doc master
authormcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Nov 2017 16:47:46 +0000 (16:47 +0000)
committermcatanzaro@igalia.com <mcatanzaro@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 4 Nov 2017 16:47:46 +0000 (16:47 +0000)
https://bugs.webkit.org/show_bug.cgi?id=179252

Reviewed by Carlos Garcia Campos.

gtkdoc-scangobj has changed to no longer use a shell when executing its subcommands. In
particular, this means we can no longer rely on shell stuff in our run command that we use
to run the scanner. We currently use the RUN envvar to set LD_LIBRARY_PATH, and the end
result is gtkdoc-scangobj now attempts to execute our environment variable instead of the
scanner itself. We can just set LD_LIBRARY_PATH directly, instead of using RUN, in order to
make documentation generation work again.

* gtk/gtkdoc.py:
(GTKDoc._run_gtkdoc_scangobj):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@224458 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/gtk/gtkdoc.py

index 837eefd..d4c8b36 100644 (file)
@@ -1,3 +1,20 @@
+2017-11-04  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Fix gtk-doc generation with gtk-doc master
+        https://bugs.webkit.org/show_bug.cgi?id=179252
+
+        Reviewed by Carlos Garcia Campos.
+
+        gtkdoc-scangobj has changed to no longer use a shell when executing its subcommands. In
+        particular, this means we can no longer rely on shell stuff in our run command that we use
+        to run the scanner. We currently use the RUN envvar to set LD_LIBRARY_PATH, and the end
+        result is gtkdoc-scangobj now attempts to execute our environment variable instead of the
+        scanner itself. We can just set LD_LIBRARY_PATH directly, instead of using RUN, in order to
+        make documentation generation work again.
+
+        * gtk/gtkdoc.py:
+        (GTKDoc._run_gtkdoc_scangobj):
+
 2017-11-04  Aishwarya Nirmal  <anirmal@apple.com>
 
         [Touch Bar Web API] Add support for menuitem tag
index 48f862a..03c8e8e 100644 (file)
@@ -319,9 +319,9 @@ class GTKDoc(object):
             ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
             current_ld_library_path = env.get('LD_LIBRARY_PATH')
             if current_ld_library_path:
-                env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+                env['LD_LIBRARY_PATH'] = '%s:%s' % (self.library_path, current_ld_library_path)
             else:
-                env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+                env['LD_LIBRARY_PATH'] = self.library_path
 
         if ldflags:
             env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
@@ -332,8 +332,6 @@ class GTKDoc(object):
             self.logger.debug('CFLAGS=%s', env['CFLAGS'])
         if 'LDFLAGS' in env:
             self.logger.debug('LDFLAGS %s', env['LDFLAGS'])
-        if 'RUN' in env:
-            self.logger.debug('RUN=%s', env['RUN'])
         self._run_command(['gtkdoc-scangobj', '--module=%s' % self.module_name],
                           env=env, cwd=self.output_dir)