diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2008-10-08 19:57:34 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2008-10-08 19:57:34 +0000 |
| commit | 9884089c0cf07bfeb7902cfba19f60d692d581bc (patch) | |
| tree | f507c2150d63d01594f1c7a1a7d75002bdadf4bc | |
| parent | 9f1d72462aecf47fcbe7c4f5efac855edc868b2b (diff) | |
Include LICENSE.txt in parcels, but don't install it.
| -rwxr-xr-x | infrastructure/makeparcels.pl.in | 36 | ||||
| -rw-r--r-- | parcels.txt | 2 |
2 files changed, 32 insertions, 6 deletions
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in index 2370f435..ff96c078 100755 --- a/infrastructure/makeparcels.pl.in +++ b/infrastructure/makeparcels.pl.in @@ -123,12 +123,24 @@ for my $parcel (@parcels) for(@{$parcel_contents{$parcel}}) { - my ($type,$name,$dest) = split /\s+/; - my $optional = ''; + my @args = split /\s+/; + + my ($type,$name,$dest) = @args; + my $optional = 0; + my $install = 1; if ($type eq 'optional') { - ($optional,$type,$name,$dest) = split /\s+/; + $optional = 1; + shift @args; + ($type,$name,$dest) = @args; + } + + if ($type eq 'noinstall') + { + $install = 0; + shift @args; + ($type,$name,$dest) = @args; } if($type eq 'bin') @@ -184,20 +196,32 @@ EOF for(@{$parcel_contents{$parcel}}) { my ($type,$name,$dest) = split /\s+/; - my $optional = ''; + + my $optional = 0; + my $install = 1; if ($type eq 'optional') { - ($optional,$type,$name,$dest) = split /\s+/; + $optional = 1; + shift @args; + ($type,$name,$dest) = @args; } + if ($type eq 'noinstall') + { + $install = 0; + shift @args; + ($type,$name,$dest) = @args; + } + + if ($type eq 'script') { # remove path from script name $name =~ s{.*/}{}; } - unless ($target_windows) + if ($install and not $target_windows) { my $local_install_dir = $install_into_dir; if (defined $dest) diff --git a/parcels.txt b/parcels.txt index 97b1fa43..5b8a95f8 100644 --- a/parcels.txt +++ b/parcels.txt @@ -8,6 +8,7 @@ backup-client bin bbackupquery bin bbackupctl script bin/bbackupd/bbackupd-config + noinstall script LICENSE.txt ONLY:mingw32,mingw32msvc script bin/bbackupd/win32/installer.iss @@ -31,6 +32,7 @@ backup-server script bin/bbstored/bbstored-certs script bin/bbstored/bbstored-config script lib/raidfile/raidfile-config + noinstall script LICENSE.txt ONLY:SunOS script contrib/solaris/bbstored-manifest.xml lib/svc/manifest |