[svn:parrot] r36778 - in trunk: . lib/Parrot tools/dev
allison at svn.parrot.org
allison at svn.parrot.org
Sun Feb 15 23:38:50 UTC 2009
Author: allison
Date: Sun Feb 15 23:38:50 2009
New Revision: 36778
URL: https://trac.parrot.org/parrot/changeset/36778
Log:
[install] Some modifications to which files are installed, allowing certain
build tools to run outside the build directory.
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/MANIFEST.generated
trunk/lib/Parrot/Manifest.pm
trunk/tools/dev/install_dev_files.pl
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Sun Feb 15 22:37:57 2009 (r36777)
+++ trunk/MANIFEST Sun Feb 15 23:38:50 2009 (r36778)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Sun Feb 15 21:00:30 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sun Feb 15 23:15:33 2009 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -27,7 +27,7 @@
README_win32.pod []
RESPONSIBLE_PARTIES [main]doc
TODO []
-VERSION []
+VERSION [devel]
compilers/imcc/cfg.c [imcc]
compilers/imcc/cfg.h [imcc]
compilers/imcc/debug.c [imcc]
@@ -1865,7 +1865,7 @@
languages/urm/t/syn.t [urm]
languages/urm/urm-old.pl [urm]
languages/urm/urmc [urm]
-lib/File/Which.pm []
+lib/File/Which.pm [devel]lib
lib/IO/CaptureOutput.pm []
lib/Parrot/BuildUtil.pm [devel]lib
lib/Parrot/Config.pm [devel]lib
@@ -2926,7 +2926,7 @@
tools/build/jit2c.pl []
tools/build/nativecall.pl []
tools/build/ops2c.pl [devel]
-tools/build/ops2pm.pl [devel]
+tools/build/ops2pm.pl []
tools/build/parrot_config_c.pl []
tools/build/pbcversion_h.pl []
tools/build/pmc2c.pl []
@@ -2939,7 +2939,7 @@
tools/dev/debian_docs.sh []
tools/dev/gen_charset_tables.pl []
tools/dev/gen_class.pl []
-tools/dev/gen_makefile.pl []
+tools/dev/gen_makefile.pl [devel]
tools/dev/install_dev_files.pl []
tools/dev/install_files.pl []
tools/dev/lib_deps.pl []
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Sun Feb 15 22:37:57 2009 (r36777)
+++ trunk/MANIFEST.SKIP Sun Feb 15 23:38:50 2009 (r36778)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Sun Feb 15 21:00:30 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sun Feb 15 20:41:17 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated Sun Feb 15 22:37:57 2009 (r36777)
+++ trunk/MANIFEST.generated Sun Feb 15 23:38:50 2009 (r36778)
@@ -254,5 +254,6 @@
src/ops/core_ops_switch.c []
src/parrot_config.c []
src/string_private_cstring.h []
-tools/build/dynpmc.pl [devel]bin
+tools/build/dynpmc.pl []
tools/install/smoke.pl []
+lib/Parrot/Config/Generated.pm [devel]lib
Modified: trunk/lib/Parrot/Manifest.pm
==============================================================================
--- trunk/lib/Parrot/Manifest.pm Sun Feb 15 22:37:57 2009 (r36777)
+++ trunk/lib/Parrot/Manifest.pm Sun Feb 15 23:38:50 2009 (r36778)
@@ -140,6 +140,7 @@
: m[^lib/Parrot/] ? '[devel]lib'
: m[^t/] ? '[test]'
: m[^runtime/] ? '[library]'
+ : m[^src/pmc/.*\.h] ? '[devel]include'
: m[^runtime/parrot/library/PCT] ? '[pct]'
: m[^docs/pct] ? '[pct]doc'
: m[^runtime/parrot/library/PCT] ? '[pge]'
@@ -174,13 +175,14 @@
languages/t/harness [test]
src/call_list.txt [devel]share
src/ops/ops.num [devel]share
+ src/vtable.tbl [devel]share
+ VERSION [devel]
tools/build/ops2c.pl [devel]
- tools/build/ops2pm.pl [devel]
tools/build/pbc2c.pl [devel]
- tools/build/revision_c.pl [devel]
tools/dev/pbc_to_exe.pir [devel]
+ tools/dev/gen_makefile.pl [devel]
tools/dev/reconfigure.pl [devel]
- src/vtable.tbl [devel]share
+ lib/File/Which.pm [devel]lib
);
return \%special;
Modified: trunk/tools/dev/install_dev_files.pl
==============================================================================
--- trunk/tools/dev/install_dev_files.pl Sun Feb 15 22:37:57 2009 (r36777)
+++ trunk/tools/dev/install_dev_files.pl Sun Feb 15 23:38:50 2009 (r36778)
@@ -130,6 +130,11 @@
elsif ( $meta{share} ) {
$dest = File::Spec->catdir( $options{datadir}, $parrotdir, basename($dest) );
}
+ elsif ( $meta{include} ) {
+ $dest =~ s/^src//; # strip off leading src/ dir
+ $dest =~ s/^include\/parrot//;
+ $dest = File::Spec->catdir( $options{includedir}, $parrotdir, $dest );
+ }
elsif ( $meta{doc} ) {
$dest =~ s/^docs/pod/; # docs dir are actually raw Pod
$dest = File::Spec->catdir( $options{docdir}, $parrotdir, $dest );
@@ -139,7 +144,10 @@
$dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
}
elsif ( /^tools/ ) {
- $dest = File::Spec->catdir( $options{libdir}, $parrotdir, "tools", "dev", basename($dest) );
+ $dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
+ }
+ elsif ( /^VERSION/ ) {
+ $dest = File::Spec->catdir( $options{libdir}, $parrotdir, $dest );
}
elsif ( /^compilers/ ) {
$dest =~ s/^compilers/languages/;
More information about the parrot-commits
mailing list