Item10088: Fix %$FOSWIKIAUTHORS% assuming a standard build checkout

git-svn-id: http://svn.foswiki.org/branches/Release01x01@10085 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 27, 2010 · 59f1ad3 · 59f1ad3
1 parent b6d0476
commit 59f1ad3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/BuildContrib/data/System/BuildContrib.txt b/BuildContrib/data/System/BuildContrib.txt
@@ -579,7 +579,8 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 | Change&nbsp;History: | |
-|  4 Oct 2010: | Foswikitask:Item9785: Add BuildContrib.pm module to pick up version strings |
+| 27 Nov 2010: | Foswikitask:Item10088: Fix assumption for =%<nop>$FOSWIKIAUTHORS%= that BuildContrib is called from a standard build checkout |
+|  3 Oct 2010: | Foswikitask:Item9785: Add BuildContrib.pm dummy module and document requirement. | 
 |  8 Sep 2010: | Foswikitask:Item9566: Foswikitask:Item9640: minor maintenance fixes |
 |  28 Aug 2010: | Foswikitask:Item721: get proxy settings from environment variables |
 |  06 Aug 2010: | Foswikitask:Item9439: fix the initial uplaod problem - we were reading the topic file before it had been built |

diff --git a/BuildContrib/lib/Foswiki/Contrib/Build.pm b/BuildContrib/lib/Foswiki/Contrib/Build.pm
@@ -408,10 +408,12 @@ sub new {
     $this->{INSTALL_INSTRUCTIONS} = <DATA>;
     # Item9416: Implements %$FOSWIKIAUTHORS%. Depends on $/ = undef
     $FOSWIKIAUTHORSFILE = _findRelativeTo($this->{basedir}, $FOSWIKIAUTHORSFILE);
-    open my $authorsfile, '<', $FOSWIKIAUTHORSFILE
-        or die "Couldn't open $FOSWIKIAUTHORSFILE";
-    $this->{FOSWIKIAUTHORS} = <$authorsfile>;
-    close $authorsfile;
+    if ( $FOSWIKIAUTHORSFILE ) {
+        open my $authorsfile, '<', $FOSWIKIAUTHORSFILE
+            or die "Couldn't open $FOSWIKIAUTHORSFILE";
+        $this->{FOSWIKIAUTHORS} = <$authorsfile>;
+        close $authorsfile;
+    }
 
     my $config = $this->_loadConfig();
     my $rep    = $config->{repositories}->{ $this->{project} };

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm
@@ -9,7 +9,7 @@ our $VERSION = '$Rev: 1340 $';
 # This is a free-form string you can use to "name" your own plugin version.
 # It is *not* used by the build automation tools, but is reported as part
 # of the version number in PLUGINDESCRIPTIONS.
-our $RELEASE = '4 Oct 2010';
+our $RELEASE = '27 Nov 2010';
 
 our $SHORTDESCRIPTION = 'Automates build and packaging process, including installer generation, for extension modules.';