Open Hub
Open Hub

 Settings |  Report Duplicate

2
I Use This!
Activity Not Available

News

Analyzed 12 months ago. based on code collected 12 months ago.
BSDBuild: r1057 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-09-01 21:41:58 -0400 (Tue, 01 Sep 2015) New Revision: 1057 Modified: trunk/mkconcurrent.pl Log: sync with changes in <build.man.mk> Modified: trunk/mkconcurrent.pl ... [More] =================================================================== --- trunk/mkconcurrent.pl2015-07-30 03:16:02 UTC (rev 1056) +++ trunk/mkconcurrent.pl2015-09-02 01:41:58 UTC (rev 1057) < at >< at > -247,27 +247,27 < at >< at > push < at >deps, "$obj.cat$1: $SRC/$ndir/$src"; push < at >deps, << 'EOF'; -< at >echo "${NROFF} -Tascii -mandoc $< > $< at >" +< at >echo "${MANDOC} -Tascii $< > $< at >" < at >(cat $< | \ sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ sed 's,\$$PREFIX,${PREFIX},' | \ sed 's,\$$DATADIR,${DATADIR},' | \ - ${NROFF} -Tascii -mandoc > $< at >) || (rm -f $< at >; true) + ${MANDOC} -Tascii > $< at >) || (rm -f $< at >; true) EOF -# Nroff -> PostScript -# -> Sync with build.man.mk. -push < at >deps, - "$obj.ps$1: $SRC/$ndir/$src"; -push < at >deps, << 'EOF'; -< at >echo "${NROFF} -Tps -mandoc $< > $< at >" -< at >(cat $< | \ - sed 's,\$$SYSCONFDIR,${SYSCONFDIR},' | \ - sed 's,\$$PREFIX,${PREFIX},' | \ - sed 's,\$$DATADIR,${DATADIR},' | \ - ${NROFF} -Tps -mandoc > $< at >) || (rm -f $< at >; true) +foreach my $fmt ('ps', 'pdf', 'html') { +push < at >deps, + "$obj.$fmt$1: $SRC/$ndir/$src"; +push < at >deps, << "EOF"; +< at >echo "\${MANDOC} -T$fmt \$< > \$< at >" +< at >(cat \$< | \ + sed 's,\$\$SYSCONFDIR,\${SYSCONFDIR},' | \ + sed 's,\$\$PREFIX,\${PREFIX},' | \ + sed 's,\$\$DATADIR,\${DATADIR},' | \ + ${MANDOC} -T$fmt > \$< at >) || (rm -f \$< at >; true) EOF +} } elsif ($type =~ /MOS/) { # Portable object -> machine object # -> Sync with build.po.mk. < at >< at > -284,7 +284,7 < at >< at > } } } -if (/^\s*(SRCS|MAN\d|XCF|TTF|POS)\s*=\s*(.+)$/) { +if (/^\s*(SRCS|MAN\d|TTF|POS)\s*=\s*(.+)$/) { my $type = $1; my $srclist = $2; [Less]
BSDBuild: r1055 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-29 23:14:50 -0400 (Wed, 29 Jul 2015) New Revision: 1055 Modified: trunk/build.www.mk Log: html5 as default Modified: trunk/build.www.mk =================================================================== --- ... [More] trunk/build.www.mk2015-07-29 13:30:50 UTC (rev 1054) +++ trunk/build.www.mk2015-07-30 03:14:50 UTC (rev 1055) < at >< at > -50,8 +50,9 < at >< at > HTML_INSTSOURCE?=Yes HTML_STRIP?=${PERL} ${TOP}/mk/hstrip.pl -DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ -"http://www.w3.org/TR/html4/loose.dtd"> +DTD?=<!DOCTYPE html> +#DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ +#"http://www.w3.org/TR/html4/loose.dtd"> all: ${HTML} ${CSS} all-subdir clean: clean-www clean-subdir [Less]
BSDBuild: r1052 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-18 09:37:22 -0400 (Sat, 18 Jul 2015) New Revision: 1052 Added: trunk/gen-wwwdepend.pl Modified: trunk/Makefile trunk/build.www.mk trunk/mkify.pl Log: implement "make depend" for <build.www.mk> ... [More] Modified: trunk/Makefile =================================================================== --- trunk/Makefile2015-07-18 13:36:37 UTC (rev 1051) +++ trunk/Makefile2015-07-18 13:37:22 UTC (rev 1052) < at >< at > -16,8 +16,8 < at >< at > DATAFILES=hstrip.pl mkdep mkconcurrent.pl manlinks.pl cmpfiles.pl cleanfiles.pl \ gen-includes.pl gen-declspecs.pl get-version.pl get-release.pl \ -install-manpages.sh ml.xsl gen-dotdepend.pl config.guess \ -gen-includelinks.pl \ +install-manpages.sh ml.xsl gen-dotdepend.pl gen-wwwdepend.pl \ +config.guess gen-includelinks.pl \ build.common.mk build.dep.mk build.lib.mk build.man.mk \ build.perl.mk build.prog.mk build.subdir.mk build.www.mk \ build.po.mk build.doc.mk build.proj.mk Modified: trunk/build.www.mk =================================================================== --- trunk/build.www.mk2015-07-18 13:36:37 UTC (rev 1051) +++ trunk/build.www.mk2015-07-18 13:37:22 UTC (rev 1052) < at >< at > -22,8 +22,8 < at >< at > # USE OF THIS SOFTWARE EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.. # -# Compile a set of HTML files (language and character set variants) from -# source files processed by m4 and xsltproc. +# Process a set of HTML source files (m4 + xsltproc). ${HTML} targets can be +# .css, .html (single page) and .html.var (multiple languages / charsets). # M4?=m4 < at >< at > -35,7 +35,6 < at >< at > BASEDIR?=${TOP}/m4 XSLDIR?=${TOP}/xsl TEMPLATE?=simple -TEMPLATE_DEPS?= LANGUAGES?=en fr CHARSETS?=utf8 iso8859-1 DEF_LANGUAGE?=en < at >< at > -47,7 +46,6 < at >< at > HTML_EXTRA?= CSS?= CSS_TEMPLATE?=style -CSS_TEMPLATE_DEPS?= HTML_OVERWRITE?=No HTML_INSTSOURCE?=Yes HTML_STRIP?=${PERL} ${TOP}/mk/hstrip.pl < at >< at > -57,15 +55,15 < at >< at > all: ${HTML} ${CSS} all-subdir clean: clean-www clean-subdir -cleandir: clean-www clean-subdir cleandir-subdir +cleandir: clean-www cleandir-www clean-subdir cleandir-subdir install: install-www install-subdir deinstall: deinstall-subdir regress: regress-subdir -depend: depend-subdir +depend: depend-www depend-subdir .SUFFIXES: .html.var .html .htm .jpg .jpeg .png .gif .m4 .css .css-in -.css-in.css: ${BASEDIR}/${CSS_TEMPLATE}.m4 ${CSS_TEMPLATE_DEPS} +.css-in.css: ${BASEDIR}/${CSS_TEMPLATE}.m4 < at >cp -f $< ${BASEDIR}/base.css < at >echo -n "$< at >:" ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ < at >< at > -72,7 +70,7 < at >< at > -D__LANG=$$LANG ${BASEDIR}/${CSS_TEMPLATE}.m4 | ${HTML_STRIP} > $< at > < at >rm -f ${BASEDIR}/base.css -.htm.html: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} +.htm.html: ${BASEDIR}/${TEMPLATE}.m4 < at >cp -f $< ${BASEDIR}/base.htm < at >echo "${M4} $< | ${XSLTPROC} > $< at >" < at >export OUT=".$< at >.tmp"; \ < at >< at > -85,7 +83,7 < at >< at > "$$OUT" 2>/dev/null | ${HTML_STRIP} >> $< at > 2>/dev/null; \ rm -f "$$OUT" ${BASEDIR}/base.htm -.htm.html.var: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} +.htm.html.var: ${BASEDIR}/${TEMPLATE}.m4 < at >for CHARSET in ${CHARSETS}; do \ if [ ! -e "$$CHARSET" ]; then mkdir $$CHARSET; fi; \ done < at >< at > -141,6 +139,9 < at >< at > fi < at >echo "." +cleandir-www: +echo -n >.depend + install-www-makefile: < at >export OUT=.Makefile.out; \ echo "# Generated by <build.www.mk> install on `date`" > $$OUT; \ < at >< at > -271,8 +272,19 < at >< at > done; \ done -.PHONY: install deinstall clean cleandir regress depend clean-www +depend-www: +< at >files="${HTML}"; \ +if [ "$$files" != "" -a "$$files" != "none" ]; then \ +echo "${PERL} ${TOP}/mk/gen-wwwdepend.pl $$files"; \ +env M4=${M4} BASEDIR=${BASEDIR} TEMPLATE=${TEMPLATE} \ + CSS_TEMPLATE=${CSS_TEMPLATE} \ + ${PERL} ${TOP}/mk/gen-wwwdepend.pl $$files > .depend; \ +fi + +.PHONY: install deinstall clean cleandir regress depend depend-www clean-www .PHONY: install-www install-www-makefile install-www-source install-www-base +.PHONY: cleandir-www include ${TOP}/mk/build.common.mk include ${TOP}/mk/build.subdir.mk +include .depend Added: trunk/gen-wwwdepend.pl =================================================================== --- trunk/gen-wwwdepend.pl (rev 0) +++ trunk/gen-wwwdepend.pl2015-07-18 13:37:22 UTC (rev 1052) < at >< at > -0,0 +1,55 < at >< at > +#!/usr/bin/perl +# +# Public domain. +# +# Scan <build.www.mk> sources for m4 include() statements and output +# the required make dependencies. +# + +sub Scan ($) +{ +my $file = shift; +my < at >rv = (); + +if (!open(SRC, $file)) { +return (); +} +foreach my $line (<SRC>) { +if ($line !~ /include\s*\(([\w\-\.\s\/]+)\)/) { next; } +my $incl = $1; +$incl =~ s/__FILE/$file/g; +$incl =~ s/__LANG/en/g; +$incl =~ s/__BASE_DIR/$ENV{'BASEDIR'}/g; +if ($incl eq $ENV{'BASEDIR'}.'/base.htm') { +next; +} +push < at >rv, $incl; +if (-e $incl) { +push < at >rv, Scan($incl); +} +} +close(SRC); + +return (< at >rv); +} + +if (< at >ARGV < 1) { +print STDERR "Usage: gen-wwwdepend.pl [files]\n"; +exit(1); +} +foreach my $file (< at >ARGV) { +my $src; +if ($file =~ /^([\w\-\.\s]+)\.(html|html\.var)$/) { +my $src = $1.'.htm'; +my $tmplFile = $ENV{'BASEDIR'}.'/'.$ENV{'TEMPLATE'}.'.m4'; +print $file.': '. join(' ', + $src, Scan($src), $tmplFile, Scan($tmplFile)), "\n"; +} elsif ($file =~ /^([\w\-\.\s]+)\.(css)$/) { +my $src = $1.'.css-in'; +my $tmplFile = $ENV{'BASEDIR'}.'/'.$ENV{'CSS_TEMPLATE'}.'.m4'; +print $file.': '. join(' ', + $src, Scan($src), $tmplFile, < at >tmplDeps), "\n"; +} else { +print STDERR "$file: Unknown extension\n"; +} +} Modified: trunk/mkify.pl =================================================================== --- trunk/mkify.pl2015-07-18 13:36:37 UTC (rev 1051) +++ trunk/mkify.pl2015-07-18 13:37:22 UTC (rev 1052) < at >< at > -35,6 +35,7 < at >< at > gen-includes.pl gen-includelinks.pl gen-dotdepend.pl +gen-wwwdepend.pl install-manpages.sh); < at >LibtoolFiles = qw( [Less]
BSDBuild: r1051 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-18 09:36:37 -0400 (Sat, 18 Jul 2015) New Revision: 1051 Modified: trunk/configure trunk/configure.in Log: 3.2 Modified: trunk/configure =================================================================== --- ... [More] trunk/configure2015-07-17 12:21:43 UTC (rev 1050) +++ trunk/configure2015-07-18 13:36:37 UTC (rev 1051) < at >< at > -1,7 +1,7 < at >< at > #!/bin/sh # # Do not edit! -# This file was generated from configure.in by BSDBuild 3.1. +# This file was generated from configure.in by BSDBuild 3.2. # # To regenerate this file, get the latest BSDBuild release from # http://hypertriton.com/bsdbuild/, and use the command: < at >< at > -346,7 +346,7 < at >< at > fi fi if [ "${show_help}" = "yes" ]; then -echo "This configure script was generated by BSDBuild 3.1." +echo "This configure script was generated by BSDBuild 3.2." echo "<http://bsdbuild.hypertriton.com/>" echo "" echo "Usage: ./configure [options]" < at >< at > -382,7 +382,7 < at >< at > exit 1 fi; if [ "${show_version}" = "yes" ]; then -echo "BSDBuild 3.1" +echo "BSDBuild 3.2" exit 0 fi; if [ "${srcdir}" != "" ]; then < at >< at > -409,16 +409,16 < at >< at > else CROSS_COMPILING="no" fi -echo "BSDBuild 3.1 (http://bsdbuild.hypertriton.com)" +echo "BSDBuild 3.2 (http://bsdbuild.hypertriton.com)" echo "#!/bin/sh" > config.status -echo "# Generated by configure script (BSDBuild 3.1)." >> config.status -echo "Generated by configure script (BSDBuild 3.1)." > config.log +echo "# Generated by configure script (BSDBuild 3.2)." >> config.status +echo "Generated by configure script (BSDBuild 3.2)." > config.log if [ -e "Makefile.config" ]; then echo "* Overwriting existing Makefile.config" fi -echo "# Generated by configure script (BSDBuild 3.1)." > Makefile.config +echo "# Generated by configure script (BSDBuild 3.2)." > Makefile.config echo "" >> Makefile.config echo "BUILD=${build}" >> Makefile.config echo "HOST=${host}" >> Makefile.config < at >< at > -678,7 +678,7 < at >< at > echo "#define PACKAGE \"$PACKAGE\"" >> config/package.h echo "#endif" >> config/package.h echo "hdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -VERSION="3.1" +VERSION="3.2" echo "#ifndef VERSION" > config/version.h echo "#define VERSION \"$VERSION\"" >> config/version.h echo "#endif" >> config/version.h < at >< at > -696,34 +696,34 < at >< at > echo "hdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua fi; CONFIGURE_OK="yes" -echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config -echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua -echo "DATADIR=$DATADIR" >>Makefile.config -echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua +echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config +echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua +echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config +echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua echo "VERSION=$VERSION" >>Makefile.config echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua +echo "STATEDIR=$STATEDIR" >>Makefile.config +echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua echo "MODULEDIR=$MODULEDIR" >>Makefile.config echo "mdefs[\"MODULEDIR\"] = \"$MODULEDIR\"" >>configure.lua echo "SYSCONFDIR=$SYSCONFDIR" >>Makefile.config echo "mdefs[\"SYSCONFDIR\"] = \"$SYSCONFDIR\"" >>configure.lua -echo "BINDIR=$BINDIR" >>Makefile.config -echo "mdefs[\"BINDIR\"] = \"$BINDIR\"" >>configure.lua -echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config -echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua +echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config +echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua echo "MANDIR=$MANDIR" >>Makefile.config echo "mdefs[\"MANDIR\"] = \"$MANDIR\"" >>configure.lua -echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config -echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua +echo "RELEASE=$RELEASE" >>Makefile.config +echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua echo "HAVE_GETTEXT=$HAVE_GETTEXT" >>Makefile.config echo "mdefs[\"HAVE_GETTEXT\"] = \"$HAVE_GETTEXT\"" >>configure.lua -echo "RELEASE=$RELEASE" >>Makefile.config -echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua +echo "BINDIR=$BINDIR" >>Makefile.config +echo "mdefs[\"BINDIR\"] = \"$BINDIR\"" >>configure.lua +echo "LIBEXECDIR=$LIBEXECDIR" >>Makefile.config +echo "mdefs[\"LIBEXECDIR\"] = \"$LIBEXECDIR\"" >>configure.lua +echo "DATADIR=$DATADIR" >>Makefile.config +echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua echo "PACKAGE=$PACKAGE" >>Makefile.config echo "mdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -echo "LIBEXECDIR=$LIBEXECDIR" >>Makefile.config -echo "mdefs[\"LIBEXECDIR\"] = \"$LIBEXECDIR\"" >>configure.lua -echo "STATEDIR=$STATEDIR" >>Makefile.config -echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua echo "LIBDIR=$LIBDIR" >>Makefile.config echo "mdefs[\"LIBDIR\"] = \"$LIBDIR\"" >>configure.lua if [ "${srcdir}" != "" ]; then Modified: trunk/configure.in =================================================================== --- trunk/configure.in2015-07-17 12:21:43 UTC (rev 1050) +++ trunk/configure.in2015-07-18 13:36:37 UTC (rev 1051) < at >< at > -1,7 +1,7 < at >< at > # Public domain PACKAGE("BSDBuild") -VERSION("3.1") +VERSION("3.2") RELEASE("Blast of Ancient Atmospheres") DEFAULT_DIR(DATADIR, "$PREFIX/share/bsdbuild") MDEFINE(CONFIGURE_OK, "yes") [Less]
BSDBuild: r1050 - trunk/mk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-17 08:21:43 -0400 (Fri, 17 Jul 2015) New Revision: 1050 Modified: trunk/mk/dist.sh Log: - process the .zip text files with sed instead of unix2dos. - sha1 -> sha256 Modified: trunk/mk/dist.sh ... [More] =================================================================== --- trunk/mk/dist.sh2015-07-14 13:29:22 UTC (rev 1049) +++ trunk/mk/dist.sh2015-07-17 12:21:43 UTC (rev 1050) < at >< at > -8,9 +8,7 < at >< at > VER=${VERSION} REL=${RELEASE} DISTNAME=${PROJ}-${VER} -RHOST=resin.csoft.net -RUSER=vedge -MAKE=make +RHOST=resin if [ "$1" != "" ]; then PHASE="$1" < at >< at > -58,14 +56,12 < at >< at > rm -fR `find ${DISTNAME} \( -name .svn -or -name \*~ -or -name .\*.swp \)` # ZIP: Prepare text files. -if [ -e "`which unix2dos 2>/dev/null`" ]; then -(cd ${DISTNAME} && - cat INSTALL |unix2dos > INSTALL.txt; - cat README |unix2dos > README.txt; - cat ChangeLogs/Release-${VER}.txt |unix2dos > RELEASE-${VER}.txt; - cat mk/LICENSE.txt |unix2dos > LICENSE.txt; - rm -f INSTALL README) -fi +(cd ${DISTNAME} && + cat INSTALL |sed "s/$/`echo -e \\\r`/" > INSTALL.txt; + cat README |sed "s/$/`echo -e \\\r`/" > README.txt; + cat ChangeLogs/Release-${VER}.txt |sed "s/$/`echo -e \\\r`/" > RELEASE-${VER}.txt; + cat mk/LICENSE.txt |sed "s/$/`echo -e \\\r`/" > LICENSE.txt; + rm -f INSTALL README) # ZIP: Compress archive zip -8 -q -r ${DISTNAME}.zip ${DISTNAME} < at >< at > -72,15 +68,10 < at >< at > echo "Updating checksums" openssl md5 ${DISTNAME}.tar.gz > ${DISTNAME}.tar.gz.md5 -openssl rmd160 ${DISTNAME}.tar.gz >> ${DISTNAME}.tar.gz.md5 -openssl sha1 ${DISTNAME}.tar.gz >> ${DISTNAME}.tar.gz.md5 +openssl sha256 ${DISTNAME}.tar.gz >> ${DISTNAME}.tar.gz.md5 openssl md5 ${DISTNAME}.zip > ${DISTNAME}.zip.md5 -openssl rmd160 ${DISTNAME}.zip >> ${DISTNAME}.zip.md5 -openssl sha1 ${DISTNAME}.zip >> ${DISTNAME}.zip.md5 +openssl sha256 ${DISTNAME}.zip >> ${DISTNAME}.zip.md5 -echo "Press any key to continue" -read FOO - echo "Enter passphrase:" gpg -ab ${DISTNAME}.tar.gz echo "Enter passphrase again:" < at >< at > -87,9 +78,9 < at >< at > gpg -ab ${DISTNAME}.zip if [ "$NOUPLOAD" != "Yes" ]; then -echo "Uploading to ${RHOST}" -scp -C ${DISTNAME}.* ${RUSER}< at >${RHOST}:${REMOTEDIR} -scp -C ${PROJ}/ChangeLogs/Release-${VER}.txt ${RUSER}< at >${RHOST}:${CHANGELOGDIR} +echo "Upload to ${RHOST}?" +scp -C ${DISTNAME}.* ${RHOST}:${REMOTEDIR} +scp -C ${PROJ}/ChangeLogs/Release-${VER}.txt ${RHOST}:${CHANGELOGDIR} fi if [ "$PHASE" = "stable" ]; then < at >< at > -96,7 +87,6 < at >< at > echo "*********************************************************" echo "TODO:" echo "- Update http://sourceforge.net/projects/bsdbuild/" -echo "- Update http://freshmeat.net/projects/bsdbuild/" -echo "- Notify bsdbuild-xWq8P/a1moLx9BLsLxWUfA< at >public.gmane.org" +echo "- Notify <bsdbuild-xWq8P/a1moLx9BLsLxWUfA< at >public.gmane.org>" echo "*********************************************************" fi [Less]
BSDBuild: r1049 - trunk/ChangeLogs
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-14 09:29:22 -0400 (Tue, 14 Jul 2015) New Revision: 1049 Modified: trunk/ChangeLogs/Release-3.1.txt Log: 3.1 Modified: trunk/ChangeLogs/Release-3.1.txt ... [More] =================================================================== --- trunk/ChangeLogs/Release-3.1.txt2015-07-14 13:26:21 UTC (rev 1048) +++ trunk/ChangeLogs/Release-3.1.txt2015-07-14 13:29:22 UTC (rev 1049) < at >< at > -3,6 +3,7 < at >< at > - <build.man.mk>: Add support for OpenBSD's new mandoc(1). Add support for PDF and HTML output. Introduce new target: "make lint". +- Document build.man.mk(5), which ironically was missing its own manpage.. - <build.prog.mk>: Allow ${PROG_TYPE} dependent LDFLAGS to be defined. - <build.lib.mk>: Updated bundled libtool to 2.4.2. switch to libtool's LIB_{CURRENT,REVISION,AGE} versioning scheme. < at >< at > -11,8 +12,7 < at >< at > charset variants are now written into ${CHARSETS} subdirectories. - mkconfigure(1): To make generated scripts smaller, the "--cache" code is no longer included by default. The directive CONFIG_CACHE(yes) can be used - to enable the "--cache" feature again. [Less]
BSDBuild: r1048 - trunk/man
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-14 09:26:21 -0400 (Tue, 14 Jul 2015) New Revision: 1048 Added: trunk/man/build.man.mk.5 Modified: trunk/man/Makefile Log: document build.man.mk(5) Modified: trunk/man/Makefile ... [More] =================================================================== --- trunk/man/Makefile2015-07-14 12:45:42 UTC (rev 1047) +++ trunk/man/Makefile2015-07-14 13:26:21 UTC (rev 1048) < at >< at > -9,6 +9,7 < at >< at > MAN5=build.common.mk.5 \ build.dep.mk.5 \ build.lib.mk.5 \ +build.man.mk.5 \ build.prog.mk.5 \ build.proj.mk.5 \ build.www.mk.5 Added: trunk/man/build.man.mk.5 =================================================================== --- trunk/man/build.man.mk.5 (rev 0) +++ trunk/man/build.man.mk.52015-07-14 13:26:21 UTC (rev 1048) < at >< at > -0,0 +1,100 < at >< at > +.\" +.\" Copyright (c) 2015 Hypertriton, Inc. <http://www.hypertriton.com/> +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd July 14, 2015 +.Dt BUILD.MAN.MK 5 +.Os +.ds vT BSDBuild Reference +.ds oS BSDBuild 1.0 +.Sh NAME +.Nm build.man.mk +.Nd bsdbuild - compilation of UNIX manual pages +.Sh SYNOPSIS +.Fd .include <bsd.man.mk> +.Sh DESCRIPTION +The +.Nm +module processes UNIX manual pages files in +.Xr mandoc 1 +format into presentation-ready documents in ASCII, PostScript, +PDF or HTML format. +.Sh TARGETS +.Bl -tag -width "install-man-dirs " +.It Ar all-catman +Produce preformatted manual pages from the specified mandoc source files.. +Fail silently on systems where mandoc/nroff are unavailable, or where +preformatted manual pages are not preferred. +.It Ar clean-man +Clean up output files. +.It Ar install-man-dirs +Create empty section directories in ${MANDIR}. +.It Ar install-man +Install the manpages into ${MANDIR}. +.It Ar install-manlinks +Install the manpage symlinks into ${MANDIR}. +.It Ar man +Display a manpage (passed via the +.Dv MAN +argument), by feeding its ASCII formatted version to ${PAGER}. +.It Ar manlinks +Scan the ${MAN*} sources and auto-generate a +.Pa .manlinks.mk +file defining links for function names (i.e., where .Fn appears in a SYNOPSIS +or ".nr nS 1" block), or where the special directive "MANLINK(name)" appears +in a comment. +.It Ar lint +Parse only, produce no output. +Display verbose warnings. +.El +.Sh VARIABLES +.Bl -tag -width "MANLINKS " +.It Ev MAN[1-9] +List of mandoc input source files (with the .[1-9] extension). +.It Ev MANDOC +Mandoc processor (usually "mandoc" or "nroff -Tmandoc", depending on platform). +This is typically set by a ./configure script (the needed test is included +by default in all configure scripts by +.Xr mkconfigure 1 ) . +.It Ev MANLINKS +A list of symbolic links that should be created by the +.Ar install +target. +The elements of this list are of the form "Foo.1:Bar.1", where "Bar.1" +is the symbolic link, and "Foo.1" is the destination manpage. +Typically, +.Ev MANLINKS +is defined in the +.Pa .manlinks.mk +files which are auto-generated by the +.Ar manlinks +target. +.El +.Sh SEE ALSO +.Xr build.common.mk 5 , +.Xr build.lib.mk 5 +.Sh HISTORY +.Nm +first appeared in BSDBuild 1.0. +.Pp +BSDBuild is based on the 4.4BSD build system. [Less]
BSDBuild: r1047 - in trunk: . ChangeLogs
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-14 08:45:42 -0400 (Tue, 14 Jul 2015) New Revision: 1047 Added: trunk/ChangeLogs/Release-3.1.txt Modified: trunk/configure Log: 3.1 Added: trunk/ChangeLogs/Release-3.1.txt ... [More] =================================================================== --- trunk/ChangeLogs/Release-3.1.txt (rev 0) +++ trunk/ChangeLogs/Release-3.1.txt2015-07-14 12:45:42 UTC (rev 1047) < at >< at > -0,0 +1,39 < at >< at > +Release Notes for BSDBuild 3.1 +------------------------------ + +- <build.man.mk>: Add support for OpenBSD's new mandoc(1). Add support + for PDF and HTML output. Introduce new target: "make lint". +- <build.prog.mk>: Allow ${PROG_TYPE} dependent LDFLAGS to be defined. +- <build.lib.mk>: Updated bundled libtool to 2.4.2. switch to libtool's + LIB_{CURRENT,REVISION,AGE} versioning scheme. +- <build.www.mk>: Multi-lingual document targets are now specified as ${HTML} + elements with the .html.var extension (as opposed to the .html extension). + charset variants are now written into ${CHARSETS} subdirectories. +- mkconfigure(1): To make generated scripts smaller, the "--cache" code is + no longer included by default. The directive CONFIG_CACHE(yes) can be used + to enable the "--cache" feature again. +- mkconfigure(1): Produce ./config.status files by default. +- a few more ${DESTDIR} fixes; thanks bonsaikitten! +- Miscellaneous fixes and improvements to the manual pages. +- BSDBuild: Various fixes in the test modules. Some tweaks to handle recently + introduced compiler warnings. +- cc/cxx/objc: When cross-compiling, try to autodetect ${host}-cc, et al.. +- cxx/objc: Remove unneeded builtin tests for cygwin/long long/long double. +- sdl: On MacOS X, fallback to trying "-framework SDL" if `sdl-config` fails. +- sdl: On Windows, prefer linking to SDL.dll wherever possible. +- x11: Add /usr/local/include, /usr/include to fallback test. add test + for XKB extension (HAVE_XKB) +- pthreads: Dragonfly doesn't require extra PTHREAD_XOPEN_CFLAGS; + thanks varialus! +- getpwuid: Don't reference non-portable fields in test. +- portaudio: Only test for portaudio2. +- math_c99: Disable on *-pc-mingw32, to work around a bug in libmingwex + causing linker errors if single-precision variants of the math routines + (e.g., fabsf()) are used. +- opengl: On MacOS X, prefer "-framework OpenGL" to -lGL where available.. +- jpeg: Remove _WIN32 exception (there are workarounds the <windows.h> issue). +- perl: Fix compiler warnings in test (due to myPerl -> my_perl). +- sse: Remove unnecessary test code. +- New tests: csidl, etubestore, freesg-rg, kqueue, nanosleep, rand48, timerfd, + uim, xbox. + Modified: trunk/configure =================================================================== --- trunk/configure2015-07-14 10:27:59 UTC (rev 1046) +++ trunk/configure2015-07-14 12:45:42 UTC (rev 1047) < at >< at > -696,36 +696,36 < at >< at > echo "hdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua fi; CONFIGURE_OK="yes" -echo "LIBDIR=$LIBDIR" >>Makefile.config -echo "mdefs[\"LIBDIR\"] = \"$LIBDIR\"" >>configure.lua +echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config +echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua +echo "DATADIR=$DATADIR" >>Makefile.config +echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua +echo "VERSION=$VERSION" >>Makefile.config +echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua +echo "MODULEDIR=$MODULEDIR" >>Makefile.config +echo "mdefs[\"MODULEDIR\"] = \"$MODULEDIR\"" >>configure.lua echo "SYSCONFDIR=$SYSCONFDIR" >>Makefile.config echo "mdefs[\"SYSCONFDIR\"] = \"$SYSCONFDIR\"" >>configure.lua -echo "MANDIR=$MANDIR" >>Makefile.config -echo "mdefs[\"MANDIR\"] = \"$MANDIR\"" >>configure.lua -echo "STATEDIR=$STATEDIR" >>Makefile.config -echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua -echo "PACKAGE=$PACKAGE" >>Makefile.config -echo "mdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua -echo "MODULEDIR=$MODULEDIR" >>Makefile.config -echo "mdefs[\"MODULEDIR\"] = \"$MODULEDIR\"" >>configure.lua echo "BINDIR=$BINDIR" >>Makefile.config echo "mdefs[\"BINDIR\"] = \"$BINDIR\"" >>configure.lua -echo "VERSION=$VERSION" >>Makefile.config -echo "mdefs[\"VERSION\"] = \"$VERSION\"" >>configure.lua echo "CONFIGURE_OK=$CONFIGURE_OK" >>Makefile.config echo "mdefs[\"CONFIGURE_OK\"] = \"$CONFIGURE_OK\"" >>configure.lua +echo "MANDIR=$MANDIR" >>Makefile.config +echo "mdefs[\"MANDIR\"] = \"$MANDIR\"" >>configure.lua +echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config +echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua echo "HAVE_GETTEXT=$HAVE_GETTEXT" >>Makefile.config echo "mdefs[\"HAVE_GETTEXT\"] = \"$HAVE_GETTEXT\"" >>configure.lua -echo "LOCALEDIR=$LOCALEDIR" >>Makefile.config -echo "mdefs[\"LOCALEDIR\"] = \"$LOCALEDIR\"" >>configure.lua echo "RELEASE=$RELEASE" >>Makefile.config echo "mdefs[\"RELEASE\"] = \"$RELEASE\"" >>configure.lua -echo "DATADIR=$DATADIR" >>Makefile.config -echo "mdefs[\"DATADIR\"] = \"$DATADIR\"" >>configure.lua -echo "ENABLE_NLS=$ENABLE_NLS" >>Makefile.config -echo "mdefs[\"ENABLE_NLS\"] = \"$ENABLE_NLS\"" >>configure.lua +echo "PACKAGE=$PACKAGE" >>Makefile.config +echo "mdefs[\"PACKAGE\"] = \"$PACKAGE\"" >>configure.lua echo "LIBEXECDIR=$LIBEXECDIR" >>Makefile.config echo "mdefs[\"LIBEXECDIR\"] = \"$LIBEXECDIR\"" >>configure.lua +echo "STATEDIR=$STATEDIR" >>Makefile.config +echo "mdefs[\"STATEDIR\"] = \"$STATEDIR\"" >>configure.lua +echo "LIBDIR=$LIBDIR" >>Makefile.config +echo "mdefs[\"LIBDIR\"] = \"$LIBDIR\"" >>configure.lua if [ "${srcdir}" != "" ]; then $ECHO_N "* Source is in ${srcdir}. Generating Makefiles..." ${PERL} ${SRC}/mk/mkconcurrent.pl ${SRC} [Less]
BSDBuild: r1045 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-14 03:55:19 -0400 (Tue, 14 Jul 2015) New Revision: 1045 Modified: trunk/build.www.mk Log: don't generate per-language foo.html.* files; we can use a rewrite directive instead. Modified: trunk/build.www.mk ... [More] =================================================================== --- trunk/build.www.mk2015-07-14 06:52:00 UTC (rev 1044) +++ trunk/build.www.mk2015-07-14 07:55:19 UTC (rev 1045) < at >< at > -52,8 +52,8 < at >< at > HTML_INSTSOURCE?=Yes HTML_STRIP?=${PERL} ${TOP}/mk/hstrip.pl -DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ -"http://www.w3.org/TR/html4/loose.dtd"> +DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ +"http://www.w3.org/TR/html4/loose.dtd"> all: ${HTML} ${CSS} all-subdir clean: clean-www clean-subdir < at >< at > -73,22 +73,21 < at >< at > < at >rm -f ${BASEDIR}/base.css .htm.html: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} -< at >if [ ! -e "utf8" ]; then mkdir utf8; fi < at >cp -f $< ${BASEDIR}/base.htm -< at >export OUT=".$< at >.tmp" +< at >echo "${M4} $< | ${XSLTPROC} > $< at >" +< at >export OUT=".$< at >.tmp"; \ ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ -D__TEMPLATE=${TEMPLATE} -D__LANG=${DEF_LANGUAGE} \ ${BASEDIR}/${TEMPLATE}.m4 | \ ${HTML_STRIP} > "$$OUT"; \ -< at >echo '${DTD}' > $< at > +echo '${DTD}' > $< at >; \ ${XSLTPROC} ${XSLTPROCFLAGS} --html --stringparam lang ${DEF_LANGUAGE} ${XSL} \ - "$$OUT" 2>/dev/null | ${HTML_STRIP} >> $< at > 2>/dev/null -< at >cp "$< at >" "utf8/$< at >" -< at >rm -f "$$OUT" ${BASEDIR}/base.htm + "$$OUT" 2>/dev/null | ${HTML_STRIP} >> $< at > 2>/dev/null; \ +rm -f "$$OUT" ${BASEDIR}/base.htm .htm.html.var: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} < at >for CHARSET in ${CHARSETS}; do \ - if [ ! -e "$$CHARSET" ]; then mkdir $$CHARSET; fi + if [ ! -e "$$CHARSET" ]; then mkdir $$CHARSET; fi; \ done < at >cp -f $< ${BASEDIR}/base.htm < at >export BASE="`echo $< at > | sed s/\.var//`"; \ < at >< at > -106,40 +105,18 < at >< at > $$OUT 2>/dev/null \ | ${HTML_STRIP} >> utf8/$$BASE.$$LANG; \ rm -f $$OUT; \ - case "$$LANG" in \ - en) \ - echo "URI: utf8/$$BASE.$$LANG" >> $< at >; \ - echo "Content-language: $$LANG" >> $< at >; \ - echo "Content-type: text/html;encoding=UTF-8" >> $< at >; \ - echo "" >> $< at >; \ - echo "URI: $$BASE.$$LANG" >> $< at >; \ - echo "Content-language: $$LANG" >> $< at >; \ - echo "Content-type: text/html" >> $< at >; \ - echo "" >> $< at >; \ - cat utf8/$$BASE.$$LANG | \ - sed s/charset=UTF-8/charset=ISO-8859-1/ | \ - ${ICONV} -f UTF-8 -t ISO-8859-1 > \ - $$BASE.$$LANG; \ - ;; \ - ab|af|eu|ca|da|nl|fo|fr|fi|de|is|ga|it|no|nb|nn|pt|rm|gd|es|sv|sw) \ - echo "URI: utf8/$$BASE.$$LANG" >> $< at >; \ - echo "Content-language: $$LANG" >> $< at >; \ - echo "Content-type: text/html;encoding=UTF-8" >> $< at >; \ - echo "" >> $< at >; \ - echo "URI: iso8859-1/$$BASE.$$LANG" >> $< at >; \ - echo "Content-language: $$LANG" >> $< at >; \ - echo "Content-type: text/html;charset=ISO-8859-1" >> $< at >; \ - echo "" >> $< at >; \ - cat utf8/$$BASE.$$LANG | \ - sed s/charset=UTF-8/charset=ISO-8859-1/ | \ - ${ICONV} -f UTF-8 -t ISO-8859-1 > \ - iso8859-1/$$BASE.$$LANG; \ -cp -f iso8859-1/$$BASE.$$LANG $$BASE.$$LANG; \ - ;; \ - *) \ - ;; \ - esac; \ - echo >> $< at >; \ + cat utf8/$$BASE.$$LANG | \ +sed s/charset=UTF-8/charset=ISO-8859-1/ | \ +${ICONV} -f UTF-8 -t ISO-8859-1 > \ +iso8859-1/$$BASE.$$LANG; \ + echo "Content-Type: text/html; charset=UTF-8" >> $< at >; \ + echo "Content-Language: $$LANG" >> $< at >; \ + echo "URI: utf8/$$BASE.$$LANG" >> $< at >; \ + echo "" >> $< at >; \ + echo "Content-Type: text/html; charset=ISO-8859-1" >> $< at >; \ + echo "Content-Language: $$LANG" >> $< at >; \ + echo "URI: iso8859-1/$$BASE.$$LANG" >> $< at >; \ + echo "" >> $< at >; \ done; \ rm -f ${BASEDIR}/base.htm; \ echo "." < at >< at > -147,18 +124,24 < at >< at > clean-www: < at >echo -n "Clean:" < at >for F in ${HTML}; do \ -export BASE="`echo $$F | sed s/\.var//`"; \ -echo -n " $$BASE"; \ -rm -f $$F; \ -for LANG in ${LANGUAGES}; do \ -rm -f $$BASE.$$LANG {utf8,iso8859-1}/$$BASE.$$LANG; \ -done; \ -done; -< at >echo "." +if [ "`echo $$F | sed s/\.var//`" != "$$F" ]; then \ +export BASE="`echo $$F | sed s/\.var//`"; \ +echo -n " $$BASE"; \ +for LANG in ${LANGUAGES}; do \ +for CHARSET in ${CHARSETS}; do \ +rm -f $$CHARSET/$$BASE.$$LANG; \ +done; \ +done; \ +rm -f $$F; \ +else \ +echo -n " $$F"; \ +fi; \ +done < at >if [ "${CLEANFILES}" != "" ]; then \ - echo "rm -f ${CLEANFILES}"; \ + echo " ${CLEANFILES}"; \ rm -f ${CLEANFILES}; \ fi +< at >echo "." install-www-makefile: < at >export OUT=.Makefile.out; \ < at >< at > -259,7 +242,7 < at >< at > export BASE="`echo $$F | sed s/\.var//`"; \ if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \ ${MAKE} install-www-source \ - SRCFILE="`echo $$BASE |sed s,.html$$,.htm,`" + SRCFILE="`echo $$BASE |sed s,.html$$,.htm,`"; \ fi; \ if [ -e "${DESTDIR}${HTMLDIR}/$$F" \ -a "${HTML_OVERWRITE}" = "" ]; then \ [Less]
BSDBuild: r1044 - trunk
Posted over 9 years ago by Notices of SVN commits on the BSDBuild source repository
Author: vedge Date: 2015-07-14 02:52:00 -0400 (Tue, 14 Jul 2015) New Revision: 1044 Modified: trunk/build.www.mk Log: - clean up the variant generation code; the .html.var files are now used as primary targets. add ${CHARSETS} option. - move ... [More] source install code to separate targets: install-www-{makefile,source,base} Modified: trunk/build.www.mk =================================================================== --- trunk/build.www.mk2015-07-14 06:46:19 UTC (rev 1043) +++ trunk/build.www.mk2015-07-14 06:52:00 UTC (rev 1044) < at >< at > -1,5 +1,5 < at >< at > # -# Copyright (c) 2001-2010 Hypertriton, Inc. <http://hypertriton.com/> +# Copyright (c) 2001-2015 Hypertriton, Inc. <http://hypertriton.com/> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions < at >< at > -29,12 +29,15 < at >< at > M4?=m4 M4FLAGS?= XSLTPROC?=xsltproc +XSLTPROCFLAGS?=--nonet PERL?=perl ICONV?=iconv BASEDIR?=${TOP}/m4 XSLDIR?=${TOP}/xsl TEMPLATE?=simple +TEMPLATE_DEPS?= LANGUAGES?=en fr +CHARSETS?=utf8 iso8859-1 DEF_LANGUAGE?=en XSL?=${XSLDIR}/ml.xsl MKDEPS=build.www.mk build.subdir.mk build.common.mk hstrip.pl < at >< at > -41,11 +44,13 < at >< at > CLEANFILES?= HTMLDIR?=none HTML?= -HTML_DEPS?= +HTML_EXTRA?= CSS?= -CSS_TEMPLATE?=style -HTML_OVERWRITE?=No -HTML_INSTSOURCE?=Yes +CSS_TEMPLATE?=style +CSS_TEMPLATE_DEPS?= +HTML_OVERWRITE?=No +HTML_INSTSOURCE?=Yes +HTML_STRIP?=${PERL} ${TOP}/mk/hstrip.pl DTD?=<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" \ "http://www.w3.org/TR/html4/loose.dtd"> < at >< at > -58,189 +63,235 < at >< at > regress: regress-subdir depend: depend-subdir -.SUFFIXES: .html .htm .jpg .jpeg .png .gif .m4 .css .css-in +.SUFFIXES: .html.var .html .htm .jpg .jpeg .png .gif .m4 .css .css-in -.css-in.css: +.css-in.css: ${BASEDIR}/${CSS_TEMPLATE}.m4 ${CSS_TEMPLATE_DEPS} < at >cp -f $< ${BASEDIR}/base.css < at >echo -n "$< at >:" ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ - -D__LANG=$$LANG \ - ${BASEDIR}/${CSS_TEMPLATE}.m4 \ - | ${PERL} ${TOP}/mk/hstrip.pl > $< at > + -D__LANG=$$LANG ${BASEDIR}/${CSS_TEMPLATE}.m4 | ${HTML_STRIP} > $< at > < at >rm -f ${BASEDIR}/base.css -.htm.html: +.htm.html: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} +< at >if [ ! -e "utf8" ]; then mkdir utf8; fi < at >cp -f $< ${BASEDIR}/base.htm -< at >echo -n "$< at >:" -< at >echo > $< at >.var -< at >for LANG in ${LANGUAGES}; do \ +< at >export OUT=".$< at >.tmp" +${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > \ + -D__TEMPLATE=${TEMPLATE} -D__LANG=${DEF_LANGUAGE} \ + ${BASEDIR}/${TEMPLATE}.m4 | \ +${HTML_STRIP} > "$$OUT"; \ +< at >echo '${DTD}' > $< at > +${XSLTPROC} ${XSLTPROCFLAGS} --html --stringparam lang ${DEF_LANGUAGE} ${XSL} \ + "$$OUT" 2>/dev/null | ${HTML_STRIP} >> $< at > 2>/dev/null +< at >cp "$< at >" "utf8/$< at >" +< at >rm -f "$$OUT" ${BASEDIR}/base.htm + +.htm.html.var: ${BASEDIR}/${TEMPLATE}.m4 ${TEMPLATE_DEPS} +< at >for CHARSET in ${CHARSETS}; do \ + if [ ! -e "$$CHARSET" ]; then mkdir $$CHARSET; fi +done +< at >cp -f $< ${BASEDIR}/base.htm +< at >export BASE="`echo $< at > | sed s/\.var//`"; \ +echo -n "$$BASE:"; \ +echo > $< at >; \ +for LANG in ${LANGUAGES}; do \ + export OUT=".$BASE.$$LANG.tmp"; \ echo -n " $$LANG"; \ - ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$< at > -D__TEMPLATE=${TEMPLATE} \ - -D__LANG=$$LANG \ + ${M4} ${M4FLAGS} -D__BASE_DIR=${BASEDIR} -D__FILE=$$BASE \ + -D__TEMPLATE=${TEMPLATE} -D__LANG=$$LANG \ ${BASEDIR}/${TEMPLATE}.m4 \ -| ${PERL} ${TOP}/mk/hstrip.pl > $< at >.$$LANG.prep; \ - echo '${DTD}' > $< at >.$$LANG.utf-8; \ - ${XSLTPROC} --html --nonet --stringparam lang $$LANG ${XSL} \ - $< at >.$$LANG.prep >> $< at >.$$LANG.utf-8 2>/dev/null; \ - rm -f $< at >.$$LANG.prep; \ +| ${HTML_STRIP} > $$OUT; \ + echo '${DTD}' > utf8/$$BASE.$$LANG; \ + ${XSLTPROC} --html ${XSLTPROCFLAGS} --stringparam lang $$LANG ${XSL} \ + $$OUT 2>/dev/null \ +| ${HTML_STRIP} >> utf8/$$BASE.$$LANG; \ + rm -f $$OUT; \ case "$$LANG" in \ en) \ - echo "URI: $< at >.$$LANG.utf-8" >> $< at >.var; \ - echo "Content-language: $$LANG" >> $< at >.var; \ - echo "Content-type: text/html;encoding=UTF-8" >> $< at >.var; \ - echo "" >> $< at >.var; \ - echo "URI: $< at >.$$LANG" >> $< at >.var; \ - echo "Content-language: $$LANG" >> $< at >.var; \ - echo "Content-type: text/html" >> $< at >.var; \ - echo "" >> $< at >.var; \ - cat $< at >.$$LANG.utf-8 | \ + echo "URI: utf8/$$BASE.$$LANG" >> $< at >; \ + echo "Content-language: $$LANG" >> $< at >; \ + echo "Content-type: text/html;encoding=UTF-8" >> $< at >; \ + echo "" >> $< at >; \ + echo "URI: $$BASE.$$LANG" >> $< at >; \ + echo "Content-language: $$LANG" >> $< at >; \ + echo "Content-type: text/html" >> $< at >; \ + echo "" >> $< at >; \ + cat utf8/$$BASE.$$LANG | \ sed s/charset=UTF-8/charset=ISO-8859-1/ | \ ${ICONV} -f UTF-8 -t ISO-8859-1 > \ - $< at >.$$LANG; \ + $$BASE.$$LANG; \ ;; \ ab|af|eu|ca|da|nl|fo|fr|fi|de|is|ga|it|no|nb|nn|pt|rm|gd|es|sv|sw) \ - echo "URI: $< at >.$$LANG.utf-8" >> $< at >.var; \ - echo "Content-language: $$LANG" >> $< at >.var; \ - echo "Content-type: text/html;encoding=UTF-8" >> $< at >.var; \ - echo "" >> $< at >.var; \ - echo "URI: $< at >.$$LANG.iso-8859-1" >> $< at >.var; \ - echo "Content-language: $$LANG" >> $< at >.var; \ - echo "Content-type: text/html;charset=ISO-8859-1" >> $< at >.var; \ - echo "" >> $< at >.var; \ - cat $< at >.$$LANG.utf-8 | \ + echo "URI: utf8/$$BASE.$$LANG" >> $< at >; \ + echo "Content-language: $$LANG" >> $< at >; \ + echo "Content-type: text/html;encoding=UTF-8" >> $< at >; \ + echo "" >> $< at >; \ + echo "URI: iso8859-1/$$BASE.$$LANG" >> $< at >; \ + echo "Content-language: $$LANG" >> $< at >; \ + echo "Content-type: text/html;charset=ISO-8859-1" >> $< at >; \ + echo "" >> $< at >; \ + cat utf8/$$BASE.$$LANG | \ sed s/charset=UTF-8/charset=ISO-8859-1/ | \ ${ICONV} -f UTF-8 -t ISO-8859-1 > \ - $< at >.$$LANG.iso-8859-1; \ -cp -f $< at >.$$LANG.iso-8859-1 $< at >.$$LANG \ + iso8859-1/$$BASE.$$LANG; \ +cp -f iso8859-1/$$BASE.$$LANG $$BASE.$$LANG; \ ;; \ *) \ ;; \ esac; \ - echo >> $< at >.var; \ + echo >> $< at >; \ done; \ rm -f ${BASEDIR}/base.htm; \ echo "." clean-www: +< at >echo -n "Clean:" < at >for F in ${HTML}; do \ -echo "rm -f $$F $$F.var"; \ -rm -f $$F $$F.var; \ +export BASE="`echo $$F | sed s/\.var//`"; \ +echo -n " $$BASE"; \ +rm -f $$F; \ for LANG in ${LANGUAGES}; do \ -echo "rm -f $$F.$$LANG.* $$F.$$LANG"; \ -rm -f $$F.$$LANG.* $$F.$$LANG; \ +rm -f $$BASE.$$LANG {utf8,iso8859-1}/$$BASE.$$LANG; \ done; \ -done +done; +< at >echo "." < at >if [ "${CLEANFILES}" != "" ]; then \ echo "rm -f ${CLEANFILES}"; \ rm -f ${CLEANFILES}; \ fi +install-www-makefile: +< at >export OUT=.Makefile.out; \ +echo "# Generated by <build.www.mk> install on `date`" > $$OUT; \ +echo "TOP=." >> $$OUT; \ +echo "HTMLDIR=none" >> $$OUT; \ +echo "BASEDIR=m4" >> $$OUT; \ +echo "XSLDIR=xsl" >> $$OUT; \ +echo "HTML=${HTML}" >> $$OUT; \ +echo "CSS=${CSS}" >> $$OUT; \ +echo "XSL=${XSL}" >> $$OUT; \ +echo "XSLTPROC=${XSLTPROC}" >> $$OUT; \ +echo "XSLTPROCFLAGS=${XSLTPROCFLAGS}" >> $$OUT; \ +echo "M4=${M4}" >> $$OUT; \ +echo "PERL=${PERL}" >> $$OUT; \ +echo "ICONV=${ICONV}" >> $$OUT; \ +echo "TEMPLATE=${TEMPLATE}" >> $$OUT; \ +echo "CSS_TEMPLATE=${CSS_TEMPLATE}" >> $$OUT; \ +echo "LANGUAGES=${LANGUAGES}" >> $$OUT; \ +echo "CHARSETS=${CHARSETS}" >> $$OUT; \ +echo "DEF_LANGUAGE=${DEF_LANGUAGE}" >> $$OUT; \ +echo "include mk/build.www.mk" >> $$OUT; \ +echo "${INSTALL_DATA} $$OUT ${HTMLDIR}/Makefile"; \ +${SUDO} ${INSTALL_DATA} $$OUT ${DESTDIR}${HTMLDIR}/Makefile; \ +rm -f $$OUT + +install-www-source: +< at >if [ -e "${DESTDIR}${HTMLDIR}/$$SRCFILE" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "${HTMLDIR}/$$SRCFILE exists; preserving"; \ +else \ +echo "${INSTALL_DATA} $$SRCFILE ${HTMLDIR}"; \ +${SUDO} ${INSTALL_DATA} $$SRCFILE ${DESTDIR}${HTMLDIR}; \ +fi +< at >if [ -e "${DESTDIR}${HTMLDIR}/Makefile" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "${HTMLDIR}/Makefile exists; preserving"; \ +else +${MAKE} install-www-makefile; \ +fi + +install-www-base: +< at >if [ ! -d "${DESTDIR}${HTMLDIR}/mk" ]; then \ +echo "${INSTALL_DATA_DIR} ${HTMLDIR}/mk"; \ +${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/mk; \ +fi +< at >for MK in ${MKDEPS}; do \ +echo "${INSTALL_DATA} ${TOP}/mk/$$MK ${HTMLDIR}/mk"; \ +${SUDO} ${INSTALL_DATA} ${TOP}/mk/$$MK ${DESTDIR}${HTMLDIR}/mk; \ +done +< at >if [ ! -d "${DESTDIR}${HTMLDIR}/xsl" ]; then \ +echo "${INSTALL_DATA_DIR} ${HTMLDIR}/xsl"; \ +${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/xsl; \ +fi +< at >for XSL in ${XSL}; do \ +if [ -e "${DESTDIR}${HTMLDIR}/xsl/$$XSL" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "xsl/$$XSL: exists; preserving"; \ +else \ +echo "${INSTALL_DATA} $$XSL ${HTMLDIR}/xsl"; \ +${SUDO} ${INSTALL_DATA} $$XSL ${DESTDIR}${HTMLDIR}/xsl; \ +fi; \ +done +< at >if [ ! -d "${DESTDIR}${HTMLDIR}/m4" ]; then \ +echo "${INSTALL_DATA_DIR} ${HTMLDIR}/m4"; \ +${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/m4; \ +fi +< at >(cd ${BASEDIR}; for M4IN in `ls -1 *.m4`; do \ +if [ -e "${DESTDIR}${HTMLDIR}/m4/$$M4IN" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "m4/$$M4IN: exists; preserving"; \ +else \ +echo "${INSTALL_DATA} $$M4IN ${HTMLDIR}/m4"; \ +${SUDO} ${INSTALL_DATA} $$M4IN ${DESTDIR}${HTMLDIR}/m4; \ +fi; \ +done) + install-www: < at >if [ "${HTMLDIR}" = "none" ]; then \ exit 0; \ fi +< at >for CHARSET in ${CHARSETS}; do \ +echo "${INSTALL_DATA_DIR} ${HTMLDIR}/$$CHARSET"; \ +${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/$$CHARSET; \ +done < at >if [ ! -d "${DESTDIR}${HTMLDIR}" ]; then \ echo "${INSTALL_DATA_DIR} ${HTMLDIR}"; \ ${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}; \ fi < at >if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \ -if [ ! -d "${DESTDIR}${HTMLDIR}/mk" ]; then \ -echo "${INSTALL_DATA_DIR} ${HTMLDIR}/mk"; \ -${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/mk; \ -fi; \ -for MK in ${MKDEPS}; do \ -echo "${INSTALL_DATA} ${TOP}/mk/$$MK ${HTMLDIR}/mk"; \ -${SUDO} ${INSTALL_DATA} ${TOP}/mk/$$MK \ - ${DESTDIR}${HTMLDIR}/mk; \ -done; \ - if [ ! -d "${DESTDIR}${HTMLDIR}/xsl" ]; then \ -echo "${INSTALL_DATA_DIR} ${HTMLDIR}/xsl"; \ -${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/xsl; \ -fi; \ -for XSL in ${XSL}; do \ -if [ -e "${DESTDIR}${HTMLDIR}/xsl/$$XSL" \ - -a "${HTML_OVERWRITE}" = "" ]; then \ -echo "xsl/$$XSL: exists; preserving"; \ -else \ -echo "${INSTALL_DATA} $$XSL ${HTMLDIR}/xsl"; \ -${SUDO} ${INSTALL_DATA} $$XSL \ - ${DESTDIR}${HTMLDIR}/xsl; \ -fi; \ -done; \ -if [ ! -d "${DESTDIR}${HTMLDIR}/m4" ]; then \ -echo "${INSTALL_DATA_DIR} ${HTMLDIR}/m4"; \ -${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}/m4; \ -fi; \ -(cd ${BASEDIR}; for M4IN in `ls -1 *.m4`; do \ -if [ -e "${DESTDIR}${HTMLDIR}/m4/$$M4IN" \ - -a "${HTML_OVERWRITE}" = "" ]; then \ -echo "m4/$$M4IN: exists; preserving"; \ -else \ -echo "${INSTALL_DATA} $$M4IN ${HTMLDIR}/m4"; \ -${SUDO} ${INSTALL_DATA} $$M4IN \ - ${DESTDIR}${HTMLDIR}/m4; \ -fi; \ -done); \ +${MAKE} install-www-base; \ fi -< at >for F in ${HTML_DEPS}; do \ +< at >for F in ${HTML_EXTRA}; do \ echo "${INSTALL_DATA} $$F ${HTMLDIR}"; \ ${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${HTMLDIR}; \ done < at >for F in ${HTML}; do \ -rm -f $$F; \ -if [ "${HTML_INSTSOURCE}" = "Yes" -a \ - ! -e "${DESTDIR}${HTMLDIR}/Makefile" ]; then \ -echo "TOP=." > Makefile.prep; \ -echo "HTML=${HTML}" >> Makefile.prep; \ -echo "HTMLDIR=none" >> Makefile.prep; \ -echo "M4=${M4}" >> Makefile.prep; \ -echo "XSLTPROC=${XSLTPROC}" >> Makefile.prep; \ -echo "PERL=${PERL}" >> Makefile.prep; \ -echo "BASEDIR=m4" >> Makefile.prep; \ -echo "TEMPLATE=${TEMPLATE}" >> Makefile.prep; \ -echo "LANGUAGES=${LANGUAGES}" >> Makefile.prep; \ -echo "XSL=xsl" >> Makefile.prep; \ -echo "include mk/build.www.mk" >> Makefile.prep; \ -echo "${INSTALL_DATA} Makefile.prep \ - ${HTMLDIR}/Makefile"; \ -${SUDO} ${INSTALL_DATA} Makefile.prep \ - ${DESTDIR}${HTMLDIR}/Makefile; \ -rm -f Makefile.prep; \ -fi; \ +export BASE="`echo $$F | sed s/\.var//`"; \ if [ "${HTML_INSTSOURCE}" = "Yes" ]; then \ -export SF=`echo $$F |sed s,.html$$,.htm,`; \ -if [ -e "${DESTDIR}${HTMLDIR}/$$SF" \ - -a "${HTML_OVERWRITE}" = "" ]; then \ -echo "$$SF exists; preserving"; \ -else \ -echo "${INSTALL_DATA} $$SF ${HTMLDIR}"; \ -${SUDO} ${INSTALL_DATA} $$SF \ - ${DESTDIR}${HTMLDIR}; \ -fi; \ +${MAKE} install-www-source \ + SRCFILE="`echo $$BASE |sed s,.html$$,.htm,`" fi; \ -if [ -e "${DESTDIR}${HTMLDIR}/$$F.var" \ +if [ -e "${DESTDIR}${HTMLDIR}/$$F" \ -a "${HTML_OVERWRITE}" = "" ]; then \ -echo "$$F.var exists; preserving"; \ +echo "$$F exists; preserving"; \ else \ -echo "${INSTALL_DATA} $$F.var ${HTMLDIR}"; \ -${SUDO} ${INSTALL_DATA} $$F.var ${DESTDIR}${HTMLDIR}; \ +echo "${INSTALL_DATA} $$F ${HTMLDIR}"; \ +${SUDO} ${INSTALL_DATA} $$F ${DESTDIR}${HTMLDIR}; \ fi; \ for LANG in ${LANGUAGES}; do \ -for ENC in `ls -1 $$F.$$LANG*`; do \ - if [ -e "${DESTDIR}${HTMLDIR}/$$ENC" \ - -a "${HTML_OVERWRITE}" = "" ]; then \ - echo "$$ENC exists; preserving"; \ - else \ - echo "${INSTALL_DATA} $$ENC ${HTMLDIR}"; \ - ${SUDO} ${INSTALL_DATA} $$ENC \ - ${DESTDIR}${HTMLDIR}; \ - fi; \ +if [ -e "${DESTDIR}${HTMLDIR}/$$BASE.$$LANG" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "$$BASE.$$LANG exists; preserving"; \ +else \ +echo "${INSTALL_DATA} $$BASE.$$LANG ${HTMLDIR}"; \ +${SUDO} ${INSTALL_DATA} $$BASE.$$LANG ${DESTDIR}${HTMLDIR}; \ +fi; \ +for CHARSET in ${CHARSETS}; do \ +if [ -e "$$CHARSET/$$BASE.$$LANG" ]; then \ +if [ -e "${DESTDIR}${HTMLDIR}/$$CHARSET/$$BASE.$$LANG" \ + -a "${HTML_OVERWRITE}" = "" ]; then \ +echo "$$CHARSET/$$BASE.$$LANG exists; preserving"; \ +else \ +echo "${INSTALL_DATA} $$CHARSET/$$BASE.$$LANG ${HTMLDIR}/$$CHARSET"; \ +${SUDO} ${INSTALL_DATA} $$CHARSET/$$BASE.$$LANG ${DESTDIR}${HTMLDIR}/$$CHARSET; \ +fi; \ +fi; \ done; \ done; \ done -.PHONY: install deinstall clean cleandir regress depend -.PHONY: install-www clean-www +.PHONY: install deinstall clean cleandir regress depend clean-www +.PHONY: install-www install-www-makefile install-www-source install-www-base include ${TOP}/mk/build.common.mk include ${TOP}/mk/build.subdir.mk [Less]