Re: Copy pdf docs to new website folder (issue 5507046)
Reviewers: Graham Percival,
Message:
On 2012/01/01 23:14:05, Graham Percival wrote:
LGTM, but I had to add issue 2166 to track this.
Sorry, didn't understand what you mean by add issue 2166 to track this
Anything I can do to help this to get live?
Description:
Patch related to http://codereview.appspot.com/5500069/.
There is a git pull request on github to put pdf files in
lilypond-extra.
These patches copy the files to the correct place, and rewrite links.
I did some changes on the contribution documentation page as well, given
that is misses some details. Also not that the wbesite page is not
up-to-date to the latest git repository version.
Please review this at http://codereview.appspot.com/5507046/
Affected files:
M Documentation/contributor/programming-work.itexi
M Documentation/contributor/website-work.itexi
M Documentation/cs/web/introduction.itexi
M Documentation/de/web/introduction.itexi
M Documentation/es/web/introduction.itexi
M Documentation/fr/web/community.itexi
M Documentation/fr/web/introduction.itexi
M Documentation/hu/web/community.itexi
M Documentation/it/web/introduction.itexi
M Documentation/ja/web/introduction.itexi
M Documentation/nl/web/introduction.itexi
M Documentation/web/introduction.itexi
M Documentation/web/we-wrote.bib
M make/website.make
Index: Documentation/contributor/programming-work.itexi
diff --git a/Documentation/contributor/programming-work.itexi
b/Documentation/contributor/programming-work.itexi
index
e6aa1f0d9961e9522715159e94ff8066c808088c..1ff0247a731a2fd725ae08507a12fca73fa9a3cd
100644
--- a/Documentation/contributor/programming-work.itexi
+++ b/Documentation/contributor/programming-work.itexi
@@ -29,7 +29,7 @@ number of stages. This process, along with the types of
routines that
accomplish the various stages of the process, is described in this
section. A
more complete description of the LilyPond architecture and internal program
execution is found in Erik Sandberg's
-@uref{http://lilypond.org/web/images/thesis-erik-sandberg.pdf, master's
+@uref{http://lilypond.org/website/pdf/thesis-erik-sandberg.pdf, master's
thesis}.
The first stage of LilyPond processing is @emph{parsing}. In the parsing
Index: Documentation/contributor/website-work.itexi
diff --git a/Documentation/contributor/website-work.itexi
b/Documentation/contributor/website-work.itexi
index
49bf3db6f5a6f1f9196cd9ffd723c8aa37da264e..aaced80cff446d2845649a332f49209d3d8c9839
100644
--- a/Documentation/contributor/website-work.itexi
+++ b/Documentation/contributor/website-work.itexi
@@ -65,9 +65,9 @@ Initial setup:
Create directories:
@example
-$HOME/lilypond/
-$HOME/lilypond/media/
-$HOME/lilypond/trusted-scripts/
+mkdir $HOME/lilypond/
+mkdir $HOME/lilypond/media/
+mkdir $HOME/lilypond/trusted-scripts/
@end example
To reduce the CPU burden on the shared host (as well as some
@@ -114,6 +114,17 @@ cp $GIT/Documentation/web/server/lilypond.org.htaccess
$DEST/lilypond.org.htacce
cp $GIT/Documentation/web/server/website-dir.htaccess
$DEST/website-dir.htaccess
@end smallexample
+For a complete build you will need a copy of @code{lilypond-extra} git
repository.
+You can checkout a fresh copy easily:
+
+@example
+export LILYPOND_WEB_MEDIA_GIT=$HOME/lilypond-extra
+git clone git://github.com/gperciva/lilypond-extra.git
$LILYPOND_WEB_MEDIA_GIT
+@end example
+
+Just note that the example above expects a bash environment. If you are
using another shell
+you might need to use a different keyword, other than @code{export}.
+
Delete your build directory (or maybe just rename your build
directory to build-old).
Index: Documentation/cs/web/introduction.itexi
diff --git a/Documentation/cs/web/introduction.itexi
b/Documentation/cs/web/introduction.itexi
index
e1290089a155e42b6f589ddb796b9298e9064d5d..b1096adb499c05700a092105120448fae7c1bbeb
100644
--- a/Documentation/cs/web/introduction.itexi
+++ b/Documentation/cs/web/introduction.itexi
@@ -687,7 +687,7 @@ Francouzský článek o LilyPondu ve verzi 2.6 se objevuje
na
Vydavatelé holandského časopisu Computer!Totaal,
který se věnuje počítačům,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
+@uref{http://lilypond.org/website/pdf/computer-totaal.jpeg,
popisují LilyPond} ve vydání z října 2004 jako: @qq{báječný
svobodný (Open Source) program [...] Noty vytvořené LilyPondem
jsou bez výjimky nádherné [...] Jde o velmi silný systém, který
Index: Documentation/de/web/introduction.itexi
diff --git a/Documentation/de/web/introduction.itexi
b/Documentation/de/web/introduction.itexi
index
ba8fc7497481dd82f077998a034549e4cf22a1e4..e9f52b22851c4428575d36c5f436d226fb4c52e4
100644
--- a/Documentation/de/web/introduction.itexi
+++ b/Documentation/de/web/introduction.itexi
@@ -722,7 +722,7 @@ Oktober 2004
Die Editoren von Computer!Totaal, einer holländischen
Computerzeitschrift,
-@uref{http://lilypond.org/web/images/computer-totaal.jpeg,
Re: Hiding old website /web/install page (issue 5500069)
On 2011/12/27 19:41:05, ambs wrote: github pull request sent. will work next in the copy procedure. Check http://codereview.appspot.com/5507046/edit for continuation on this. http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
On 2012/01/01 14:52:11, ambs wrote: On 2011/12/27 19:41:05, ambs wrote: github pull request sent. will work next in the copy procedure. Check http://codereview.appspot.com/5507046/edit for continuation on this. http://codereview.appspot.com/5507046/ ... :) http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
After that code merge (hope it has the needed quality) you need to think what to do regarding RSS and web/ links on 'old-news' page. Also, note that documentation is using the web/../languagedetection application. http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
github pull request sent. will work next in the copy procedure. http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
testing, 1, 2, 3? http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
Ok, sorry for this test, but something failed some seconds ago. Sending the real message now... There are 4 files that should be preserved. Downloaded them. Where in github should I add them? pictures? Then, there is a rss feed and a /web links in old-news.html. http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
Let me know if this is what you are thinking: 1. upload those files to github (tell me the folder, I create a pull request) 2. make makefiles copy the files to the correct place 3. change texi files so they point to the new URL (let me know what should be that new URL) 4. change the htaccess files so that old links point to the new files, so that any external link still works 5. remove the reference to /web and to the RSS from old-news (or remove old-news). Is this correct? Let me know what you prefer I start with. Cheers ambs http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
Reviewers: Graham Percival, http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/website-work.itexi File Documentation/contributor/website-work.itexi (right): http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/website-work.itexi#newcode128 Documentation/contributor/website-work.itexi:128: make -f website.make WEBSITE_ONLY_BUILD=1 \ Note that this does not change any script, JUST documentation. If this documentation says you need to copy website.make, then website.make IS THERE. If you copy from this page every time you update your server, then at least remove the line 105 from the documentation, as that file is then not used. Description: changes the way make website is called (if one copy the makefile there is no point in using the makefile from the git repository, or then, there is no point in copying -- or I missed something). The solution is not texi based. Why not? because it is a patch to solve a problem that is not related with the new website, but with the old. The idea is simple, just add an index.html file under /web/install/ that redirects to downloads.html. The makefile code can be easily copied for other folders/pages that are hanging out there. I did not add them because I do not know if you like the solution. If someone wants to test, it is easy: just backup the website, and give it a shot. It should not do any malicious thing. You can also test it locally, but the redirect will not work, as I specified a absolute path. Please review this at http://codereview.appspot.com/5500069/ Affected files: M Documentation/contributor/website-work.itexi A Documentation/web/server/redirect.template M make/website.make Index: Documentation/contributor/website-work.itexi diff --git a/Documentation/contributor/website-work.itexi b/Documentation/contributor/website-work.itexi index ee645a2485daea8c5e815882085371faf4431bf0..b3b84846e86f6ce7ccbd6531ab32b165a67f47db 100644 --- a/Documentation/contributor/website-work.itexi +++ b/Documentation/contributor/website-work.itexi @@ -112,6 +112,7 @@ cp $GIT/scripts/build/website_post.py $DEST/website_post.py cp $GIT/scripts/build/bib2texi.py $DEST/bib2texi.py cp $GIT/Documentation/web/server/lilypond.org.htaccess $DEST/lilypond.org.htaccess cp $GIT/Documentation/web/server/website-dir.htaccess $DEST/website-dir.htaccess +cp $GIT/Documentation/web/server/redirect.template $DEST/redirect.template @end smallexample Delete your build directory (or maybe just rename your build @@ -124,7 +125,7 @@ cd $HOME/lilypond Run @example -make -f ../lilypond-git/make/website.make WEBSITE_ONLY_BUILD=1 \ +make -f website.make WEBSITE_ONLY_BUILD=1 \ TOP_SRC_DIR=$HOME/lilypond-git/ \ PYTHONPATH=$HOME/lilypond-git/python \ TEXI2HTML_PROGRAM=texi2html \ Index: Documentation/web/server/redirect.template diff --git a/Documentation/web/server/redirect.template b/Documentation/web/server/redirect.template new file mode 100644 index ..a3364f8503966b8afa54c736e35160ade6d5631c --- /dev/null +++ b/Documentation/web/server/redirect.template @@ -0,0 +1,7 @@ +!DOCTYPE HTML PUBLIC -//W3C//DTD HTML 4.0 Transitional//EN +html +head +meta http-equiv=REFRESH content=0;url=/[% PATH %]/head +body +/body +/html Index: make/website.make diff --git a/make/website.make b/make/website.make index d6d9ef7a12a09b921b922214370820e51edae311..7ec04141f5cc39a8e1fe6a46f7698a634c8345ca 100644 --- a/make/website.make +++ b/make/website.make @@ -131,7 +131,7 @@ xref-files = $(MANUALS_BASE:%=$(OUT)/%.xref-map) .PHONY: website website-bibs website-css website-examples website-misc \ website-pictures website-post website-test website-texinfo \ -website-version website-xrefs check-setup +website-version website-xrefs check-setup website-redirects check-setup: ifeq ($(LILYPOND_WEB_MEDIA_GIT),) @@ -139,7 +139,7 @@ ifeq ($(LILYPOND_WEB_MEDIA_GIT),) exit 1 endif -website: check-setup website-post website-examples website-pictures website-css website-misc +website: check-setup website-post website-examples website-pictures website-css website-misc website-redirects website-bibs: website-version $(OUT) $(bib-files) @@ -162,6 +162,7 @@ website-version: $(OUT) $(version-files) website-xrefs: website-version $(OUT) $(xref-files) +website-redirects: $(OUT)/web/install/index.html # ### Rules @@ -188,6 +189,13 @@ $(bib-files): $(OUT)/%.itexi: $(top-src-dir)/Documentation/web/%.bib $(quiet-flag) \ $ +# some redirects +$(OUT)/web/install/index.html: $(TRUSTED_DIR)/redirect.template + mkdir -p $(OUT)/web/install + sed -s 's/\[% PATH %\]/download.html/' \ + $(TRUSTED_DIR)/redirect.template $(OUT)/web/install/index.html + + # Get xrefs for English tely manuals $(MANUALS_TELY:%.tely=$(OUT)/%.xref-map): $(OUT)/%.xref-map: $(top-src-dir)/Documentation/%.tely
Re: Hiding old website /web/install page (issue 5500069)
1) your solution will not work because the website is not built in the production area. A separate script copies the website, once it's built, into the web server directory. Your web/install.html will never be seen by the web server. Because the script doesn't copy it. That would be easy to solve. 2) I would not accept this solution even if it worked, because it involves weird hard-coding for the old website. Agreed. But solves an issue that is hanging around for.. one year? I am not selling this as the salvation for the world, but as a patch to remove that page from newbies looking from lilypond while no lilypond devel has 30 minutes to copy the PDF files :) Anyway, will try to find what files are being pointed by the new website. Cheers http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
On 2011/12/22 16:16:44, Graham Percival wrote: http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/website-work.itexi File Documentation/contributor/website-work.itexi (right): http://codereview.appspot.com/5500069/diff/1/Documentation/contributor/website-work.itexi#newcode128 Documentation/contributor/website-work.itexi:128: make -f website.make WEBSITE_ONLY_BUILD=1 \ On 2011/12/22 16:10:39, ambs wrote: Note that this does not change any script, JUST documentation. If this documentation says you need to copy website.make, then website.make IS THERE. No, line 105 copies website.make into $HOME/lilypond/trusted-scripts, not $HOME/lilypond/ However, using website.make from git is certainly a security risk, which I will fix immediately on the server. Thanks for catching this! Oh, good point. Anyway, that makefile seems that is not being used. It that copy really needed? http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
Hello, Graham
Instead of looking to the documentation files (the texi source files) I
wgetted part of the website, and grepped for /web/ URLs.
These are some results (not filtered) that show (if I did not grep wrong
files) that there are more than just plain pdf or images being linked
there.
If I am not wrong and we need to fix some of these URLs (namely the
language detection script) I would suggest that we do this one step at a
time.
It might help to organize the work :)
Well, the list includes (the grep/sed sequence wasn't that clean, but,
it is a beginning)
4 #http://lilypond.org/web/;
4 \with-url #http://lilypond.org/web/; {
42 \with-url #quot;http://lilypond.org/web/quot; {
11003 /web/about/browser-language
104 http://lilypond.org/web;
2 http://lilypond.org/web/about/faq;
1 http://lilypond.org/web/about/faq.html;
9 http://lilypond.org/web/devel/participating/bugs;
104 http://lilypond.org/web/images/FISL7-slides.pdf;
94 http://lilypond.org/web/images/computer-totaal.jpeg;
84 http://lilypond.org/web/images/thesis-erik-sandberg;
24 http://lilypond.org/web/images/thesis-erik-sandberg.pdf;
104 http://lilypond.org/web/images/xivcim.pdf;
320 http://lilypond.org/web/lilypond-rss-feed.xml;
10 http://lilypond.org/web/lilypond-rss-feed.xml/
1 http://lilypond.org/web/sponsor/;
2 http://lilypond.org/web/switch/howto;
1 http://lilypond.org/web/switch/howto.html;
1 'http://lilypond.org/web/help/'auf der LilyPond-Hilfeseite/a.
1 'http://lilypond.org/web/help/'ezt/a.
1 'http://lilypond.org/web/help/'la página de ayuda de LilyPond/a.
1 'http://lilypond.org/web/help/'page d'aide de LilyPond/a.
3 'http://lilypond.org/web/help/'the LilyPond help page/a.
(yeah, I could clean it a little more, but was lazy).
For each URL I can find the file that uses it, in case it is needed.
Later (today or tomorrow) I'll do a similar treatment to the texi files.
Cheers
ambs
http://codereview.appspot.com/5500069/
___
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
Re: Hiding old website /web/install page (issue 5500069)
The detection language script is called by all the documentation files. Some examples below. doc/v2.15/Documentation/web/text-input.nl.html:190: Gebruik van A HREF=/web/about/browser-languageautomatische taalkeuze/A. doc/v2.15/Documentation/web/text-input.zh.html:78: About A HREF=/web/about/browser-languageautomatic language selection/A. doc/v2.15/Documentation/web/tiny-examples.cs.html:132: O A HREF=/web/about/browser-languageautomatickém výběru řeči/A. doc/v2.15/Documentation/web/tiny-examples.de.html:172: Über die A HREF=/web/about/browser-languageautomatische Sprachauswahl/A. doc/v2.15/Documentation/web/tiny-examples.es.html:171: Acerca de la A HREF=/web/about/browser-languageselección automática del idioma/A. doc/v2.15/Documentation/web/tiny-examples.fr.html:173: À propos de la A HREF=/web/about/browser-languagesélection automatique de la langue/A. doc/v2.15/Documentation/web/tiny-examples.html:166: About A HREF=/web/about/browser-languageautomatic language selection/A. doc/v2.15/Documentation/web/tiny-examples.hu.html:129: Az a href=/web/about/browser-languageautomatikus nyelvválasztásról/a. doc/v2.15/Documentation/web/tiny-examples.it.html:164: About A HREF=/web/about/browser-languageautomatic language selection/A. doc/v2.15/Documentation/web/tiny-examples.ja.html:114: About A HREF=/web/about/browser-languageautomatic language selection/A. doc/v2.15/Documentation/web/tiny-examples.nl.html:166: Gebruik van A HREF=/web/about/browser-languageautomatische taalkeuze/A. doc/v2.15/Documentation/web/tiny-examples.zh.html:70: About A HREF=/web/about/browser-languageautomatic language selection/A. doc/v2.15/Documentation/web/translated.cs.html:128: O A HREF=/web/about/browser-languageautomatickém výběru řeči/A. doc/v2.15/Documentation/web/translated.de.html:282: Über die A HREF=/web/about/browser-languageautomatische Sprachauswahl/A. doc/v2.15/Documentation/web/translated.es.html:285: Acerca de la A HREF=/web/about/browser-languageselección automática del idioma/A. will forget this issue, getting back to PDFs. cheers ambs http://codereview.appspot.com/5500069/ ___ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
