Commit f7454848 authored by Emmanuel Bourg's avatar Emmanuel Bourg Committed by Chris Lamb
Browse files

Update the Javadoc handler to handle "dc.created" meta headers too for OpenJDK... 


Update the Javadoc handler to handle "dc.created" meta headers too for OpenJDK 11. (Closes: #913132)

Signed-off-by: Chris Lamb's avatarChris Lamb <lamby@debian.org>
parent 43961cc4

lib/File/StripNondeterminism/handlers/javadoc.pm

+3 −3
Original line number Diff line number Diff line
@@ -59,14 +59,14 @@ sub normalize { 
			  unless $line

			  =~ /^\s*$/; # elide lines that are now whitespace-only

			$modified = 1;

		} elsif ($line =~ /\<META NAME="date" CONTENT="[^"]*"\>/i) {

		} elsif ($line =~ /\<META NAME="(date|dc.created)" CONTENT="[^"]*"\>/i) {

			if (defined $File::StripNondeterminism::canonical_time) {

				my $date = strftime('%Y-%m-%d',

					gmtime($File::StripNondeterminism::canonical_time));

				$line

				  =~ s/\<(META NAME="date" CONTENT)="[^"]*"\>/<$1="$date">/gi;

				  =~ s/\<(META NAME="(?:date|dc.created)" CONTENT)="[^"]*"\>/<$1="$date">/gi;

			} else {

				$line =~ s/\<META NAME="date" CONTENT="[^"]*"\>//gi;

				$line =~ s/\<META NAME="(?:date|dc.created)" CONTENT="[^"]*"\>//gi;

			}

			print $tempfile $line

			  unless $line

t/fixtures/javadoc/java11.html.in

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<!DOCTYPE HTML>

<!-- NewPage -->

<html lang="en">

<head>

<!-- Generated by javadoc (11.0.1) on Wed Nov 07 09:50:23 CET 2018 -->

<title>Generated Documentation (Untitled)</title>

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

<meta name="dc.created" content="2018-11-07">

<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">

<script type="text/javascript" src="script.js"></script>

t/fixtures/javadoc/java11.html.out

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<!DOCTYPE HTML>

<!-- NewPage -->

<html>

<head>

<title>Generated Documentation (Untitled)</title>

<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

<meta name="dc.created" content="2015-02-05">

<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">

<script type="text/javascript" src="script.js"></script>