Item12748: support symbolic links and empty directories

git-svn-id: http://svn.foswiki.org/trunk@17282 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Feb 13, 2014 · b369ab4 · b369ab4
1 parent ff34e2d
commit b369ab4
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/BuildContrib/data/System/BuildContrib.txt b/BuildContrib/data/System/BuildContrib.txt
@@ -618,6 +618,7 @@ Another great Foswiki extension from the <a style="text-decoration:none" href="h
 |  Release: | %$RELEASE% |
 |  Version: | %$VERSION% |
 | Change&nbsp;History: | |
+|  1.8.0 (13 Feb 2014) | Foswikitask:Item12748: Support symbolic links and empty directories |
 |  1.7.1 (8 May 2013) | Foswikitask:Item12492: expose test output while running tests Foswikitask:Item11851: minor bugfixes |
 |  1.7.0 (11 May 2012) | Foswikitask:Item11716: correct paths in generated MANIFEST; Foswikitask:Item11851: internal maintenance |
 |  1.6.3 (18 Aug 2011) | Foswikitask:Item11014: Improve error message if installer not run from Foswiki root. |

diff --git a/BuildContrib/lib/Foswiki/Contrib/Build.pm b/BuildContrib/lib/Foswiki/Contrib/Build.pm
@@ -882,7 +882,12 @@ sub cp {
         print 'cp ' . $from . ' ' . $to . "\n";
     }
     unless ( $this->{-n} ) {
-        if ( -d $from ) {
+        if ( -l $from ) {
+            my $link = readlink($from);
+            symlink( $link, $to )
+              || warn "Warning: Failed to create link from $to to $link: $!";
+        }
+        elsif ( -d $from ) {
             unless ( -e $to ) {
                 mkdir($to) || warn 'Warning: Failed to make ' . $to . ': ' . $!;
             }

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib.pm
@@ -1,8 +1,8 @@
 package Foswiki::Contrib::BuildContrib;
 use strict;
 
-use version 0.77; our $VERSION = version->declare("v1.7.1");
-our $RELEASE = '8 May 2013';
+use version 0.77; our $VERSION = version->declare("v1.8.0");
+our $RELEASE = '13 Feb 2014';
 
 our $SHORTDESCRIPTION =
 'Automates build and packaging process, including installer generation, for extension modules.';

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/BaseBuild.pm
@@ -164,8 +164,12 @@ sub readManifest {
                 close $fh;
                 $n->{md5} = $md5->hexdigest;
             }
-            else {
-                warn "File $name does not exist on disk!";
+            elsif ( -l "$baseDir/$name" ) {
+                warn
+"WARNING: File $name is a symbolic link - may not work on all target platforms";
+            }
+            elsif ( !-d "$baseDir/$name" ) {
+                warn "WARNING: File $name does not exist on disk!";
             }
             push( @files, $n );
         }

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/archive.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/archive.pm
@@ -46,10 +46,10 @@ sub target_archive {
 # and argument for group and user must be passed in as separate parameters.
         print STDERR
           "tar --owner / --group  not supported.  Recommend building as root\n";
-        $this->sys_action( 'tar', '-czhpf', $project . '.tgz', '*' );
+        $this->sys_action( 'tar', '-czpf', $project . '.tgz', '*' );
     }
     else {
-        $this->sys_action( 'tar', '--owner', '0', '--group', '0', '-czhpf',
+        $this->sys_action( 'tar', '--owner', '0', '--group', '0', '-czpf',
             $project . '.tgz', '*' );
     }
 

diff --git a/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/stage.pm b/BuildContrib/lib/Foswiki/Contrib/BuildContrib/Targets/stage.pm
@@ -57,6 +57,7 @@ sub target_stage {
             $this->{basedir} . '/' . $project . '.txt'
         );
     }
+
     $this->apply_perms( $this->{files}, $this->{tmpDir} );
 
     if ( $this->{other_modules} ) {