Date: Tue, 21 Oct 2008 10:54:12 +0000 (UTC) From: Edwin Groothuis <edwin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r184121 - in user/edwin/releasenotes: . head/release/doc/en_US.ISO8859-1/relnotes releng-6.0/release/doc/en_US.ISO8859-1/relnotes releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common ... Message-ID: <200810211054.m9LAsCD9097276@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: edwin Date: Tue Oct 21 10:54:12 2008 New Revision: 184121 URL: http://svn.freebsd.org/changeset/base/184121 Log: Automatic generation of Contributed Software overview. First working code, will check the correctness tomorrow. Added: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Modified: user/edwin/releasenotes/Makefile user/edwin/releasenotes/contrib-xmltoent.pl user/edwin/releasenotes/contrib.xml user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Modified: user/edwin/releasenotes/Makefile ============================================================================== --- user/edwin/releasenotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -6,14 +6,26 @@ RELENG=7.0 6.4 6.3 6.2 6.1 6.0 build: .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} - cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \ + @cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \ make .endfor +clean: +.for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} + @cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \ + make clean +.endfor + +perl: +.for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} + @cd ${d}/release/doc/en_US.ISO8859-1/relnotes/; \ + make contrib.ent +.endfor + html: > links.html .for d in ${DIRS} ${STABLE:S/^/stable-/} ${RELENG:S/^/releng-/} - A=$$(find ${d} -name article.html | egrep '(relnotes/article|i386)'); \ + @A=$$(find ${d} -name article.html | egrep '(relnotes/article|i386)'); \ echo "<a href=\"$${A}\">${d}</a><br>" >> links.html .endfor Modified: user/edwin/releasenotes/contrib-xmltoent.pl ============================================================================== --- user/edwin/releasenotes/contrib-xmltoent.pl Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/contrib-xmltoent.pl Tue Oct 21 10:54:12 2008 (r184121) @@ -2,6 +2,7 @@ use XML::Parser; use Data::Dumper; +use POSIX; use strict; my @tree = (); @@ -12,6 +13,7 @@ my %branches = (); my %softwares = (); my $software = ""; my $mfcbranch = ""; +my $mfvbranch = ""; my $swversion = ""; my %releaseent = (); @@ -35,6 +37,11 @@ sub xml_start { if ($element eq "mfc") { $mfcbranch = $values[$treeindex]{branch}; } + if ($element eq "mfv") { + $mfvbranch = ""; + $mfvbranch = $values[$treeindex]{branch} + if (defined $values[$treeindex]{branch}); + } } @@ -89,6 +96,8 @@ sub xml_char { } if ($tree[5] eq "mfv") { $softwares{$software}{versions}{$swversion}{mfv} = $value; + $softwares{$software}{versions}{$swversion}{mfc}{$mfvbranch} = $value + if ($mfvbranch); return; } if ($tree[5] eq "desc") { @@ -116,7 +125,7 @@ my $p = new XML::Parser( End => \&xml_end, Char => \&xml_char, }); -$p->parsefile("../../../../../contrib.xml"); +$p->parsefile(defined $ARGV[0] ? $ARGV[0] : "../../../../../contrib.xml"); { my %r = ( @@ -144,25 +153,41 @@ $p->parsefile("../../../../../contrib.xm # # If we are in -current, then release.current doesn't exist yet. -# In that case copy all MFVs into MFC{release.branch}. The date +# In that case copy all MFVs into MFC{branchitwasinMFVin}. The date # of the new MFC is the date of the release.prev. # # release.current is then assigned with release.branch. # -# the creation date of branches{release.current} will be -# branches{release.prev} +# the creation date of branches{release.current} will be today. # if (!defined $branches{$releaseent{"release.current"}}) { foreach my $sw (keys(%softwares)) { foreach my $vs (keys(%{$softwares{$sw}{versions}})) { + next; + # XXX next if (!defined $softwares{$sw}{versions}{$vs}{mfv}); - $softwares{$sw}{versions}{$vs}{mfc}{$releaseent{"release.branch"}} = $softwares{$sw}{versions}{$vs}{mfv}; + my $date = $softwares{$sw}{versions}{$vs}{mfv}; + my $branch = 0; + + foreach my $b (sort(keys(%branches))) { + if ($b !~ /\./ && + $date lt $branches{$b} && + ($branch eq "0" || $date lt $branches{$branch})) { + $branch = $b; + } + } + + $softwares{$sw}{versions}{$vs}{mfc}{$branch} = + $softwares{$sw}{versions}{$vs}{mfv}; } } $releaseent{"release.current"} = $releaseent{"release.branch"}; - $branches{$releaseent{"release.current"}} = - $branches{$releaseent{"release.prev"}} +# $branches{$releaseent{"release.current"}} = +# $branches{$releaseent{"release.prev"}} + my @lt = localtime(); + $branches{$releaseent{"release.current"}} = strftime("%Y-%m-%d", + 0, 0, 0, $lt[3], $lt[4], $lt[5]); } @@ -189,8 +214,57 @@ if ($thisversion =~ /^(\d+)\.(\d+)/) { $prevversion = $1 - 1; } -print "$thisversion - $prevversion\n"; -print "$branches{$thisversion} - $branches{$prevversion}\n"; -#print Dumper(%branches); -#print Dumper(%releaseent); -#print Dumper(%softwares); +# +# Now we know the branches to compare, we know the dates between +# which the changes have to be displayed. +# +# Let's find the software which has been updated +# + +my $T1 = $branches{$prevversion}; +my $T2 = $branches{$thisversion}; +my @T1 = split(/\-/, $T1); +my @T2 = split(/\-/, $T2); + +my %updated = (); + +#print $releaseent{"release.current"}, " - $thisversion - $prevversion\n"; +#print "$branches{$thisversion} - $branches{$prevversion}\n"; + +my %versions = (); +foreach my $sw (sort(keys(%softwares))) { + foreach my $vs (sort(keys(%{$softwares{$sw}{versions}}))) { + foreach my $branch (sort(keys(%{$softwares{$sw}{versions}{$vs}{mfc}}))) { + next if ($branch ne $prevversion && + $branch ne $thisversion); + + my $date = $softwares{$sw}{versions}{$vs}{mfc}{$branch}; + next if ($date lt $branches{$prevversion} || + $date gt $branches{$thisversion}); +# print "$date - $branch - $vs -> $sw\n"; + if (!defined $versions{$sw}{f_date} || + $versions{$sw}{f_date} ge $date) { + $versions{$sw}{f_date} = $date; + $versions{$sw}{f_version} = $vs; + } + if (!defined $versions{$sw}{l_date} || + $versions{$sw}{l_date} le $date) { + $versions{$sw}{l_date} = $date; + $versions{$sw}{l_version} = $vs; + } + } + } +} + +foreach my $sw (sort(keys(%versions))) { + my $a = $softwares{$sw}{desc}; + print "<!ENTITY contrib.${sw}1 \"$versions{$sw}{f_version}\">\n"; + print "<!ENTITY contrib.${sw}2 \"$versions{$sw}{l_version}\">\n"; + print "<!ENTITY contrib.${sw}text \"$softwares{$sw}{desc}\">\n"; +} + +print "<!ENTITY contrib.softwares \""; +foreach my $sw (sort(keys(%versions))) { + print "&contrib.${sw}text; "; +} +print "\">\n"; Modified: user/edwin/releasenotes/contrib.xml ============================================================================== --- user/edwin/releasenotes/contrib.xml Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/contrib.xml Tue Oct 21 10:54:12 2008 (r184121) @@ -8,62 +8,63 @@ <branch name="6.2">2006-11-14</branch> <branch name="6.3">2007-10-24</branch> <branch name="6.4">2008-10-02</branch> + <branch name="5">2003-01-15</branch> </branches> <softwares> <software name="less"> <desc><![CDATA[ <para><application>less</application> has been updated from - %v1% to %v2%.</para> + &contrib.less1; to &contrib.less2;</para> ]]></desc> <versions> <version version="v416"> <import>2007-11-26</import> - <mfv>2007-11-26</mfv> + <mfv branch="8">2007-11-26</mfv> <mfc branch="7">2007-12-05</mfc> <mfc branch="6">2007-12-05</mfc> </version> <version version="v415"> <import>2007-11-17</import> - <mfv>2007-11-17</mfv> + <mfv branch="8">2007-11-17</mfv> </version> <version version="v409"> <import>2007-10-13</import> - <mfv>2007-10-13</mfv> + <mfv branch="8">2007-10-13</mfv> <mfc branch="7">2007-10-18</mfc> <mfc branch="6">2007-10-16</mfc> </version> <version version="v408"> <import>2007-10-09</import> - <mfv>2007-10-09</mfv> + <mfv branch="7">2007-10-09</mfv> <mfc branch="6">2007-10-12</mfc> </version> <version version="v406"> <import>2007-06-21</import> - <mfv>2007-06-21</mfv> + <mfv branch="7">2007-06-21</mfv> <mfc branch="6">2007-07-03</mfc> </version> <version version="v403"> <import>2007-06-04</import> - <mfv>2007-06-04</mfv> + <mfv branch="7">2007-06-04</mfv> </version> <version version="v394"> <import>2006-08-21</import> - <mfv>2006-08-21</mfv> + <mfv branch="7">2006-08-21</mfv> <mfc branch="6">2006-08-30</mfc> </version> <version version="v381"> <import>2004-04-17</import> - <mfv>2004-04-17</mfv> + <mfv branch="6">2004-04-17</mfv> </version> <version version="v371"> <import>2002-01-08</import> - <mfv>2002-01-08</mfv> + <mfv branch="5">2002-01-08</mfv> </version> <version version="v357"> <import>2000-07-14</import> - <mfv>2000-07-14</mfv> + <mfv branch="5">2000-07-14</mfv> </version> <version version="v354"> <import>2000-05-22</import> @@ -74,123 +75,123 @@ <software name="tzdata"> <desc><![CDATA[ <para>The timezone database has been updated from - the <application>%v1%</application> release to the - <application>%v2%</application> release.</para> + the <application>&contrib.tzdata1;</application> release to the + <application>&contrib.tzdata2;</application> release.</para> ]]></desc> <versions> <version version="tzdata2008h"> <import>2008-10-14</import> - <mfv>2008-10-14</mfv> + <mfv branch="8">2008-10-14</mfv> <mfc branch="7">2008-10-14</mfc> <mfc branch="6">2008-10-14</mfc> <mfc branch="6.4">2008-10-14</mfc> </version> <version version="tzdata2008g"> <import>2008-10-14</import> - <mfv>2008-10-14</mfv> + <mfv branch="8">2008-10-14</mfv> <mfc branch="7">2008-10-14</mfc> <mfc branch="6">2008-10-14</mfc> <mfc branch="6.4">2008-10-14</mfc> </version> <version version="tzdata2008f"> <import>2008-09-16</import> - <mfv>2008-09-16</mfv> + <mfv branch="8">2008-09-16</mfv> <mfc branch="7">2008-09-16</mfc> <mfc branch="6">2008-09-16</mfc> </version> <version version="tzdata2008e"> <import>2008-08-08</import> - <mfv>2008-08-08</mfv> + <mfv branch="8">2008-08-08</mfv> <mfc branch="7">2008-08-08</mfc> <mfc branch="6">2008-08-15</mfc> </version> <version version="tzdata2008d"> <import>2008-08-08</import> - <mfv>2008-08-08</mfv> + <mfv branch="8">2008-08-08</mfv> <mfc branch="7">2008-08-08</mfc> <mfc branch="6">2008-08-15</mfc> </version> <version version="tzdata2008c"> <import>2008-08-08</import> - <mfv>2008-08-08</mfv> + <mfv branch="8">2008-08-08</mfv> <mfc branch="7">2008-08-08</mfc> <mfc branch="6">2008-08-15</mfc> </version> <version version="tzdata2008b"> <import>2008-03-25</import> - <mfv>2008-08-08</mfv> + <mfv branch="8">2008-08-08</mfv> <mfc branch="7">2008-03-25</mfc> <mfc branch="6">2008-03-25</mfc> </version> <version version="tzdata2008a"> <import>2008-03-09</import> - <mfv>2008-03-09</mfv> + <mfv branch="8">2008-03-09</mfv> <mfc branch="7">2008-03-09</mfc> <mfc branch="6">2008-03-09</mfc> </version> <version version="tzdata2007k"> <import>2008-01-01</import> - <mfv>2008-01-01</mfv> + <mfv branch="8">2008-01-01</mfv> <mfc branch="7">2008-01-06</mfc> <mfc branch="6">2008-01-06</mfc> <mfc branch="6.3">2008-01-06</mfc> </version> <version version="tzdata2007j"> <import>2007-12-04</import> - <mfv>2007-12-04</mfv> + <mfv branch="8">2007-12-04</mfv> </version> <version version="tzdata2007i"> <import>2007-11-04</import> - <mfv>2007-11-04</mfv> + <mfv branch="8">2007-11-04</mfv> </version> <version version="tzdata2007h"> <import>2007-10-09</import> - <mfv>2007-10-09</mfv> + <mfv branch="7">2007-10-09</mfv> <mfc branch="6">2007-10-18</mfc> </version> <version version="tzdata2007g"> <import>2007-08-24</import> - <mfv>2007-08-24</mfv> + <mfv branch="7">2007-08-24</mfv> <mfc branch="6">2007-09-02</mfc> </version> <version version="tzdata2007f"> <import>2007-05-21</import> - <mfv>2007-05-21</mfv> + <mfv branch="7">2007-05-21</mfv> </version> <version version="tzdata2006n"> <import>2006-05-11</import> - <mfv>2006-05-21</mfv> + <mfv branch="7">2006-05-21</mfv> <mfc branch="6">2006-10-16</mfc> </version> <version version="tzdata2006g"> <import>2006-05-11</import> - <mfv></mfv> + <mfv branch="7">x</mfv> <mfc branch="6">2005-05-11</mfc> </version> <version version="tzdata2005r"> <import>2005-12-27</import> - <mfv>2005-12-27</mfv> + <mfv branch="7">2005-12-27</mfv> <mfc branch="6">2005-12-27</mfc> </version> <version version="tzdata2005q"> <import>2005-12-22</import> - <mfv>2005-12-22</mfv> + <mfv branch="7">2005-12-22</mfv> <mfc branch="6">2005-12-22</mfc> </version> <version version="tzdata2005m"> <import>2005-08-26</import> - <mfv>2005-08-29</mfv> + <mfv branch="7">2005-08-29</mfv> <mfc branch="6">2005-12-22</mfc> </version> <version version="tzdata2005l"> <import>2005-08-26</import> - <mfv>2005-08-27</mfv> + <mfv branch="7">2005-08-27</mfv> <mfc branch="6">2005-12-22</mfc> </version> <version version="tzdata2004g"> <import>2004-12-03</import> - <mfv>2004-12-03</mfv> + <mfv branch="7">2004-12-03</mfv> <mfc branch="6">2004-12-02</mfc> </version> <version version="tzdata2004e"> Modified: user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/head/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -19,10 +19,11 @@ JADEFLAGS+= -V %generate-article-toc% SRCS+= article.sgml # Contributed software -SRCS+= contrib.ent +SRCS+= contrib.ent +CLEANFILES+= contrib.ent contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../.. Modified: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,12 +2,16 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 SUBDIR+= sparc64 +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.0/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 @@ -10,5 +11,8 @@ SUBDIR+= pc98 SUBDIR+= powerpc SUBDIR+= sparc64 +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" .include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.3/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/releng-6.4/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -18,8 +18,12 @@ JADEFLAGS+= -V %generate-article-toc% # SGML content SRCS+= article.sgml +# Contributes software +SRCS+= contrib.ent +CLEANFILES+= contrib.ent + contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../.. Modified: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -2,7 +2,8 @@ RELN_ROOT?= ${.CURDIR}/../.. -SUBDIR = alpha +SUBDIR = common +SUBDIR+= alpha SUBDIR+= amd64 SUBDIR+= ia64 SUBDIR+= i386 Added: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -0,0 +1,27 @@ +# $FreeBSD: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/Makefile 165865 2007-01-07 18:37:59Z marcel $ + +RELN_ROOT?= ${.CURDIR}/../../.. + +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/relnotes +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +JADEFLAGS+= -V %generate-article-toc% + +CLEANFILES+= contrib.ent +SRCS+= contrib.ent + +contrib.ent: ${RELN_ROOT}/../../../contrib.xml + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl $? > contrib.ent + +URL_RELPREFIX?= ../../../../.. + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Modified: user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml ============================================================================== --- user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-6/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml Tue Oct 21 10:54:12 2008 (r184121) @@ -198,6 +198,12 @@ <sect2 id="contrib"> <title>Contributed Software</title> + &contrib.softwares; + + </sect> + + <sect2 id="excontrib"> + <title>Contributed Software</title> <para><application>bzip2</application> has been updated from 1.0.4 to 1.0.5.</para> Modified: user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile ============================================================================== --- user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:17:51 2008 (r184120) +++ user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile Tue Oct 21 10:54:12 2008 (r184121) @@ -18,8 +18,12 @@ JADEFLAGS+= -V %generate-article-toc% # SGML content SRCS+= article.sgml +# Contributed software +SRCS+= contrib.ent +CLEANFILES+= contrib.ent + contrib.ent: ${RELN_ROOT}/../../../contrib.xml - ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl + ${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl > contrib.ent URL_RELPREFIX?= ../../../..
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810211054.m9LAsCD9097276>