6896058 transition to xwiki broke Tonic build (nightly -O, mkreadme_osol)

2 files changed, 53 insertions, 16 deletions

diff --git a/usr/src/tools/opensolaris/README.opensolaris.tmpl b/usr/src/tools/opensolaris/README.opensolaris.tmpl
index 7259a03e0e..fe3219e08c 100644
--- a/usr/src/tools/opensolaris/README.opensolaris.tmpl
+++ b/usr/src/tools/opensolaris/README.opensolaris.tmpl
@@ -1,7 +1,5 @@
 		     OpenSolaris Buildable Source
 
-#ident	"%Z%%M%	%I%	%E% SMI"
-
 Note: if this is your first OpenSolaris installation, please see the
 currently known issues section below to see the minimum build of
 Solaris Express - Community Release required to build and install
@@ -24,7 +22,7 @@ archives into archives-DATE/PLATFORM/ (e.g.,
 archives-20050612/i386/).  You should review Section A
 (changes since the last delivery) and Section B (known issues) before
 following the BFU instructions in the Developer's Reference 
-(http://www.opensolaris.org/os/community/onnv/devref_toc/).
+(http://hub.opensolaris.org/bin/view/Community+Group+on/devref_toc).
 
 If you want to build from source, you will need the source, compiler,
 ON tools, and "extras" tools.  The encumbered binaries tarball contains
@@ -36,9 +34,10 @@ complete set of installable archives, you will want the encumbered
 binaries.
 
 Currently, to obtain source, you can either download the
-on-src-DATE.tar.bz2 tarball if you are downloading a build-synchronised
-delivery.  Or, you can checkout from the Mercurial repository at
-(please see instructions at: http://opensolaris.org/os/project/onnv/)
+on-src-DATE.tar.bz2 tarball if you are downloading a
+build-synchronised delivery.  Or, you can checkout from the Mercurial
+repository; please see instructions at:
+http://hub.opensolaris.org/bin/view/Project+onnv/WebHome
 
 The buildable source contains the source for our high key-strength
 crypto, known as the Encryption Kit (SUNWcry, SUNWcryr, SUNWcryptoint).
@@ -60,12 +59,12 @@ Currently Known Issues
 	These were some of the major known issues at the time of this
 delivery.  The most recent list is available on the OpenSolaris.org
 website in the Nevada community at:
-http://opensolaris.org/os/community/onnv/known_issues/
+http://hub.opensolaris.org/bin/view/Community+Group+on/known_issues
 
-<!-- #include http://opensolaris.org/os/community/onnv/known_issues -->
+<!-- #include http://hub.opensolaris.org/bin/view/Community+Group+on/known_issues -->
 
 
 Installing from Source
 ----------------------
 
-<!-- #include http://opensolaris.org/os/community/onnv/install_quickstart -->
+<!-- #include http://hub.opensolaris.org/bin/view/Community+Group+on/install_quickstart -->
diff --git a/usr/src/tools/scripts/mkreadme_osol.pl b/usr/src/tools/scripts/mkreadme_osol.pl
index cc0dfd07c8..b42545e309 100644
--- a/usr/src/tools/scripts/mkreadme_osol.pl
+++ b/usr/src/tools/scripts/mkreadme_osol.pl
@@ -21,11 +21,9 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Generate README.opensolaris from a template for inclusion in a
@@ -47,8 +45,8 @@ my $tries = 2;
 #
 # Markers in the web pages that we download.
 #
-my $begin_data = qr/<!-- begin_data --><pre>/;
-my $end_data = qr/<\/pre><!-- end_data -->/;
+my $begin_data = qr/\[begin README tag - do not delete\]/;
+my $end_data = qr/\[end README tag - do not delete\]/;
 
 my $readme_fn = shift || die "missing README filepath\n";
 open(README_OUT, ">$readme_fn") || die "couldn't open $readme_fn\n";
@@ -67,24 +65,64 @@ if (! $ENV{"http_proxy"}) {
 	$ENV{"http_proxy"} = $ENV{"HTTP_PROXY"};
 }
 
+#
+# Make a pass through the input file and download any web pages that
+# are included by reference.
+#
 foreach (@lines) {
 	chomp;
 	if (/^<!-- #include (.+) -->$/) {
 		my $url = $1;
 		print "Getting $url\n";
+		# Download the page into $content{$url}.
 		$content{$url} =
 		    `/usr/sfw/bin/wget -q -O - -T $timeout -t $tries $url`;
 		if (! $content{$url}) {
 			die "$url: invalid or empty URI.\n";
 		}
+		#
+		# Clean up the downloaded contents: remove carriage
+		# returns, strip out content that is outside the
+		# delimiter tags, convert HTML-encoded characters back
+		# into plain text.
+		#
 		$content{$url} =~ s/\r//g;
 		my @c = split /\n/, $content{$url};
-		while ((my $l = shift @c) !~ /$begin_data/) {};
-		while ((pop @c) !~ /$end_data/) {};
+		my $l;
+		# Work forwards to find start.
+		while (defined ($l = shift @c)) {
+			if ($l =~ /$begin_data/) {
+				last;
+			}
+		}
+		if (! defined $l) {
+			print "Warning: content start delimiter not found\n";
+		} else {
+			# Work backwards to find end.
+			while (defined ($l = pop @c)) {
+				if ($l =~ /$end_data/) {
+					last;
+				}
+			}
+			if (! defined $l) {
+				print "Warning: content end delimiter ",
+				    "not found\n";
+			}
+		}
 		$content{$url} = join "\n", @c;
+		$content{$url} =~ s/&amp;/&/g;
+		$content{$url} =~ s/&lt;/</g;
+		$content{$url} =~ s/&#60;/</g;
+		$content{$url} =~ s/&gt;/>/g;
+		$content{$url} =~ s/&#62;/>/g;
 	}
 }
 
+#
+# Make a second pass through the input file.  Pass most text on
+# verbatim; replace #include directives with the content that was
+# downloaded by the previous pass.
+#
 foreach (@lines) {
 	if (/^<!-- #include (.+) -->$/ && exists($content{$1})) {
 		print README_OUT $content{$1};