GNOME Bugzilla – Bug 687563
Port to new documentation infrastructure
Last modified: 2013-09-30 15:08:00 UTC
Created attachment 228024 [details] [review] port to new documentation infrastructure Use yelp-tools instead of gnome-doc-utils https://live.gnome.org/GnomeGoals/NewDocumentationInfrastructure
would be nice to get this merged, so we can close the book on new documentation infrastructure porting...
Hi there, I'm far from knowledgeable about packaging/build scripts, but I'll trust that you know what you're doing here :) Some initial errors I've found: - You say "please install yelp-tool", but yelp-tool doesn't exist. Shouldn't it be "\nPlease install the yelp-tools package" ? - Some of your changes add trailing whitespaces at the end of lines (at least that's what git tells me) - It breaks the build. Please ensure you run "./autogen.sh && make" and that it works... In my case, it says: make[2]: Nothing to be done for `all-am'. make[2]: Leaving directory `/home/jeff/pitivi-git/pitivi/data' make[1]: Leaving directory `/home/jeff/pitivi-git/pitivi/data' Making all in help make[1]: Entering directory `/home/jeff/pitivi-git/pitivi/help' Makefile:452: *** missing separator. Stop. make[1]: Leaving directory `/home/jeff/pitivi-git/pitivi/help' make: *** [all-recursive] Error 1
Created attachment 231232 [details] [review] Use-yelp-tools-instead-gnome-doc-utils.v2 Updated patch against current master. Seems that Olivier remove some lines in autogen.sh needed for the build
(In reply to comment #3) > Created an attachment (id=231232) [details] [review] > Use-yelp-tools-instead-gnome-doc-utils.v2 > > Updated patch against current master. > > Seems that Olivier remove some lines in autogen.sh needed for the build Thanks Javier for taking the time and "fixing" my mistake and update the patch. I'm sorry for not looking into this sooner, needless to say I'm no expert in build scripts. I should of course have tasted the patch more carefully before submitting it.
Review of attachment 231232 [details] [review]: There's a few typos. One of the lines should probably like this instead: > echo "please install the yelp-tools package" Also, is there a specific reason why you changed the ghelp: uris to help: ? This seems to break loading the manual pages in yelp from pitivi and prevents me from pushing your patch. Please ensure that your patch keeps working with ./autogen.sh && make && make check (make distcheck will fail, but that's not related to your patch), and that you can open the user manual from inside the application in both the non-installed (dev) mode and the system-wide installed version. Thanks :)
Oh, and if you want to know where the help URI is actually being used, it's at the bottom of utils/misc.py, in the "show_user_manual" method.
(In reply to comment #5) > Also, is there a specific reason why you changed the ghelp: uris to help: ? help: is correct.
*** Bug 704626 has been marked as a duplicate of this bug. ***
yelp uses file:// urls for local files and help:app_id urls for installed help packages. this command does not work: yelp help:///home/bmonkey/workspace/ges/pitivi/help/C/ but this does: yelp file:///home/bmonkey/workspace/ges/pitivi/help/C/ Pitivi uses Gtk.show_uri to open the file. The file url would open the directory in nautilus. When index.page would be chosen, it would open either a web browser or a text editor, depending on which mime type was recognized and which application is associated with it. Yelp does not install a mime type for *.page files, could be something like x-mallard. So this won't work. But this still works: yelp ghelp:///home/bmonkey/workspace/ges/pitivi/help/C/ So keeping ghelp for local and taking help:pitivi for installed works. I modified the patch and updated it for current master. https://github.com/lubosz/pitivi/commit/fa59c58e56d936e2a9a4fd62e4719fc9ec1e58df
Alright, so I re-reviewed everything and applied some tiny fixes on top, pushed as commit 75b96b2 to master while preserving the original authorship (Olivier did the big part of the work after all). Note: see bug #706223 for the followup on the help: vs ghelp: issue. Everybody, thanks for your patience and help, and my apologies for taking so long to get around to merging and pushing this - many pressing things got in the way in the past few months. I hope to be quicker for your next patch :)
*** Bug 685058 has been marked as a duplicate of this bug. ***
Reopening as that patch broke $make distcheck, we are now getting: make[3]: Entering directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/data/audiopresets' make[3]: Leaving directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/data/audiopresets' (cd videopresets && make top_distdir=../../pitivi-0.99.0 distdir=../../pitivi-0.99.0/data/videopresets \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[3]: Entering directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/data/videopresets' make[3]: Leaving directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/data/videopresets' make[2]: Leaving directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/data' (cd help && make top_distdir=../pitivi-0.99.0 distdir=../pitivi-0.99.0/help \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[2]: Entering directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/help' cd .. && /bin/sh /home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/missing automake-1.13 --gnu help/Makefile configure.ac:29: warning: AM_INIT_AUTOMAKE: two- and three-arguments forms are deprecated. For more info, see: configure.ac:29: http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_005fINIT_005fAUTOMAKE-invocation cd .. && /bin/sh ./config.status help/Makefile config.status: creating help/Makefile make[2]: Leaving directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/help' make[2]: Entering directory `/home/thiblahute/devel/pitivi/1.0-uninstalled/pitivi/help' cp: cannot stat ‘./cs/about.page’: No such file or directory [3]+ Stopped vimx -n help/Makefile.am [ptv] thiblahute@Thibault-laptop ~/devel/pitivi/1.0-unins
Sigh :( Would be awesome if someone here is willing to help with this, as this becomes a release blocker (we can't release if make distcheck fails).