8000 [css2] Some updates. · w3c/csswg-drafts@1b1bc45 · GitHub
Skip to content

Commit 1b1bc45

Browse files
bert-githubbert-github
committed
[css2] Some updates.
Now generates a .htaccess file. --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402967
1 parent 7c55056 commit 1b1bc45

1 file changed

Lines changed: 43 additions & 13 deletions

File tree

‎css2/Makefile‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Makefile to generate the CSS2 document based on its "source files"
22
# Arnaud Le Hors - lehors@w3.org
3-
# $Id: Makefile,v 2.110 2009-04-23 14:52:10 bbos Exp $
3+
# $Id: Makefile,v 2.111 2010-02-11 15:59:15 bbos Exp $
44

55
# what needs to be set for every new release:
66
# Note use of full year (1998) in identifier.
@@ -12,19 +12,22 @@ THE_STATUS = MO
1212
THE_STATUSNAME = Member-only Draft
1313

1414
PREV_YEAR = 2009
15-
PREV_MONTH = 04
16-
PREV_DAY = 23
15+
PREV_MONTH = 09
16+
PREV_DAY = 08
1717
PREV_STATUS = CR
1818
PREV_NAME = CSS2
1919

2020
PERMANENT_NAME = CSS2
2121

22-
CSSGROUPDIR = /afs/w3.org/pub/WWW/Style/Group
22+
# WEBROOT = /afs/w3.org/WWW
23+
WEBROOT = $(HOME)/WWW
24+
25+
CSSGROUPDIR = $(WEBROOT)/Style/Group
2326
UPDATES = /Style/css2-updates
2427

2528
THE_UPDATE_DIR = http://www.w3.org$(UPDATES)
26-
UPDATESDIR= /afs/w3.org/pub/WWW$(UPDATES)
27-
TR_DIR = /afs/w3.org/pub/WWW/TR
29+
UPDATESDIR= $(WEBROOT)$(UPDATES)
30+
TR_DIR = $(WEBROOT)/TR
2831
THE_DATE = $(THE_DAY) $(THE_MONTHNAME) $(THE_YEAR)
2932
THE_ID = $(THE_STATUS)-$(PERMANENT_NAME)-$(THE_YEAR)$(THE_MONTH)$(THE_DAY)
3033
PREV_DATE = $(PREV_YEAR)$(PREV_MONTH)$(PREV_DAY)
@@ -261,7 +264,15 @@ LN= ln
261264
$(ADDLONGDESC) - |\
262265
$(ADDNAVBAR) -r $@ |\
263266
$(INSAFTER) - $*.subtoc /H1 - |\
264-
$(MKCHAIN) -r $@ - $@
267+
$(MKCHAIN) -r $@ - |\
268+
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
269+
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
270+
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
271+
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
272+
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
273+
-e 's|_THE_DATE_|$(THE_DATE)|g' \
274+
-e 's|_THE_ID_|$(THE_ID)|g' \
275+
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
265276

266277
%.srd: %.src build/blocks.ok $(REFSRC:.src=.srd)
267278
@echo "=========== making" $@
@@ -298,7 +309,7 @@ all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
298309
# -@(cd images; for i in *.gif; do $(LN) -s $$i "`basename $$i .gif`" 2>//dev/null; done)
299310
# touch images/links.ok
300311

301-
install: all css2.tgz
312+
install: all css2.tgz $(INSTALLDIR)/.htaccess
302313
@if [ -z "$(INSTALLDIR)" ]; then\
303314
echo >&2;\
304315
echo "*** No target directory specified" >&2;\
@@ -314,6 +325,16 @@ install: all css2.tgz
314325
-$(RM) $(INSTALLDIR)/Overview.html
315326
(cd $(INSTALLDIR); $(LN) -s cover.html Overview.html)
316327

328+
$(INSTALLDIR)/.htaccess:
329+
mkdir -p $(INSTALLDIR)
330+
echo "DirectoryIndex cover.html" >$@
331+
echo "<Files ~ \"\.html\">" >>$@
332+
echo "ForceType 'text/html; charset=iso-8859-1'" >>$@
333+
echo "</Files>" >>$@
334+
echo "<Files ~ \"\.txt\">" >>$@
335+
echo "ForceType 'text/plain; charset=iso-8859-1'" >>$@
336+
echo "</Files>" >>$@
337+
317338
link: install
318339
-$(RM) -f $(TR_DIR)/$(PERMANENT_NAME)
319340
(cd $(TR_DIR); $(LN) -s $(THE_LOC) $(PERMANENT_NAME))
@@ -412,15 +433,16 @@ cover.srd: cover.src build/contents.srb build/minicontents.srb
412433

413434
cover.html: cover.srd Project.cfg
414435
@echo "=========== making" $@
436+
$(ADDNAVBAR) -r $@ $< |\
437+
$(MKCHAIN) -r $@ - |\
415438
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
416439
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
417440
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
418-
-e 's|_THE_STATUS_|$(THE_STATUSNAME)|g' \
441+
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
442+
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
419443
-e 's|_THE_DATE_|$(THE_DATE)|g' \
420444
-e 's|_THE_ID_|$(THE_ID)|g' \
421-
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' $*.srd | \
422-
$(ADDNAVBAR) -r $@ |\
423-
$(MKCHAIN) -r $@ - $@
445+
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
424446

425447
build/contents.srb: $(MAINSRCS:.src=.srd) $(APPSRCS:.src=.srd) $(REFSRCS:.src=.srd) $(INDEXSRCS:.src=.srd) Project.cfg
426448
@echo "=========== making" $@
@@ -446,7 +468,15 @@ indexlist.srd:: build/indexlist.srb #indexlist.src build/blocks.ok
446468
indexlist.html: indexlist.srd build/indexlist.srb Project.cfg
447469
@echo "=========== making" $@
448470
$(ADDNAVBAR) -r $@ $< |\
449-
$(MKCHAIN) -r $@ - $@
471+
$(MKCHAIN) -r $@ - |\
472+
$(SED) -e 's|_THIS_VERSION_|$(THIS_VERSION)|g' \
473+
-e 's|_THE_PREVIOUS_VERSION_|$(THE_PREVIOUS_VERSION)|g' \
474+
-e 's|_THE_LATEST_VERSION_|$(THE_LATEST_VERSION)|g' \
475+
-e 's|_THE_STATUS_|$(THE_STATUS)|g' \
476+
-e 's|_THE_STATUSNAME_|$(THE_STATUSNAME)|g' \
477+
-e 's|_THE_DATE_|$(THE_DATE)|g' \
478+
-e 's|_THE_ID_|$(THE_ID)|g' \
479+
-e 's|_THE_UPDATE_DIR_|$(THE_UPDATE_DIR)|g' >$@
450480

451481
build/propidx.srb: $(PROPSRC)
452482
@echo "=========== making" $@

0 commit comments

Comments
 (0)