Item9693: Revert png file for docs, fix build.pl

tools/build.pl wasn't generating the static installation documents. Change order of parmameter tests in build.pl Remove the root icon from MANIFEST. build.pl can copy it while generating the distribution.
foswiki · Jan 17, 2015 · 5123cf4 · 5123cf4
1 parent df2eb91
commit 5123cf4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -4,7 +4,6 @@ AUTHORS 0444
 COPYING 0444
 COPYRIGHT 0444
 LICENSE 0444
-viewfile.png 0444
 bin-htaccess.txt 0444
 bin/LocalLib.cfg.txt 0644
 bin/attach 0555

diff --git a/core/tools/build.pl b/core/tools/build.pl
@@ -46,21 +46,6 @@ sub new {
     my $nocheck;      #set to bypass git repo check
     my $name;
 
-    if ( my $gitdir = findPathToDir('.git') ) {
-        print "detected git installation at $gitdir\n";
-
- # Verify that all files are committed and all commits are pushed to github TODO
-        my $gitstatus = `git status -uno`;
-        unless ($nocheck) {
-            die
-"***\nuncommitted changes in tree - build aborted\n***\n$gitstatus\n"
-              if ( $gitstatus =~ m/(modified:)|(new file:)|(deleted:)/ );
-        }
-    }
-    else {
-        die "no .git dir detected, svn is ***OBSOLETE***, aborting!\n";
-    }
-
     if ( scalar(@ARGV) > 1 ) {
         $name = pop(@ARGV);
         if ( $name eq '-auto' ) {
@@ -83,6 +68,21 @@ sub new {
         }
     }
 
+    if ( my $gitdir = findPathToDir('.git') ) {
+        print "detected git installation at $gitdir\n";
+
+ # Verify that all files are committed and all commits are pushed to github TODO
+        my $gitstatus = `git status -uno`;
+        unless ($nocheck) {
+            die
+"***\nuncommitted changes in tree - build aborted\n***\n$gitstatus\n"
+              if ( $gitstatus =~ m/(modified:)|(new file:)|(deleted:)/ );
+        }
+    }
+    else {
+        die "no .git dir detected, svn is ***OBSOLETE***, aborting!\n";
+    }
+
     print <<END;
 You are about to build Foswiki.
 
@@ -396,8 +396,10 @@ sub stage_gendocs {
 
     # generate the POD documentation
     print "Building automatic documentation to $this->{tmpDir}...";
-    $this->cp( "$this->{tmpDir}/AUTHORS",
+    $this->cp( "$this->{basedir}/AUTHORS",
         "$this->{tmpDir}/pub/System/ProjectContributor/AUTHORS" );
+    $this->cp( "$this->{basedir}/pub/System/DocumentGraphics/viewtopic.png",
+        "$this->{tmpDir}/viewtopic.png" );
 
 #SMELL: these should probably abort the build if they return errors / oopies
 #replaced by the simpler INSTALL.html

diff --git a/core/viewtopic.png b/core/viewtopic.png