[svn:parrot] r43404 - in trunk: . config/gen/makefiles tools/dev

[fperrad at svn.parrot.org]

Author: fperrad
Date: Thu Jan  7 08:33:12 2010
New Revision: 43404
URL: https://trac.parrot.org/parrot/changeset/43404

Log:
[install] add a target install-doc which currently handles only examples files

Added:
   trunk/tools/dev/install_doc_files.pl
      - copied, changed from r43393, trunk/tools/dev/install_dev_files.pl
Modified:
   trunk/MANIFEST
   trunk/config/gen/makefiles/root.in

Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST	Thu Jan  7 02:46:04 2010	(r43403)
+++ trunk/MANIFEST	Thu Jan  7 08:33:12 2010	(r43404)
@@ -1,7 +1,7 @@
 # ex: set ro:
 # $Id$
 #
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:31:13 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Jan  6 18:11:31 2010 UT
 #
 # See below for documentation on the format of this file.
 #
@@ -2157,6 +2157,7 @@
 tools/dev/gen_makefile.pl                                   [devel]
 tools/dev/gen_valgrind_suppressions.pl                      []
 tools/dev/install_dev_files.pl                              []
+tools/dev/install_doc_files.pl                              []
 tools/dev/install_files.pl                                  []
 tools/dev/lib_deps.pl                                       []
 tools/dev/list_unjitted.pl                                  []

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Thu Jan  7 02:46:04 2010	(r43403)
+++ trunk/config/gen/makefiles/root.in	Thu Jan  7 08:33:12 2010	(r43404)
@@ -2654,6 +2654,14 @@
     --versiondir=$(VERSION_DIR) \
     MANIFEST MANIFEST.generated
 
+install-doc:
+	$(PERL) tools/dev/install_doc_files.pl \
+    --buildprefix=$(BUILDPREFIX) \
+    --prefix=$(PREFIX) \
+    --docdir=$(DOC_DIR) \
+    --versiondir=$(VERSION_DIR) \
+    MANIFEST MANIFEST.generated
+
 ###############################################################################
 #
 # release targets

Copied and modified: trunk/tools/dev/install_doc_files.pl (from r43393, trunk/tools/dev/install_dev_files.pl)
==============================================================================
--- trunk/tools/dev/install_dev_files.pl	Wed Jan  6 02:59:16 2010	(r43393, copy source)
+++ trunk/tools/dev/install_doc_files.pl	Thu Jan  7 08:33:12 2010	(r43404)
@@ -6,15 +6,15 @@
 
 =head1 TITLE
 
-tools/dev/install_dev_files.pl - Copy development files to their correct locations
+tools/dev/install_doc_files.pl - Copy documentation files to their correct locations
 
 =head1 SYNOPSIS
 
-    % perl tools/dev/install_dev_files.pl [options]
+    % perl tools/dev/install_doc_files.pl [options]
 
 =head1 DESCRIPTION
 
-Use a detailed MANIFEST to install a set of development files.
+Use a detailed MANIFEST to install a set of documentation files.
 
 =head2 Options
 
@@ -80,7 +80,7 @@
     srcdir      => '/usr/src/',      # parrot/ subdir added below
     versiondir  => '',
     'dry-run'   => 0,
-    packages    => 'devel|pct|tge|nqp|data_json',
+    packages    => 'examples',
 );
 
 my @manifests;
@@ -96,71 +96,12 @@
 my $parrotdir = $options{versiondir};
 
 # Set up transforms on filenames
-my(@transformorder) = (qw(lib share include src doc), '^(tools|VERSION)', '^compilers');
+my(@transformorder) = (qw(examples));
 my(%metatransforms) = (
-    lib => {
-        ismeta => 1,
-        optiondir => 'lib',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{DestDirs} = [$parrotdir, "tools"];
-            return($filehash);
-        },
-    },
-    share => {
-        ismeta => 1,
-        optiondir => 'data',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{Dest} = basename($filehash->{Dest});
-            $filehash->{DestDirs} = [$parrotdir];
-            return($filehash);
-        },
-    },
-    include => {
-        ismeta => 1,
-        optiondir => 'include',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-            $filehash->{Dest} =~ s/^include//;
-            $filehash->{DestDirs} = [$parrotdir];
-            return($filehash);
-        },
-    },
-    src => {
-        ismeta => 1,
-        optiondir => 'src',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{Dest} =~ s/^src//; # strip off leading src/ dir
-            $filehash->{DestDirs} = [$parrotdir];
-            return($filehash);
-        },
-    },
-    doc => {
-        ismeta => 1,
+    examples => {
         optiondir => 'doc',
         transform => sub {
             my($filehash) = @_;
-            $filehash->{Dest} =~ s/^docs/pod/; # other docs are actually raw Pod
-            $filehash->{DestDirs} = [$parrotdir];
-            return($filehash);
-        },
-    },
-    '^(tools|VERSION)' => {
-        optiondir => 'lib',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{DestDirs} = [$parrotdir];
-            return($filehash);
-        },
-    },
-    '^compilers' => {
-        optiondir => 'lib',
-        transform => sub {
-            my($filehash) = @_;
-            $filehash->{Dest} =~ s/^compilers/languages/;
             $filehash->{DestDirs} = [$parrotdir];
             return($filehash);
         },
@@ -176,7 +117,7 @@
 }
 install_files($options{destdir}, $options{'dry-run'}, $filehashes);
 
-print "Finished install_dev_files.pl\n";
+print "Finished install_doc_files.pl\n";
 
 # Local Variables:
 #   mode: cperl