Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'Release02x01'
  • Loading branch information
gac410 committed Nov 28, 2016
2 parents 89a9eb4 + 7a04f1a commit 09ea16b
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 9 deletions.
4 changes: 3 additions & 1 deletion JsonRpcContrib/data/System/JsonRpcContrib.txt
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1459777187" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1480189276" format="1.1" version="1"}%
---+!! %TOPIC%
%FORMFIELD{"Description"}%

Expand Down Expand Up @@ -216,6 +216,8 @@ If a namespace, method, or parameters are specified as part of a JSON-RPC reques
%$DEPENDENCIES%

---++ Change History
| 26 Nov 2016: (2.27) | Released with Foswiki 2.1.3.<br>\
Foswikitask:Item14204: redirectto incorrectly encodes Anchors. |
| 04 Apr 2016: (2.26) | Foswikitask:Item14025: Fix issues with JSON::XS 3.02 in some environments. |
| 18 Mar 2016: (2.25) | Foswikitask:Item14011: Make sure HTTP2 is always compressing. |
| 03 Feb 2016: (2.24) | Foswikitask:Item13405: Add NFC normalization of Unicode strings. |
Expand Down
4 changes: 2 additions & 2 deletions JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib.pm
Expand Up @@ -21,8 +21,8 @@ BEGIN {
=cut

our $VERSION = '2.26';
our $RELEASE = '4 Apr 2016';
our $VERSION = '2.27';
our $RELEASE = '26 Nov 2016';
our $SHORTDESCRIPTION = 'JSON-RPC interface for Foswiki';
our $NO_PREFS_IN_TOPIC = 1;
our $SERVER;
Expand Down
29 changes: 23 additions & 6 deletions core/tools/check_extensions.pl
Expand Up @@ -22,6 +22,8 @@
chomp $start;
print "checking for changes since $start\n";

my @changed;

# Prints some "helpful" messages
sub help {
print <<"END";
Expand Down Expand Up @@ -61,12 +63,19 @@ END
close $man;
}

#my $dir = cwd();

foreach my $ext ( sort @extensions ) {
chomp $ext;
print "\n========== $ext ============\n";
chdir "$root/$ext";
my @itemlist;
my $gitlog = `git log --oneline $start..HEAD $ext`;
my $gitlog = `git log --oneline $start..HEAD .`;
next
unless
$gitlog; # Comment this to get verbose report of unmodified extensions.
print "\n========== $ext ============\n";
if ($gitlog) {
push @changed, $ext;
@itemlist = $gitlog =~ m/(Item\d+):/g;
my $topicText = get_ext_topic($ext);
my $last = '';
Expand All @@ -89,10 +98,16 @@ END
my $class = ( $ext =~ m/Plugin/ ) ? 'Plugins' : 'Contrib';
my $origsrc = `git show $start:$ext/lib/Foswiki/$class/$ext.pm`;

my $ov = extractModuleVersion( "$ext/lib/Foswiki/$class/$ext", $origsrc );
my $lv = extractModuleVersion("$ext/lib/Foswiki/$class/$ext");
my $mancheck = `../core/tools/check_manifest.pl`;
chomp $mancheck;
$mancheck =~ s/^Processing manifest .*\/MANIFEST$//g;
print "\n\n$mancheck" if ($mancheck);

my $ov = extractModuleVersion( "lib/Foswiki/$class/$ext", $origsrc );
my $lv = extractModuleVersion("lib/Foswiki/$class/$ext");
my $exthash = get_ext_info($ext);

print "\n\n";
print
"$ext - Last release: $ov, Uploaded $exthash->{version}, Module: $lv\n";

Expand All @@ -102,7 +117,9 @@ END
}
}

chdir $root;
print "\n\nChanged extensions: " . join( ', ', @changed ) . "\n";

#chdir $root;

# Search the current working directory and its parents
# for a directory called like the first parameter
Expand Down Expand Up @@ -208,7 +225,7 @@ sub extractModuleVersion {

sub get_ext_topic {
my $ext = shift;
my $file = "$ext/data/System/$ext.txt";
my $file = "data/System/$ext.txt";

open( my $mf, '<', "$file" ) or die "Unable to open $file";
local $/;
Expand Down

0 comments on commit 09ea16b

Please sign in to comment.