Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Oct 2008 08:39:09 +0000 (UTC)
From:      Edwin Groothuis <edwin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-user@freebsd.org
Subject:   svn commit: r184051 - in user/edwin/releasenotes: . releng-6.1/release/doc/en_US.ISO8859-1/relnotes releng-6.2/release/doc/en_US.ISO8859-1/relnotes releng-7.0/release/doc/en_US.ISO8859-1/relnotes s...
Message-ID:  <200810190839.m9J8d96Y038302@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: edwin
Date: Sun Oct 19 08:39:08 2008
New Revision: 184051
URL: http://svn.freebsd.org/changeset/base/184051

Log:
  Be able to find the branches to compare (temporary commit, tomorrow
  I'll be on the train again!)

Modified:
  user/edwin/releasenotes/contrib-xmltoent.pl
  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-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile
  user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile

Modified: user/edwin/releasenotes/contrib-xmltoent.pl
==============================================================================
--- user/edwin/releasenotes/contrib-xmltoent.pl	Sun Oct 19 08:37:58 2008	(r184050)
+++ user/edwin/releasenotes/contrib-xmltoent.pl	Sun Oct 19 08:39:08 2008	(r184051)
@@ -167,10 +167,30 @@ if (!defined $branches{$releaseent{"rele
 }
 
 #
-# Find all MFVs which are done in the time that 
+# Changes in software versions are determined as follows:
 #
+# For version N.M and M != 0, compare against branches{N.(M-1)}
+# For version N.0, compare against branches{(N-1)}
+# For version N, compare against branches{(N-1)}
+#
+my $thisversion = $releaseent{"release.current"};
+my $prevversion = "";
 
+# XXX - This fails for 5.2.1
+if ($thisversion =~ /^(\d+)\.(\d+)/) {
+	my $major = $1;
+	my $minor = $2;
+	if ($minor eq "0") {
+		$prevversion = $major - 1;
+	} else {
+		$prevversion = sprintf("%d.%d", $major, $minor - 1);
+	}
+} elsif ($thisversion =~ /^(\d+)$/) {
+	$prevversion = $1 - 1;
+}
 
-print Dumper(%branches);
-print Dumper(%releaseent);
+print "$thisversion - $prevversion\n";
+print "$branches{$thisversion} - $branches{$prevversion}\n";
+#print Dumper(%branches);
+#print Dumper(%releaseent);
 #print Dumper(%softwares);

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	Sun Oct 19 08:37:58 2008	(r184050)
+++ user/edwin/releasenotes/releng-6.1/release/doc/en_US.ISO8859-1/relnotes/Makefile	Sun Oct 19 08:39:08 2008	(r184051)
@@ -9,5 +9,8 @@ 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"

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	Sun Oct 19 08:37:58 2008	(r184050)
+++ user/edwin/releasenotes/releng-6.2/release/doc/en_US.ISO8859-1/relnotes/Makefile	Sun Oct 19 08:39:08 2008	(r184051)
@@ -9,5 +9,8 @@ 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"

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	Sun Oct 19 08:37:58 2008	(r184050)
+++ user/edwin/releasenotes/releng-7.0/release/doc/en_US.ISO8859-1/relnotes/Makefile	Sun Oct 19 08:39:08 2008	(r184051)
@@ -18,6 +18,9 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.sgml
 
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl
+
 URL_RELPREFIX?=	../../../..
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"

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	Sun Oct 19 08:37:58 2008	(r184050)
+++ user/edwin/releasenotes/stable-7/release/doc/en_US.ISO8859-1/relnotes/Makefile	Sun Oct 19 08:39:08 2008	(r184051)
@@ -18,6 +18,9 @@ JADEFLAGS+=	-V %generate-article-toc%
 # SGML content
 SRCS+=	article.sgml
 
+contrib.ent: ${RELN_ROOT}/../../../contrib.xml
+	${PERL} -w ${RELN_ROOT}/../../../contrib-xmltoent.pl
+
 URL_RELPREFIX?=	../../../..
 
 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810190839.m9J8d96Y038302>