From 0f946a4a86e5a831a9301cea7cd0305ac9afd1bf Mon Sep 17 00:00:00 2001 From: Andrey Ponomarenko Date: Sat, 2 Jul 2016 19:10:59 +0300 Subject: Added -old-style option. --- abi-compliance-checker.pl | 101 ++++++++++++++++++++++++++++++++++-------- modules/Internals/RegTests.pm | 10 +++-- 2 files changed, 90 insertions(+), 21 deletions(-) diff --git a/abi-compliance-checker.pl b/abi-compliance-checker.pl index 3906b66..247deeb 100644 --- a/abi-compliance-checker.pl +++ b/abi-compliance-checker.pl @@ -91,7 +91,7 @@ $SourceReportPath, $UseXML, $SortDump, $DumpFormat, $ExtraInfo, $ExtraDump, $Force, $Tolerance, $Tolerant, $SkipSymbolsListPath, $CheckInfo, $Quick, $AffectLimit, $AllAffected, $CppIncompat, $SkipInternalSymbols, $SkipInternalTypes, $TargetArch, $GccOptions, -$TypesListPath, $SkipTypesListPath, $CheckPrivateABI, $CountSymbols); +$TypesListPath, $SkipTypesListPath, $CheckPrivateABI, $CountSymbols, $OldStyle); my $CmdName = get_filename($0); my %OS_LibExt = ( @@ -222,6 +222,7 @@ GetOptions("h|help!" => \$Help, "source|src|api!" => \$SourceOnly, "limit-affected|affected-limit=s" => \$AffectLimit, "count-symbols=s" => \$CountSymbols, + "old-style!" => \$OldStyle, # other options "test!" => \$TestTool, "test-dump!" => \$TestDump, @@ -615,6 +616,9 @@ EXTRA OPTIONS: -count-symbols PATH Count total public symbols in the ABI dump. + + -old-style + Generate old-style report. OTHER OPTIONS: -test @@ -15621,8 +15625,14 @@ sub get_SourceInfo() if(my @Headers = get_CheckedHeaders(1)) { - $CheckedHeaders = "

Header Files  ".($#Headers+1)." 

\n"; - $CheckedHeaders .= "
\n"; + $CheckedHeaders = ""; + if($OldStyle) { + $CheckedHeaders .= "

Header Files (".($#Headers+1).")

"; + } + else { + $CheckedHeaders .= "

Header Files  ".($#Headers+1)." 

"; + } + $CheckedHeaders .= "
\n
\n"; foreach my $Header_Path (sort {lc($Registered_Headers{1}{$a}{"Identity"}) cmp lc($Registered_Headers{1}{$b}{"Identity"})} @Headers) { my $Identity = $Registered_Headers{1}{$Header_Path}{"Identity"}; @@ -15636,8 +15646,14 @@ sub get_SourceInfo() if(my @Sources = keys(%{$Registered_Sources{1}})) { - $CheckedSources = "

Source Files  ".($#Sources+1)." 

\n"; - $CheckedSources .= "
\n"; + $CheckedSources = ""; + if($OldStyle) { + $CheckedSources .= "

Source Files (".($#Sources+1).")

"; + } + else { + $CheckedSources .= "

Source Files  ".($#Sources+1)." 

"; + } + $CheckedSources .= "
\n
\n"; foreach my $Header_Path (sort {lc($Registered_Sources{1}{$a}{"Identity"}) cmp lc($Registered_Sources{1}{$b}{"Identity"})} @Sources) { my $Identity = $Registered_Sources{1}{$Header_Path}{"Identity"}; @@ -15651,11 +15667,15 @@ sub get_SourceInfo() if(not $CheckHeadersOnly) { - $CheckedLibs = "

".get_ObjTitle()."  ".keys(%{$Library_Symbol{1}})." 

\n"; - $CheckedLibs .= "
\n"; - foreach my $Library (sort {lc($a) cmp lc($b)} keys(%{$Library_Symbol{1}})) - { - # $Library .= " (.$LIB_EXT)" if($Library!~/\.\w+\Z/); + $CheckedLibs = ""; + if($OldStyle) { + $CheckedLibs .= "

".get_ObjTitle()." (".keys(%{$Library_Symbol{1}}).")

"; + } + else { + $CheckedLibs .= "

".get_ObjTitle()."  ".keys(%{$Library_Symbol{1}})." 

"; + } + $CheckedLibs .= "
\n
\n"; + foreach my $Library (sort {lc($a) cmp lc($b)} keys(%{$Library_Symbol{1}})) { $CheckedLibs .= $Library."
\n"; } $CheckedLibs .= "
\n"; @@ -16368,7 +16388,13 @@ sub get_Report_ChangedConstants($$) { # Safe Changes $Title = "Other Changes in Constants"; } - $CHANGED_CONSTANTS = "

$Title  $ProblemsNum 

\n".$CHANGED_CONSTANTS.$TOP_REF."
\n"; + if($OldStyle) { + $CHANGED_CONSTANTS = "

$Title ($ProblemsNum)

\n".$CHANGED_CONSTANTS; + } + else { + $CHANGED_CONSTANTS = "

$Title  $ProblemsNum 

\n".$CHANGED_CONSTANTS; + } + $CHANGED_CONSTANTS = "\n".$CHANGED_CONSTANTS.$TOP_REF."
\n"; } } return $CHANGED_CONSTANTS; @@ -16491,7 +16517,13 @@ sub get_Report_Added($) if($JoinReport) { $Anchor = ""; } - $ADDED_INTERFACES = $Anchor."

Added Symbols  $Added_Number 

\n".$ADDED_INTERFACES.$TOP_REF."
\n"; + if($OldStyle) { + $ADDED_INTERFACES = "

Added Symbols ($Added_Number)

\n".$ADDED_INTERFACES; + } + else { + $ADDED_INTERFACES = "

Added Symbols  $Added_Number 

\n".$ADDED_INTERFACES; + } + $ADDED_INTERFACES = $Anchor.$ADDED_INTERFACES.$TOP_REF."
\n"; } } return $ADDED_INTERFACES; @@ -16587,7 +16619,14 @@ sub get_Report_Removed($) if($JoinReport) { $Anchor = ""; } - $REMOVED_INTERFACES = $Anchor."

Removed Symbols  $Removed_Number 

\n".$REMOVED_INTERFACES.$TOP_REF."
\n"; + if($OldStyle) { + $REMOVED_INTERFACES = "

Removed Symbols ($Removed_Number)

\n".$REMOVED_INTERFACES; + } + else { + $REMOVED_INTERFACES = "

Removed Symbols  $Removed_Number 

\n".$REMOVED_INTERFACES; + } + + $REMOVED_INTERFACES = $Anchor.$REMOVED_INTERFACES.$TOP_REF."
\n"; } } return $REMOVED_INTERFACES; @@ -16862,7 +16901,14 @@ sub get_Report_SymbolProblems($$) $ShowSymbol = cut_Namespace($ShowSymbol, $NameSpace); } - $INTERFACE_PROBLEMS .= $ContentSpanStart."[+] ".$ShowSymbol."  $ProblemNum ".$ContentSpanEnd."
\n"; + $INTERFACE_PROBLEMS .= $ContentSpanStart."[+] ".$ShowSymbol; + if($OldStyle) { + $INTERFACE_PROBLEMS .= " ($ProblemNum)"; + } + else { + $INTERFACE_PROBLEMS .= "  $ProblemNum "; + } + $INTERFACE_PROBLEMS .= $ContentSpanEnd."
\n"; $INTERFACE_PROBLEMS .= $ContentDivStart."\n"; if(my $NSign = $NewSignature{$Symbol}) @@ -16894,7 +16940,13 @@ sub get_Report_SymbolProblems($$) { # Safe Changes $Title = "Other Changes in Symbols"; } - $INTERFACE_PROBLEMS = "\n

$Title  $ProblemsNum 

\n".$INTERFACE_PROBLEMS.$TOP_REF."
\n"; + if($OldStyle) { + $INTERFACE_PROBLEMS = "

$Title ($ProblemsNum)

\n".$INTERFACE_PROBLEMS; + } + else { + $INTERFACE_PROBLEMS = "

$Title  $ProblemsNum 

\n".$INTERFACE_PROBLEMS; + } + $INTERFACE_PROBLEMS = "\n".$INTERFACE_PROBLEMS.$TOP_REF."
\n"; } } return $INTERFACE_PROBLEMS; @@ -17038,7 +17090,14 @@ sub get_Report_TypeProblems($$) $ShowVTables = cut_Namespace($ShowVTables, $NameSpace); } - $TYPE_PROBLEMS .= $ContentSpanStart."[+] ".$ShowType."  $ProblemNum ".$ContentSpanEnd; + $TYPE_PROBLEMS .= $ContentSpanStart."[+] ".$ShowType; + if($OldStyle) { + $TYPE_PROBLEMS .= " ($ProblemNum)"; + } + else { + $TYPE_PROBLEMS .= "  $ProblemNum "; + } + $TYPE_PROBLEMS .= $ContentSpanEnd; $TYPE_PROBLEMS .= "
\n".$ContentDivStart."\n"; $TYPE_PROBLEMS .= "\n"; $TYPE_PROBLEMS .= "".$TYPE_REPORT."
ChangeEffect
\n"; @@ -17057,7 +17116,13 @@ sub get_Report_TypeProblems($$) { # Safe Changes $Title = "Other Changes in Data Types"; } - $TYPE_PROBLEMS = "\n

$Title  $ProblemsNum 

\n".$TYPE_PROBLEMS.$TOP_REF."
\n"; + if($OldStyle) { + $TYPE_PROBLEMS = "

$Title ($ProblemsNum)

\n".$TYPE_PROBLEMS; + } + else { + $TYPE_PROBLEMS = "

$Title  $ProblemsNum 

\n".$TYPE_PROBLEMS; + } + $TYPE_PROBLEMS = "\n".$TYPE_PROBLEMS.$TOP_REF."
\n"; } } return $TYPE_PROBLEMS; @@ -22813,7 +22878,7 @@ sub scenario() detect_default_paths("bin|gcc"); # to compile libs loadModule("RegTests"); testTool($TestDump, $Debug, $Quiet, $ExtendedCheck, $LogMode, $ReportFormat, $DumpFormat, - $LIB_EXT, $GCC_PATH, $SortDump, $CheckHeadersOnly); + $LIB_EXT, $GCC_PATH, $SortDump, $CheckHeadersOnly, $OldStyle); exit(0); } if($DumpSystem) diff --git a/modules/Internals/RegTests.pm b/modules/Internals/RegTests.pm index 48132c6..587b292 100644 --- a/modules/Internals/RegTests.pm +++ b/modules/Internals/RegTests.pm @@ -24,14 +24,15 @@ use strict; my ($TestDump, $Debug, $Quiet, $ExtendedCheck, $LogMode, $ReportFormat, -$DumpFormat, $LIB_EXT, $GCC_PATH, $SortDump, -$CheckHeadersOnly); +$DumpFormat, $LIB_EXT, $GCC_PATH, $SortDump, $CheckHeadersOnly, +$OldStyle); my $OSgroup = get_OSgroup(); sub testTool($$$$$$$$$$$) { ($TestDump, $Debug, $Quiet, $ExtendedCheck, $LogMode, $ReportFormat, - $DumpFormat, $LIB_EXT, $GCC_PATH, $SortDump, $CheckHeadersOnly) = @_; + $DumpFormat, $LIB_EXT, $GCC_PATH, $SortDump, $CheckHeadersOnly, + $OldStyle) = @_; testC(); testCpp(); @@ -4885,6 +4886,9 @@ sub runTests($$$$$$$$) if($CheckHeadersOnly) { @Cmd = (@Cmd, "-headers-only"); } + if($OldStyle) { + @Cmd = (@Cmd, "-old-style"); + } if($Debug) { # debug mode @Cmd = (@Cmd, "-debug"); -- cgit v1.2.3