77542 2012-02-01 04:14:01 -0800 [GTK] WebKit1 API documentation is not generated when building with gtk-2.0 2014-04-08 17:46:41 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED WONTFIX Gtk P2 Normal --- 77551 1 cgarcia cgarcia eric gustavo mrobinson pnormand xan.lopez oldest_to_newest 546995 0 cgarcia 2012-02-01 04:14:01 -0800 Tools/gtk/generate-gtkdoc assumes gtk3 is always used and creates a generator for webkit2gtk-3.0.pc 546999 1 124926 cgarcia 2012-02-01 04:19:28 -0800 Created attachment 124926 Patch 547042 2 124926 gustavo 2012-02-01 06:12:52 -0800 Comment on attachment 124926 Patch That reminds me I had to fix the doc build for the debian package but hadn't taken the time yet to upload the patch. Here's what I have fwiw. The common.py part is required because the debian package builds in a directory called build-x.y (where x.y is 2.0 for the gtk2-based library and 3.0 for gtk3-based one). diff --git a/Tools/gtk/common.py b/Tools/gtk/common.py index 7941e13..59f1aec 100644 --- a/Tools/gtk/common.py +++ b/Tools/gtk/common.py @@ -64,6 +64,10 @@ def get_build_path(): if is_valid_build_directory(build_dir): return build_dir + build_dir = os.getcwd() + if is_valid_build_directory(build_dir): + return build_dir + print 'Could not determine build directory.' sys.exit(1) diff --git a/Tools/gtk/generate-gtkdoc b/Tools/gtk/generate-gtkdoc index db5f83a..6b48f46 100755 --- a/Tools/gtk/generate-gtkdoc +++ b/Tools/gtk/generate-gtkdoc @@ -83,7 +83,11 @@ def get_webkit1_options(): ' -I' + common.top_level_path('Source', 'JavaScriptCore', 'ForwardingHeaders'), 'ignored_files': glob.glob(src_path('webkit', '*private.*')) }) - return (common.build_path('Source', 'WebKit', 'gtk', 'webkitgtk-3.0.pc'), options) + + if os.path.exists(common.build_path('Source', 'WebKit', 'gtk', 'webkitgtk-3.0.pc')): + return (common.build_path('Source', 'WebKit', 'gtk', 'webkitgtk-3.0.pc'), options) + + return (common.build_path('Source', 'WebKit', 'gtk', 'webkit-1.0.pc'), options) configure_logging() 547149 3 cgarcia 2012-02-01 10:05:16 -0800 Committed r106474: <http://trac.webkit.org/changeset/106474> 552158 4 gustavo 2012-02-08 08:45:49 -0800 Looks like this hasn't fixed the issue, seb128 reported on IRC that the package build for 1.7.5 failed because of no documentation built for the gtk2-based library. The second part of the alternative patch I posted in comment 2 was working for us in 1.7.4. Here's the log: https://launchpadlibrarian.net/92255948/buildlog_ubuntu-precise-i386.webkit_1.7.5-0ubuntu1~build3_FAILEDTOBUILD.txt.gz 552161 5 gustavo 2012-02-08 08:46:24 -0800 I posted the first patch of my patch to a separate bug, btw: https://bugs.webkit.org/show_bug.cgi?id=78118 589159 6 eric 2012-03-27 12:38:54 -0700 Attachment 124926 was posted by a committer and has review+, assigning to Carlos Garcia Campos for commit. 998924 7 mrobinson 2014-04-08 17:46:41 -0700 WebKit1GTK+ has been removed. 124926 2012-02-01 04:19:28 -0800 2012-02-01 08:27:16 -0800 Patch gtk-doc-gtk2.diff text/plain 4705 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3NjQz YjAwLi41NTJkZmJlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTItMDItMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFdlYktpdDEgQVBJIGRvY3Vt ZW50YXRpb24gaXMgbm90IGdlbmVyYXRlZCB3aGVuIGJ1aWxkaW5nIHdpdGggZ3RrLTIuMAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzc1NDIKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd0ay9nZW5lcmF0 ZS1ndGtkb2M6IENoZWNrIGZpcnN0IHdoZXRoZXIgdGhlcmUncworICAgICAgICB3ZWJraXRndGst My4wLnBjIGFuZCBpZiBpdCBkb2Vzbid0IGV4aXN0IHVzZSB3ZWJraXRndGstMS4wLnBjCisgICAg ICAgIGluc3RlYWQuCisgICAgICAgIChnZXRfd2Via2l0Ml9vcHRpb25zKTogUmV0dXJuIGp1c3Qg dGhlIG9wdGlvbnMgc2luY2UgdGhlCisgICAgICAgIHBrZ19jb25maWdfcGF0aCBkb2Vzbid0IGRl cGVuZCBvbiBvcHRpb25zCisgICAgICAgIChnZXRfd2Via2l0MV9vcHRpb25zKTogRGl0dG8uCisg ICAgICAgIChnZW5lcmF0ZV9kb2MpOiBIZWxwZXIgZnVuY3Rpb24gdG8gY3JlYXRlIGEgZ2VuZXJh dG9yIGFuZCBnZW5lcmF0ZQorICAgICAgICBkb2N1bWVudGF0aW9uIGZvciB0aGUgZ2l2ZW4gcGtn LWNvbmZpZyBmaWxlIHdpdGggdGhlIGdpdmVuIG9wdGlvbnMuCisgICAgICAgICogZ3RrL2d0a2Rv Yy5weToKKyAgICAgICAgKEdUS0RvYy5fX2luaXRfXyk6IERvbid0IHVzZSAqKiBmb3IgYXJncyBw YXJhbWV0ZXIsIHNpbmNlIGl0J3MKKyAgICAgICAgdXNlZCBhcyBhIGRpY3QgYW5kIG5ldmVyIGV4 cGFuZGVkLgorICAgICAgICAoUGtnQ29uZmlnR1RLRG9jLl9faW5pdF9fKTogRGl0dG8uCisKIDIw MTItMDEtMzEgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9pQHNhbXN1bmcuY29tPgogCiAgICAgICAg IFtFRkxdIEFkZCBiYXNpYyBEUlQvRWZsIGltcGxlbWVudGF0aW9uIHRvIHN1cHBvcnQgdmlld3Bv cnQgdGVzdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MgYi9Ub29scy9n dGsvZ2VuZXJhdGUtZ3RrZG9jCmluZGV4IGE1ODM0NWMuLjJiOGM2ZWEgMTAwNzU1Ci0tLSBhL1Rv b2xzL2d0ay9nZW5lcmF0ZS1ndGtkb2MKKysrIGIvVG9vbHMvZ3RrL2dlbmVyYXRlLWd0a2RvYwpA QCAtNjMsNyArNjMsNyBAQCBkZWYgZ2V0X3dlYmtpdDJfb3B0aW9ucygpOgogICAgICAgICAgICAg ICAgICAgICAgICAgIGdsb2IuZ2xvYihzcmNfcGF0aCgnV2ViS2l0V2ViVmlld0Jhc2VBY2Nlc3Np YmxlLionKSkgKyBcCiAgICAgICAgICAgICAgICAgICAgICAgICAgZ2xvYi5nbG9iKHNyY19wYXRo KCd0ZXN0cy8qLmgnKSkKICAgICB9KQotICAgIHJldHVybiAoY29tbW9uLmJ1aWxkX3BhdGgoJ1Nv dXJjZScsICdXZWJLaXQyJywgJ3dlYmtpdDJndGstMy4wLnBjJyksIG9wdGlvbnMpCisgICAgcmV0 dXJuIG9wdGlvbnMKIAogZGVmIGdldF93ZWJraXQxX29wdGlvbnMoKToKICAgICBkZWYgc3JjX3Bh dGgoKmFyZ3MpOgpAQCAtODIsNyArODIsMTIgQEAgZGVmIGdldF93ZWJraXQxX29wdGlvbnMoKToK ICAgICAgICAgICAgICAgICAgICAnIC1JJyArIGNvbW1vbi50b3BfbGV2ZWxfcGF0aCgnU291cmNl JywgJ0phdmFTY3JpcHRDb3JlJywgJ0ZvcndhcmRpbmdIZWFkZXJzJyksCiAgICAgICAgICdpZ25v cmVkX2ZpbGVzJzogZ2xvYi5nbG9iKHNyY19wYXRoKCd3ZWJraXQnLCAnKnByaXZhdGUuKicpKQog ICAgIH0pCi0gICAgcmV0dXJuIChjb21tb24uYnVpbGRfcGF0aCgnU291cmNlJywgJ1dlYktpdCcs ICdndGsnLCAnd2Via2l0Z3RrLTMuMC5wYycpLCBvcHRpb25zKQorICAgIHJldHVybiBvcHRpb25z CisKK2RlZiBnZW5lcmF0ZV9kb2MocGtnX2NvbmZpZ19wYXRoLCBvcHRpb25zKToKKyAgICBnZW5l cmF0b3IgPSBndGtkb2MuUGtnQ29uZmlnR1RLRG9jKHBrZ19jb25maWdfcGF0aCwgb3B0aW9ucykK KyAgICBnZW5lcmF0b3IuZ2VuZXJhdGUoaHRtbD0nLS1za2lwLWh0bWwnIG5vdCBpbiBzeXMuYXJn dikKKyAgICByZXR1cm4gZ2VuZXJhdG9yLnNhd193YXJuaW5ncwogCiBjb25maWd1cmVfbG9nZ2lu ZygpCiAKQEAgLTkzLDE3ICs5OCwxOSBAQCBvcy5lbnZpcm9uWydQS0dfQ09ORklHX1BBVEgnXSA9 IGNvbW1vbi5idWlsZF9wYXRoKCdTb3VyY2UnLCAnSmF2YVNjcmlwdENvcmUnKQogaWYgcGtnX2Nv bmZpZ19wYXRoOgogICAgIG9zLmVudmlyb25bJ1BLR19DT05GSUdfUEFUSCddICs9ICc6JyArIHBr Z19jb25maWdfcGF0aAogCi1wcmludCAiR2VuZXJhdGluZyBXZWJLaXQxIGRvY3VtZW50YXRpb24u Li4iCi1wa2dfY29uZmlnX3BhdGgsIG9wdGlvbnMgPSBnZXRfd2Via2l0MV9vcHRpb25zKCkKLWdl bmVyYXRvciA9IGd0a2RvYy5Qa2dDb25maWdHVEtEb2MocGtnX2NvbmZpZ19wYXRoLCAqKm9wdGlv bnMpCi1nZW5lcmF0b3IuZ2VuZXJhdGUoaHRtbD0nLS1za2lwLWh0bWwnIG5vdCBpbiBzeXMuYXJn dikKLXNhd193ZWJraXQxX3dhcm5pbmdzID0gZ2VuZXJhdG9yLnNhd193YXJuaW5ncworc2F3X3dl YmtpdDFfd2FybmluZ3MgPSBzYXdfd2Via2l0Ml93YXJuaW5ncyA9IEZhbHNlCisKK3BrZ19jb25m aWdfcGF0aCA9IGNvbW1vbi5idWlsZF9wYXRoKCdTb3VyY2UnLCAnV2ViS2l0JywgJ2d0aycsICd3 ZWJraXRndGstMy4wLnBjJykKK2lmIG5vdCBvcy5wYXRoLmV4aXN0cyhwa2dfY29uZmlnX3BhdGgp OgorICAgIHBrZ19jb25maWdfcGF0aCA9IGNvbW1vbi5idWlsZF9wYXRoKCdTb3VyY2UnLCAnV2Vi S2l0JywgJ2d0aycsICd3ZWJraXRndGstMS4wLnBjJykKK2lmIG9zLnBhdGguZXhpc3RzKHBrZ19j b25maWdfcGF0aCk6CisgICAgcHJpbnQgIkdlbmVyYXRpbmcgV2ViS2l0MSBkb2N1bWVudGF0aW9u Li4uIgorICAgIHNhd193ZWJraXQxX3dhcm5pbmdzID0gZ2VuZXJhdGVfZG9jKHBrZ19jb25maWdf cGF0aCwgZ2V0X3dlYmtpdDFfb3B0aW9ucygpKQogCiAjIFdlYktpdDIgbWlnaHQgbm90IGJlIGVu YWJsZWQsIHNvIGNoZWNrIGZvciB0aGUgcGtnLWNvbmZpZyBmaWxlIGJlZm9yZSBidWlsZGluZyBk b2N1bWVudGF0aW9uLgotaWYgb3MucGF0aC5leGlzdHMoY29tbW9uLmJ1aWxkX3BhdGgoJ1NvdXJj ZScsICdXZWJLaXQyJywgJ3dlYmtpdDJndGstMy4wLnBjJykpOgorcGtnX2NvbmZpZ19wYXRoID0g Y29tbW9uLmJ1aWxkX3BhdGgoJ1NvdXJjZScsICdXZWJLaXQyJywgJ3dlYmtpdDJndGstMy4wLnBj JykKK2lmIG9zLnBhdGguZXhpc3RzKHBrZ19jb25maWdfcGF0aCk6CiAgICAgcHJpbnQgIlxuR2Vu ZXJhdGluZyBXZWJLaXQyIGRvY3VtZW50YXRpb24uLi4iCi0gICAgcGtnX2NvbmZpZ19wYXRoLCBv cHRpb25zID0gZ2V0X3dlYmtpdDJfb3B0aW9ucygpCi0gICAgZ2VuZXJhdG9yID0gZ3RrZG9jLlBr Z0NvbmZpZ0dUS0RvYyhwa2dfY29uZmlnX3BhdGgsICoqb3B0aW9ucykKLSAgICBnZW5lcmF0b3Iu Z2VuZXJhdGUoaHRtbD0nLS1za2lwLWh0bWwnIG5vdCBpbiBzeXMuYXJndikKKyAgICBzYXdfd2Vi a2l0Ml93YXJuaW5ncyA9IGdlbmVyYXRlX2RvYyhwa2dfY29uZmlnX3BhdGgsIGdldF93ZWJraXQy X29wdGlvbnMoKSkKIAotc3lzLmV4aXQoZ2VuZXJhdG9yLnNhd193YXJuaW5ncyBvciBzYXdfd2Vi a2l0MV93YXJuaW5ncykKK3N5cy5leGl0KHNhd193ZWJraXQxX3dhcm5pbmdzIG9yIHNhd193ZWJr aXQyX3dhcm5pbmdzKQpkaWZmIC0tZ2l0IGEvVG9vbHMvZ3RrL2d0a2RvYy5weSBiL1Rvb2xzL2d0 ay9ndGtkb2MucHkKaW5kZXggNWMwNmY1Mi4uNThkZTBkYSAxMDA2NDQKLS0tIGEvVG9vbHMvZ3Rr L2d0a2RvYy5weQorKysgYi9Ub29scy9ndGsvZ3RrZG9jLnB5CkBAIC03Niw3ICs3Niw3IEBAIGNs YXNzIEdUS0RvYyhvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICAgICAgICB3aWxsIGNvbnRp bnVlIGRlc3BpdGUgd2FybmluZ3MuIChkZWZhdWx0IEZhbHNlKQogICAgICIiIgogCi0gICAgZGVm IF9faW5pdF9fKHNlbGYsICoqYXJncyk6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIGFyZ3MpOgog CiAgICAgICAgICMgUGFyYW1ldGVycyBzcGVjaWZpYyB0byBzY2FubmluZy4KICAgICAgICAgc2Vs Zi5tb2R1bGVfbmFtZSA9ICcnCkBAIC0zNjAsOCArMzYwLDggQEAgY2xhc3MgUGtnQ29uZmlnR1RL RG9jKEdUS0RvYyk6CiAgICAgICBwa2dfY29uZmlnX3BhdGggLS0gUGF0aCB0byB0aGUgcGtnY29u ZmlnIGZpbGUgZm9yIHRoZSBsaWJyYXJ5LiBSZXF1aXJlZC4KICAgICAiIiIKIAotICAgIGRlZiBf X2luaXRfXyhzZWxmLCBwa2dfY29uZmlnX3BhdGgsICoqYXJncyk6Ci0gICAgICAgIHN1cGVyKFBr Z0NvbmZpZ0dUS0RvYywgc2VsZikuX19pbml0X18oKiphcmdzKQorICAgIGRlZiBfX2luaXRfXyhz ZWxmLCBwa2dfY29uZmlnX3BhdGgsIGFyZ3MpOgorICAgICAgICBzdXBlcihQa2dDb25maWdHVEtE b2MsIHNlbGYpLl9faW5pdF9fKGFyZ3MpCiAKICAgICAgICAgaWYgbm90IG9zLnBhdGguZXhpc3Rz KHBrZ19jb25maWdfcGF0aCk6CiAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oJ0NvdWxkIG5v dCBmaW5kIHBrZy1jb25maWcgZmlsZSBhdDogJXMnCg==