Date: Sat, 11 Nov 2000 13:31:32 +0900 From: Jun Kuriyama <kuriyama@imgsrc.co.jp> To: FreeBSD Documentation Project <doc@FreeBSD.ORG> Subject: Re: Patchset for www to remove links, and make build obj-clean. Message-ID: <7mofzndt97.wl@waterblue.imgsrc.co.jp> In-Reply-To: <20001111044355.A57981@mithrandr.moria.org> References: <20001111044355.A57981@mithrandr.moria.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Multipart_Sat_Nov_11_13:31:32_2000-1
Content-Type: text/plain; charset=US-ASCII
At 11 Nov 2000 02:44:23 GMT,
Neil Blakey-Milner wrote:
> This patch-set removes the use of symlinks in the web build by using
> relative directories for languages instead of symlinks to relative
> directories and updating the Spanish build to use the WEB_PREFIX and
> web.site.mk.
>
> Also lost in there are one or two changes necessary to build the Spanish
> build in a separate object tree, which the others seem to support, or
> don't have the functionality that would need the changes.
>
> This survives a full web site build, in both obj and non-obj cases (that
> really takes a long time on a p166), and is quite simple. A quick
> confirmation means I'll commit it soon, or I'll wait until Monday.
>
> This changes one behaviour of www/ - now, "make" by itself with no
> target, or with target "all" goes to en/ and builds. Previously it
> ran the "links" target. Since the links target is going away, it makes
> sense that "make" in /usr/www will build the entire web site. In
> future, I'll probably remove the jumping to language directories in
> en/Makefile, and add language directories in www/Makefile, to match
> expected behaviour, and the doc build.
Thanks. It seems good and please go for it.
I prefer to remove lines instead of commenting out. CVS provides
capability to revert changes so I think commenting out is not
necessary.
And es/search/Makefile should be changed to reduce difference against
English version.
Suggested patches below (including your modification).
--
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.
<kuriyama@FreeBSD.org> // FreeBSD Project
--Multipart_Sat_Nov_11_13:31:32_2000-1
Content-Type: application/octet-stream; type=patch
Content-Disposition: attachment; filename="www.diff"
Content-Transfer-Encoding: 7bit
Index: Makefile
===================================================================
RCS file: /home/ncvs/www/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 2000/11/08 01:15:39 1.15
+++ Makefile 2000/11/11 04:30:10
@@ -2,61 +2,13 @@
WEB_PREFIX= ${.CURDIR}
-LINKS= en/ja en/es en/ru en/zh
-LINKS+= ja/web.mk es/web.mk ru/web.mk
-LINKS+= web.mk
-
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-LINKS+= ../doc/en_US.ISO_8859-1/web.mk
-LINKS+= ../doc/en_US.ISO_8859-1/includes.sgml
-.endif
-
SUBDIR= en
.if make(obj)
SUBDIR+= ja es ru zh
.endif
-
-all: links
-
-
-links: ${LINKS}
-
-clean:
- rm -f ${LINKS}
-
-
-en/ja:
- cd en; ln -sf ${.CURDIR}/ja
-en/es:
- cd en; ln -sf ${.CURDIR}/es
-
-en/ru:
- cd en; ln -sf ${.CURDIR}/ru
-
-en/zh:
- cd en; ln -sf ${.CURDIR}/zh
-
-ja/web.mk:
- cd ja; ln -sf ${.CURDIR}/en/web.mk
-
-es/web.mk:
- cd es; ln -sf ${.CURDIR}/en/web.mk
-
-ru/web.mk:
- cd ru; ln -sf ${.CURDIR}/en/web.mk
-
-web.mk:
- cd .; ln -sf ${.CURDIR}/en/web.mk
-
-.if !defined(WEB_ONLY) || empty(WEB_ONLY)
-../doc/en_US.ISO_8859-1/web.mk:
- cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/web.mk
-
-../doc/en_US.ISO_8859-1/includes.sgml:
- cd ../doc/en_US.ISO_8859-1; ln -sf ${.CURDIR}/en/includes.sgml
-.endif
+links:
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
Index: en/Makefile
===================================================================
RCS file: /home/ncvs/www/en/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- en/Makefile 2000/11/07 07:37:55 1.55
+++ en/Makefile 2000/11/11 04:01:30
@@ -60,8 +60,7 @@
.if !defined(ENGLISH_ONLY) || empty(ENGLISH_ONLY)
.for DIR in ${WEB_LANG}
-#SUBDIR+= ../${DIR}
-SUBDIR+= ${DIR}
+SUBDIR+= ../${DIR}
.endfor
.endif
Index: es/search/Makefile
===================================================================
RCS file: /home/ncvs/www/es/search/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- es/search/Makefile 1999/09/06 07:03:13 1.2
+++ es/search/Makefile 2000/11/11 04:03:05
@@ -3,6 +3,9 @@
.if exists(../Makefile.conf)
.include "../Makefile.conf"
.endif
+.if exists(../Makefile.inc)
+.include "../Makefile.inc"
+.endif
DOCS+= index-site.sgml
DOCS+= search.sgml
@@ -13,12 +16,11 @@
CLEANFILES+=atoz.sgml site.sgml
-index-site.sgml: atoz.sgml site.sgml
+index-site.html: atoz.sgml site.sgml
atoz.sgml: web.atoz
- sort -fu web.atoz | perl atoz.pl > ${.TARGET}
+ sort -fu ${.ALLSRC} | ${PERL} ${.CURDIR}/atoz.pl > ${.TARGET}
site.sgml: site.map
- ./site.pl < ${.ALLSRC} > ${.TARGET}
+ ${PERL} ${.CURDIR}/site.pl < ${.ALLSRC} > ${.TARGET}
-.include "../web.mk"
-
+.include "${WEB_PREFIX}/share/mk/web.site.mk"
--Multipart_Sat_Nov_11_13:31:32_2000-1--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7mofzndt97.wl>