Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1181)

Delta Between Two Patch Sets: make/website.make

Issue 4515042: Making website build almost completely quiet (Closed)
Left Patch Set: 2nd draft of quiet website build Created 12 years, 10 months ago
Right Patch Set: Add a -q quiet flag to 'make website' scripts Created 12 years, 10 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « Documentation/lilypond-texi2html.init ('k') | scripts/build/bib2texi.py » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 ################################################################ 1 ################################################################
2 # website (without the rest of the docs) 2 # website (without the rest of the docs)
3 3
4 ################################################################ 4 ################################################################
5 ##### SECURITY -- check these values for lilypond.org ######### 5 ##### SECURITY -- check these values for lilypond.org #########
6 ################################################################ 6 ################################################################
7
Graham Percival (old account) 2011/05/15 20:19:52 IMO this stuff isn't security -- could you move it
8 ################################################################
9 #The 4 lines below present an option to force make website to run
10 # quietly only when it is run as make -s website. However, we've
11 # decided not to use this switch, and run the scripts quietly all
12 # the time
13 ################################################################
14 #quiet-run = $(findstring s, $(MAKEFLAGS))
15 #ifeq ($(quiet-run),s)
16 # quiet-flag=-q
17 #endif
18
19 #Nothing clever here - just allows the use of a boolean to control
20 # quiet running
21 quiet-run = true
22 ifeq ($(quiet-run),true)
23 quiet-flag=-q
24 endif
25 7
26 ifeq ($(WEBSITE_ONLY_BUILD),1) 8 ifeq ($(WEBSITE_ONLY_BUILD),1)
27 ### for lilypond.org 9 ### for lilypond.org
28 TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git 10 TOP_SRC_DIR=$(HOME)/lilypond/lilypond-git
29 TRUSTED_DIR=$(HOME)/lilypond/trusted-scripts 11 TRUSTED_DIR=$(HOME)/lilypond/trusted-scripts
30 top-src-dir=$(TOP_SRC_DIR) 12 top-src-dir=$(TOP_SRC_DIR)
31 depth=. 13 depth=.
32 trusted-dir=$(TRUSTED_DIR) 14 trusted-dir=$(TRUSTED_DIR)
33 script-dir=$(trusted-dir) 15 script-dir=$(trusted-dir)
34 texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init 16 texi2html-init-file=$(trusted-dir)/lilypond-texi2html.init
35 top-htaccess=$(trusted-dir)/lilypond.org.htaccess 17 top-htaccess=$(trusted-dir)/lilypond.org.htaccess
36 dir-htaccess=$(trusted-dir)/website-dir.htaccess 18 dir-htaccess=$(trusted-dir)/website-dir.htaccess
37 TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html 19 TEXI2HTML_PROGRAM=$(HOME)/usr/bin/texi2html
38 EXAMPLES=$(HOME)/lilypond/media/ly-examples 20 EXAMPLES=$(HOME)/lilypond/media/ly-examples
39 PICTURES=$(HOME)/lilypond/media/pictures 21 PICTURES=$(HOME)/lilypond/media/pictures
40 else 22 else
41 ### for normal git 23 ### for normal git
42 script-dir=$(top-src-dir)/scripts/build 24 script-dir=$(top-src-dir)/scripts/build
43 texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init 25 texi2html-init-file=$(top-src-dir)/Documentation/lilypond-texi2html.init
44 top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess 26 top-htaccess=$(top-src-dir)/Documentation/web/server/lilypond.org.htaccess
45 dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess 27 dir-htaccess=$(top-src-dir)/Documentation/web/server/website-dir.htaccess
46 include $(config_make) 28 include $(config_make)
47 # I assume this is run from top-build-dir 29 # I assume this is run from top-build-dir
48 EXAMPLES=Documentation/web/ly-examples/out-www 30 EXAMPLES=Documentation/web/ly-examples/out-www
49 PICTURES=Documentation/pictures/out-www 31 PICTURES=Documentation/pictures/out-www
50 endif 32 endif
33
34 ################################################################
35 #The 4 lines below present an option to force make website to run
36 # quietly only when it is run as make -s website. However, we've
37 # decided not to use this switch, and run the scripts quietly all
38 # the time
39 ################################################################
40 #quiet-run = $(findstring s, $(MAKEFLAGS))
41 #ifeq ($(quiet-run),s)
42 # quiet-flag=-q
43 #endif
44
45 #Nothing clever here - just allows the use of a boolean to control
46 # quiet running
47 quiet-run = true
48 ifeq ($(quiet-run),true)
49 quiet-flag=-q
50 endif
51
51 52
52 53
53 ################################################################ 54 ################################################################
54 OUT=out-website 55 OUT=out-website
55 56
56 ### only update this when the language compiles correctly! 57 ### only update this when the language compiles correctly!
57 # LANGUAGES = (site, cs, de, es, fr, hu, it, ja, nl, zh) 58 # LANGUAGES = (site, cs, de, es, fr, hu, it, ja, nl, zh)
58 #WEB_LANGS = de es fr hu it ja nl zh cs 59 #WEB_LANGS = de es fr hu it ja nl zh cs
59 WEB_LANGS = cs de es fr hu it ja nl zh 60 WEB_LANGS = cs de es fr hu it ja nl zh
60 61
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 web-post: 163 web-post:
163 $(WEB_POST) $(OUT)/website 164 $(WEB_POST) $(OUT)/website
164 165
165 website: website-texinfo website-css website-pictures website-examples web-post 166 website: website-texinfo website-css website-pictures website-examples web-post
166 cp $(SERVER_FILES)/favicon.ico $(OUT)/website 167 cp $(SERVER_FILES)/favicon.ico $(OUT)/website
167 cp $(SERVER_FILES)/robots.txt $(OUT)/website 168 cp $(SERVER_FILES)/robots.txt $(OUT)/website
168 cp $(top-htaccess) $(OUT)/.htaccess 169 cp $(top-htaccess) $(OUT)/.htaccess
169 cp $(dir-htaccess) $(OUT)/website/.htaccess 170 cp $(dir-htaccess) $(OUT)/website/.htaccess
170 171
171 172
LEFTRIGHT

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b