From 8d4ef746244b8c745bf07b191049aa2ac21c3d6d Mon Sep 17 00:00:00 2001 From: GeorgeClark Date: Fri, 22 Nov 2013 05:20:02 +0000 Subject: [PATCH] Item12661: Manifest path must be relative to base git-svn-id: http://svn.foswiki.org/trunk@17107 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- BuildContrib/data/System/BuildContrib.txt | 6 +++--- BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/BuildContrib/data/System/BuildContrib.txt b/BuildContrib/data/System/BuildContrib.txt index b9c621d24d..2bf43a22aa 100644 --- a/BuildContrib/data/System/BuildContrib.txt +++ b/BuildContrib/data/System/BuildContrib.txt @@ -383,9 +383,9 @@ Primary MANFIEST ... pub/System/TinyMCEPlugin/screenshot.png 0644 -!include MANIFEST349 -!include MANIFEST357 -!include MANIFEST408 +!include lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST-3.4.9 +!include lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST-3.5.7 +!include lib/Foswiki/Plugins/TinyMCEPlugin/MANIFEST-4.0.8 pub/System/TinyMCEPlugin/tinymce.gif 0644 ... diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm index 5179183726..f7da91001c 100755 --- a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm +++ b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm @@ -89,10 +89,12 @@ sub readManifest { next if $line =~ /^\s*(?:#|$)/; if ( $line =~ /^!include\s+(\S+)\s*$/ ) { my $incFile = $1; - if ( -f $incFile ) { + + #print STDERR "Processing nested manifest $incFile\n"; + if ( -f $baseDir . '/' . $incFile ) { my ( $nfiles, $notherModules, $noptions ) = Foswiki::Contrib::BuildContrib::BaseBuild::readManifest( - $baseDir, '', $incFile, sub { exit(1) } ); + $baseDir, "$baseDir/", $incFile, sub { exit(1) } ); push @files, @$nfiles; push @otherModules, @$notherModules; %options = ( %options, %$noptions ); @@ -169,6 +171,7 @@ sub readManifest { } } close $pf; + return ( \@files, \@otherModules, \%options ); }