8000 Merge pull request #2569 from gsnedders/css2-build · w3c/csswg-drafts@7f30b90 · GitHub
Skip to content

Commit 7f30b90

Browse files
gsneddersgsnedders
authored
Merge pull request #2569 from gsnedders/css2-build
CSS2 build tweaks
2 parents 08bd82c + 8f23284 commit 7f30b90

67 files changed

Lines changed: 111 additions & 8060 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎css2/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
/css2.tgz
66
/css2.txt
77
/css2.zip
8+
/css2.ps
89
/css2.ps.gz
910
/css2.pdf
1011
/css2.html
1112
*-e
13+
/dist

‎css2/.htaccess‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
DirectoryIndex cover.html
2+
<Files ~ "\.html">
3+
ForceType 'text/html; charset=utf-8'
4+
</Files>
5+
<Files ~ "\.txt">
6+
ForceType 'text/plain; charset=utf-8'
7+
</Files>

‎css2/Makefile‎

Lines changed: 33 additions & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ THE_STATUSNAME = Recommendation
1919
THE_STYLE = REC
2020
#THE_STYLE = ED
2121

22-
PREV_YEAR = 2011
23-
PREV_MONTH = 04
24-
PREV_DAY = 12
25-
PREV_STATUS = PR
26-
PREV_NAME = CSS2
27-
2822
PERMANENT_NAME = CSS2
2923

3024
# A very visible warning after the first H1 on every page (or at the
@@ -47,23 +41,16 @@ THE_WARNING = <div> \
4741
</div> \
4842
</div>
4943

50-
# WEBROOT = /afs/w3.org/WWW
51-
WEBROOT = $(HOME)/WWW
52-
53-
CSSGROUPDIR = $(WEBROOT)/Style/Group
54-
UPDATES = /Style/css2-updates
55-
56-
THE_UPDATE_DIR = http://www.w3.org$(UPDATES)
57-
UPDATESDIR= $(WEBROOT)$(UPDATES)
58-
TR_DIR = $(WEBROOT)/TR
5944
THE_DATE = $(THE_DAY) $(THE_MONTHNAME) $(THE_YEAR)
6045
THE_ID = $(THE_STYLE)-$(PERMANENT_NAME)-$(THE_YEAR)$(THE_MONTH)$(THE_DAY)
61-
PREV_DATE = $(PREV_YEAR)$(PREV_MONTH)$(PREV_DAY)
62-
THE_PREVIOUS_VERSION = http://www.w3.org/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
6346
THE_LOC = $(THE_YEAR)/$(THE_ID)
64-
INSTALLDIR = $(TR_DIR)/$(THE_LOC)
6547
THIS_VERSION = http://www.w3.org/TR/$(THE_LOC)
6648
THE_LATEST_VERSION = http://www.w3.org/TR/$(PERMANENT_NAME)
49+
THE_UPDATE_DIR = http://www.w3.org/Style/css2-updates
50+
51+
INSTALLDIR = dist/
52+
53+
export LC_ALL=en_US.UTF-8
6754

6855
ROOT = .
6956

@@ -109,43 +96,26 @@ indexlist.src
10996

11097
MAINSRCS = $(SRCS1)
11198

