Re: [Gimp-docs] Figures for each language on docs.gimp.org
Hi Ulf, On Sat, Jul 21, 2012 at 08:20:47PM +0200, Ulf-D. Ehlert wrote: > On Fri, Jul 20, 2012 at 08:36:04PM +1000, Roman Joost wrote: > (Tip: "make -k [or --keep-going] validate-all" may be better, this > will continue even if validating one language fails.) Cheers for that! > > make html > > > > for i in `find ./html -name 'images' -type l`; do ln -sf -T > > ../images/$(basename $(dirname $i)) $i; done > > I don't see what you want to achieve with this command, but I'm quite > sure it will not work as expected - local or remote. > > (If you really need something like this, we should better add a new > 'make' target.) Trashed it. > I don't use rsync (so maybe I'm wrong), but IMHO you can use > > rsync -avzr -e ssh \ > --relative \ > --delete \ > images xml/*/images html \ > cube:/htdocs/2.8/ > >[...] > ... if you create an alias for every language > > http://docs.gimp.org/2.8/LANG/ = htdocs/2.8/html/LANG > > it should work[*]. It does. Thanks a lot! Now docs.gimp.org should show NIGHTLIES again with all figures. Cheers, -- Roman Joost www: http://www.romanofski.de email: romanof...@gimp.org signature.asc Description: Digital signature ___ gimp-docs-list mailing list gimp-docs-list@gnome.org https://mail.gnome.org/mailman/listinfo/gimp-docs-list
Re: [Gimp-docs] Figures for each language on docs.gimp.org
Hi Roman, I don't know if I can solve your problem (and I have no idea why everything worked for 2.6, but not for 2.8), but here are my thoughts/suggestions: On Fri, Jul 20, 2012 at 08:36:04PM +1000, Roman Joost wrote: > Build steps are: > > make clean > > ./autogen.sh --without-gimp > > make validate-all > (Tip: "make -k [or --keep-going] validate-all" may be better, this will continue even if validating one language fails.) > make html > > for i in `find ./html -name 'images' -type l`; do ln -sf -T > ../images/$(basename $(dirname $i)) $i; done I don't see what you want to achieve with this command, but I'm quite sure it will not work as expected - local or remote. (If you really need something like this, we should better add a new 'make' target.) > for i in html/ images xml; do\ > rsync -avzr -e ssh $i cube:/htdocs/2.8/; > done I don't use rsync (so maybe I'm wrong), but IMHO you can use rsync -avzr -e ssh \ --relative \ --delete \ images xml/*/images html \ cube:/htdocs/2.8/ Then you should have a working copy under cube:/htdocs/2.8/: htdocs/2.8/html/LANG htdocs/2.8/html/LANG/images -> ../../xml/LANG/images htdocs/2.8/images htdocs/2.8/xml/LANG htdocs/2.8/xml/LANG/images # containing proper symlinks and .. > In the second last step, I'm repointing the the image links to one level > above the HTML directory. That's because the 2.8 directory holds the > whole structure and sub-directories: > > /2.8/html/... > /2.8/images/... > /2.8/xml/... ... if you create an alias for every language http://docs.gimp.org/2.8/LANG/ = htdocs/2.8/html/LANG it should work[*]. Ulf [*] It won't work, of course, I surely missed something... ;-) -- Jeder hat zunächst den Gottesglauben, den man ihm aufgeschwatzt hat; aber allmählich hat er den, den er verdient. -- Karlheinz Deschner ___ gimp-docs-list mailing list gimp-docs-list@gnome.org https://mail.gnome.org/mailman/listinfo/gimp-docs-list
Re: [Gimp-docs] Figures for each language on docs.gimp.org
Hi Ulf, On Thu, Jul 19, 2012 at 06:27:55PM +0200, Ulf-D. Ehlert wrote: > On Thu, Jul 19, 2012 at 08:02:11PM +1000, Roman Joost wrote: > > E.g. > > http://docs.gimp.org/2.8/de/gimp-concepts-main-windows.html#gimp-concepts-toolbox > > > > uses images/using/toolbox-description.png for the toolbox figure, but if > > I check under images/de/using, there is no such file. Perhaps should it > > use the one located under 'C'? > > > > What build step may I have missed? > > How are the docs installed on the server? Sorry for leaving out that much information ;) Build steps are: make clean ./autogen.sh --without-gimp make validate-all make html for i in `find ./html -name 'images' -type l`; do ln -sf -T ../images/$(basename $(dirname $i)) $i; done for i in html/ images xml; do\ rsync -avzr -e ssh $i cube:/htdocs/2.8/; done In the second last step, I'm repointing the the image links to one level above the HTML directory. That's because the 2.8 directory holds the whole structure and sub-directories: /2.8/html/... /2.8/images/... /2.8/xml/... I'm now thinking that this steps stuffs the figures up, but I can't really find that is is all correctly wired before I run the step. Cheers, -- Roman Joost www: http://www.romanofski.de email: romanof...@gimp.org signature.asc Description: Digital signature ___ gimp-docs-list mailing list gimp-docs-list@gnome.org https://mail.gnome.org/mailman/listinfo/gimp-docs-list
Re: [Gimp-docs] Figures for each language on docs.gimp.org
On Thu, Jul 19, 2012 at 08:02:11PM +1000, Roman Joost wrote: > Hi! > > I'm currently having a few problems getting the figures right on > docs.gimp.org. One problem I'm having is, that it seems that images are > missing. Perhaps the files are not missing, but in the web of symbolic > links gone missing. > > E.g. > http://docs.gimp.org/2.8/de/gimp-concepts-main-windows.html#gimp-concepts-toolbox > > uses images/using/toolbox-description.png for the toolbox figure, but if > I check under images/de/using, there is no such file. Perhaps should it > use the one located under 'C'? > > What build step may I have missed? How are the docs installed on the server? Ulf -- Wer sich über die Bibel nicht empört, kennt sie nicht. Oder ist zu feige oder innerlich zu unfrei, sich zu empören. -- Franz Buggle, "Denn sie wissen nicht, was sie glauben." ___ gimp-docs-list mailing list gimp-docs-list@gnome.org https://mail.gnome.org/mailman/listinfo/gimp-docs-list
[Gimp-docs] Figures for each language on docs.gimp.org
Hi! I'm currently having a few problems getting the figures right on docs.gimp.org. One problem I'm having is, that it seems that images are missing. Perhaps the files are not missing, but in the web of symbolic links gone missing. E.g. http://docs.gimp.org/2.8/de/gimp-concepts-main-windows.html#gimp-concepts-toolbox uses images/using/toolbox-description.png for the toolbox figure, but if I check under images/de/using, there is no such file. Perhaps should it use the one located under 'C'? What build step may I have missed? Cheers, -- Roman Joost www: http://www.romanofski.de email: romanof...@gimp.org signature.asc Description: Digital signature ___ gimp-docs-list mailing list gimp-docs-list@gnome.org https://mail.gnome.org/mailman/listinfo/gimp-docs-list