112-
REFS= \
113-
refs.html
114-
115-
SPECSRCS= $(SRCS0) $(MAINSRCS) $(APPSRCS)
116-
117-
SPECOBJS= \
118-
cover.html\
119-
about.html\
120-
intro.html\
121-
conform.html\
122-
syndata.html\
123-
selector.html\
124-
cascade.html\
125-
media.html\
126-
box.html\
127-
visuren.html\
128-
visudet.html\
129-
visufx.html\
130-
generate.html\
131-
page.html\
132-
colors.html\
133-
fonts.html\
134-
text.html\
135-
tables.html\
136-
ui.html\
137-
aural.html\
138-
refs.html\
139-
changes.html\
140-
sample.html\
141-
zindex.html\
142-
propidx.html\
143-
grammar.html\
144-
leftblank.html\
145-
indexlist.html
146-
147-
#IMAGES = images/*.gif images/*.png
148-
IMAGES = images/*.png images/*.jpg
99+
REFS= $(REFSRCS:.src=.html)
100+
101+
SPECSRCS= $(SRCS0) $(MAINSRCS) $(APPSRCS) $(INDEXSRCS) $(REFS)
102+
103+
SPECOBJS= $(SPECSRCS:.src=.html)
104+
105+
IMAGESSRC = \
106+
$(wildcard images/*.eps) \
107+
$(wildcard images/*.fig) \
108+
$(wildcard images/*.gif) \
109+
$(wildcard images/*.idraw) \
110+
$(wildcard images/*.svg) \
111+
$(wildcard images/*.ps)
112+
113+
IMAGESBUILT = $(addsuffix .png, $(basename $(IMAGESSRC)))
114+
115+
IMAGES = \
116+
$(wildcard images/*.png) \
117+
$(IMAGESBUILT)
118+
149119
LONGDESCS = images/longdesc/*.html
150120
STYLESHEETS= style/*.css
151121

@@ -185,8 +155,6 @@ HIPP= $(PERL) ./bin/hipp
185155
HMKDEPEND= $(PERL) ./bin/hmkdep
186156
# make value anchor database
187157
MKANCHDB= $(PERL) ./bin/mkanchdb
188-
# make property anchor database
189-
MKPANCHDB= $(PERL) ./bin/mkpanchdb
190158
# add heading anchors
191159
ADDHANCH= $(PERL) ./bin/addhanch
192160
# add index anchors and generate related index database
@@ -201,22 +169,12 @@ MKPROPIDX= $(PERL) ./bin/mkpropidx
201169
MKTOC= $(PERL) ./bin/mktoc
202170
# HTML concate utility
203171
HTMLCAT= $(PERL) ./bin/htmlcat
204-
# trim utility to get rid of navbar sections
205-
HTMLTRIM= $(PERL) ./bin/htmltrim
206-
# make sub table of contents
207-
MKSUBTOC=$(PERL) ./bin/mksubtoc
208172
# insert subtoc
209173
INSAFTER= $(PERL) ./bin/insafter
210174
# add link
211175
ADDLINKS= $(PERL) ./bin/addlinks
212176
# extract properties from db.
213177
PEXTR= $(PERL) ./bin/pextr
214-
# extract issues from issues db.
215-
ISSUES= bin/issues
216-
# extract issues from errata-issues db.
217-
ERRATA= bin/errata
218-
# extract issues from todo db.
219-
TODO= bin/todo
220178
# check validity of sample style sheet
221179
CHKSAMPLE= $(PERL) ./bin/chksample
222180
# make database of references (reference.src)
@@ -231,14 +189,10 @@ CHKSPACES= $(PERL) ./bin/chkspaces
231189
CHKCSS= ./bin/chkcss
232190
# check XML examples
233191
CHKXML= ./bin/chkxml
234-
# add reference normative/informative class info.
235-
ADDREFCLASS= $(PERL) ./bin/addrefclass
236192
# Add prev/next/toc/stylesheet and other links to document
237193
MKCHAIN = $(PERL) ./bin/mkchain
238194
# Expand [[cite]] to link to bibliography
239195
ADDCITE = $(PERL) ./bin/addcite
240-
# Remove extensions (.gif, .png,...) from IMG links
241-
RMIMGEXT = $(PERL) ./bin/rmimgext
242196
# Add special markup (e.g., keyword "Example")
243197
ADDMARKUP = $(PERL) ./bin/addmarkup
244198
# Add longdesc descriptions to images
@@ -295,7 +249,6 @@ LN= ln
295249
$(INSAFTER) - $*.subtoc /H1 - |\
296250
$(MKCHAIN) -r $@ - |\
297251
$(SED) -e "s|_THIS_VERSION_|$(THIS_VERSION)|g" \
298-
-e "s|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g" \
299252
-e "s|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g" \
300253
-e "s|_THE_STATUS_|$(THE_STATUS)|g" \
301254
-e "s|_THE_STATUSNAME_|$(THE_STATUSNAME)|g" \
@@ -316,6 +269,8 @@ LN= ln
316269
%.png: %.eps; convert -density 96x96 $< $@
317270
%.png: %.ps; convert -density 96x96 $< $@
318271
%.png: %.idraw; convert -density 96x96 $< $@
272+
%.png: %.svg; convert -density 96x96 $< $@
273+
%.png: %.gif; convert -density 96x96 $< $@
319274
%.eps: %.fig; fig2dev -L eps -F -c $< $@
320275

321276
#.idraw.gif:
@@ -331,9 +286,7 @@ LN= ln
331286
# $(RM) $@
332287
# fig2dev -L eps $< | $(PSTOPNM) | $(PNMTOPNG_PIPE) >$@
333288

334-
all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
335-
$(IMAGES)
336-
# $(IMAGES) issues.html errata-issues.html DOC/TODO.html
289+
all: build/blocks.ok $(SPECOBJS) $(IMAGES)
337290

338291
build/warning:
339292
echo "<!-- warning -->" >$@
@@ -344,36 +297,19 @@ build/warning:
344297
# -@(cd images; for i in *.gif; do $(LN) -s $$i "`basename $$i .gif`" 2>//dev/null; done)
345298
# touch images/links.ok
346299

347-
install: all css2.tgz css2.txt css2.zip css2.ps.gz css2.pdf $(INSTALLDIR)/.htaccess
300+
install: all css2.tgz css2.txt css2.zip css2.ps.gz css2.pdf .htaccess
348301
@if [ -z "$(INSTALLDIR)" ]; then\
349302
echo >&2;\
350303
echo "*** No target directory specified" >&2;\
351304
echo "*** Please use: make install INSTALLDIR=<target-dir>" >&2;\
352305
exit 1;\
353306
fi
354307
@if [ ! -d $(INSTALLDIR) ]; then mkdir -p $(INSTALLDIR);fi
355-
$(CP) css2.txt css2.zip css2.ps.gz css2.pdf css2.tgz $(INSTALLDIR)
356-
zcat css2.tgz | (cd $(INSTALLDIR); $(TAR) xvf -)
357-
# -$(RM) -f $(CSSGROUPDIR)/issues.html
358-
# -$(RM) $(CSSGROUPDIR)/css2-issues.html
359-
# $(LN) -s $(INSTALLDIR)/issues.html $(CSSGROUPDIR)/css2-issues.html
308+
$(CP) css2.txt css2.zip css2.ps.gz css2.pdf css2.tgz .htaccess $(INSTALLDIR)
309+
cat css2.tgz | (cd $(INSTALLDIR); $(TAR) xvf -)
360310
-$(RM) $(INSTALLDIR)/Overview.html
361311
(cd $(INSTALLDIR); $(LN) -s cover.html Overview.html)
362312

363-
$(INSTALLDIR)/.htaccess:
364-
mkdir -p $(INSTALLDIR)
365-
echo "DirectoryIndex cover.html" >$@
366-
echo "<Files ~ \"\.html\">" >>$@
367-
echo "ForceType 'text/html; charset=iso-8859-1'" >>$@
368-
echo "</Files>" >>$@
369-
echo "<Files ~ \"\.txt\">" >>$@
370-
echo "ForceType 'text/plain; charset=iso-8859-1'" >>$@
371-
echo "</Files>" >>$@
372-
373-
link: install
374-
-$(RM) -f $(TR_DIR)/$(PERMANENT_NAME)
375-
(cd $(TR_DIR); $(LN) -s $(THE_LOC) $(PERMANENT_NAME))
376-
377313
install-ps: install css2.ps.gz
378314
$(CP) css2.ps.gz $(INSTALLDIR)
379315

@@ -384,22 +320,6 @@ install-pdf: install css2.pdf
384320
install-all: install install-ps install-pdf css2.zip css2.txt
385321
$(CP) css2.zip css2.txt $(INSTALLDIR)
386322

387-
images/pngs.ok: images/*.idraw images/*.fig
388-
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.gif; done
389-
-@for f in images/*.idraw; do make images/`basename $$f .idraw`.png; done
390-
-@for f in images/*.fig; do make images/`basename $$f .fig`.gif; done
391-
-@for f in images/*.fig; do make images/`basename $$f .fig`.png; done
392-
touch images/pngs.ok
393-
394-
translations.html : translations.src
395-
$(SED) -e "s|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g" \
396-
-e "s|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g" $< > $@
397-
398-
errata.html : errata.src
399-
$(SED) -e "s|_THIS_VERSION_|$(THIS_VERSION)|g" \
400-
-e "s|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g" \
401-
-e "s|_THE_ID_|$(THE_ID)|g" \
402-
-e "s|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g" $< > $@
403323

404324
#### Special section to build PS file and single plain text file
405325

@@ -478,7 +398,6 @@ cover.html: cover.srd Project.cfg
478398
$(ADDNAVBAR) -r $@ $< |\
479399
$(MKCHAIN) -r $@ - |\
480400
$(SED) -e "s|_THIS_VERSION_|$(THIS_VERSION)|g" \
481-
-e "s|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g" \
482401
-e "s|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g" \
483402
-e "s|_THE_STATUS_|$(THE_STATUS)|g" \
484403
-e "s|_THE_STATUSNAME_|$(THE_STATUSNAME)|g" \
@@ -516,7 +435,6 @@ indexlist.html: indexlist.srd build/indexlist.srb Project.cfg build/warning
516435
$(INSAFTER) - build/warning /H1 - |\
517436
$(MKCHAIN) -r $@ - |\
518437
$(SED) -e "s|_THIS_VERSION_|$(THIS_VERSION)|g" \
519-
-e "s|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g" \
520438
-e "s|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g" \
521439
-e "s|_THE_STATUS_|$(THE_STATUS)|g" \
522440
-e "s|_THE_STATUSNAME_|$(THE_STATUSNAME)|g" \
@@ -535,31 +453,6 @@ propidx.srd:: build/propidx.srb #propidx.src
535453
# @echo "=========== making" $@
536454
# $(HIPP) $(INCLUDES) $< $@
537455

538-
# Issues and todo lists.
539-
#issues.html: issues.src build/issues.srb
540-
# @echo "=========== making" $@
541-
# $(HIPP) $(INCLUDES) $< $@
542-
543-
#build/issues.srb: issues.db
544-
# @echo "=========== making" $@
545-
# $(ISSUES) -g >$@
546-
547-
# Errata-Issues
548-
#errata-issues.html: errata-issues.src build/errata-issues.srb
549-
# @echo "=========== making" $@
550-
# $(HIPP) $(INCLUDES) $< $@
551-
552-
#build/errata-issues.srb: errata-issues.db
553-
# @echo "=========== making" $@
554-
# $(ERRATA) -g >$@
555-
556-
#DOC/TODO.html: DOC/TODO.src build/todo.srb
557-
# @echo "=========== making" $@
558-
# $(HIPP) $(INCLUDES) $< $@
559-
560-
#build/todo.srb: DOC/todo.db
561-
# @echo "=========== making" $@
562-
# $(TODO) -g >$@
563456

564457
### check on the document to see if it's valid
565458

@@ -646,39 +539,18 @@ checkx: build/checkx.out
646539
@$(DIFF) checkx.out build/checkx.out >build/checkx.diff \
647540
|| echo output differs, see build/checkx.diff for details.
648541

649-
# get cvs logs
650-
651-
FROMDATE=1 week ago
652-
log:
653-
@for i in `cat DOC/FILES` ; \
654-
do cvs log -d ">$(FROMDATE)" $$i >/tmp/log; \
655-
$(GREP) "selected revisions: 0" /tmp/log >/dev/null || cat /tmp/log; \
656-
done; rm /tmp/log
657-
658542
clean:
659543
$(RM) $(SPECOBJS) $(PROPBLKSDIR)/* \
660544
$(SPECOBJS:.html=.srd) $(SPECOBJS:.html=.subtoc) \
661-
build/* css2.* linklint images/links.ok images/pngs.ok
545+
build/* css2.* linklint images/links.ok
662546

663547
realclean: clean
664548

665549
depend:
666550
$(HMKDEPEND) $(SPECOBJS)
667551

668-
# Rules to make diff files relative to previous REC and WD.
669-
# htmldiff returns >0 if there are differences, so we ignore the exit code.
670-
671-
PREVREC = ../../../WWW/TR/2011/REC-CSS2-20110607
672-
PREVWD = ../../../WWW/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
673-
HTMLDIFF = htmldiff -i -w '<del>' -x '</del>' -y '<ins>' -z '</ins>'
674-
675-
diffs: $(SPECOBJS)
676-
-(cd diffs-rec;\
677-
make PREV=../$(PREVREC) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS))
678-
-(cd diffs-wd;\
679-
make PREV=../$(PREVWD) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS))
680552

681553

682-
.PHONY: all install install-all clean realclean checkx diffs
554+
.PHONY: all install install-all clean realclean checkx
683555

684556
##### The following is automatically generated. Do not edit!! ####

0 commit comments

Comments
 (0)
</