[svn:parrot] r36804 - in trunk: . config/init lib/Parrot tools/dev
allison at svn.parrot.org
allison at svn.parrot.org
Tue Feb 17 00:31:01 UTC 2009
Author: allison
Date: Tue Feb 17 00:31:00 2009
New Revision: 36804
URL: https://trac.parrot.org/parrot/changeset/36804
Log:
[install] Some source files are needed in the devel package for
compiling PMCs from an installed Parrot.
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/MANIFEST.generated
trunk/config/init/install.pm
trunk/lib/Parrot/Manifest.pm
trunk/tools/dev/install_dev_files.pl
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/MANIFEST Tue Feb 17 00:31:00 2009 (r36804)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 16 07:09:26 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 16 22:04:14 2009 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -2114,15 +2114,15 @@
src/dynoplibs/dan.ops []
src/dynoplibs/myops.ops []
src/dynpmc/README.pod []doc
-src/dynpmc/dynlexpad.pmc []
+src/dynpmc/dynlexpad.pmc [devel]src
src/dynpmc/ext.pir []
-src/dynpmc/foo.pmc []
-src/dynpmc/gdbmhash.pmc []
+src/dynpmc/foo.pmc [devel]src
+src/dynpmc/gdbmhash.pmc [devel]src
src/dynpmc/main.pasm []
-src/dynpmc/pair.pmc []
-src/dynpmc/rational.pmc []
-src/dynpmc/rotest.pmc []
-src/dynpmc/subproxy.pmc []
+src/dynpmc/pair.pmc [devel]src
+src/dynpmc/rational.pmc [devel]src
+src/dynpmc/rotest.pmc [devel]src
+src/dynpmc/subproxy.pmc [devel]src
src/embed.c []
src/events.c []
src/exceptions.c []
@@ -2228,7 +2228,7 @@
src/ops/math.ops []
src/ops/object.ops []
src/ops/obscure.ops []
-src/ops/ops.num [devel]share
+src/ops/ops.num [devel]src
src/ops/ops.skip []
src/ops/pic.ops []
src/ops/pmc.ops []
@@ -2248,90 +2248,90 @@
src/pic.c []
src/pic_jit.c []
src/pmc.c []
-src/pmc/addrregistry.pmc []
-src/pmc/array.pmc []
-src/pmc/bigint.pmc []
-src/pmc/bignum.pmc []
-src/pmc/boolean.pmc []
-src/pmc/bound_nci.pmc []
-src/pmc/callsignature.pmc []
-src/pmc/capture.pmc []
-src/pmc/class.pmc []
-src/pmc/closure.pmc []
-src/pmc/codestring.pmc []
-src/pmc/complex.pmc []
-src/pmc/continuation.pmc []
-src/pmc/coroutine.pmc []
-src/pmc/cpointer.pmc []
-src/pmc/default.pmc []
-src/pmc/env.pmc []
-src/pmc/eval.pmc []
-src/pmc/eventhandler.pmc []
-src/pmc/exception.pmc []
-src/pmc/exceptionhandler.pmc []
-src/pmc/exporter.pmc []
-src/pmc/file.pmc []
-src/pmc/filehandle.pmc []
-src/pmc/fixedbooleanarray.pmc []
-src/pmc/fixedfloatarray.pmc []
-src/pmc/fixedintegerarray.pmc []
-src/pmc/fixedpmcarray.pmc []
-src/pmc/fixedstringarray.pmc []
-src/pmc/float.pmc []
-src/pmc/hash.pmc []
-src/pmc/integer.pmc []
-src/pmc/iterator.pmc []
-src/pmc/key.pmc []
-src/pmc/lexinfo.pmc []
-src/pmc/lexpad.pmc []
-src/pmc/managedstruct.pmc []
-src/pmc/multisub.pmc []
-src/pmc/namespace.pmc []
-src/pmc/nci.pmc []
-src/pmc/null.pmc []
-src/pmc/object.pmc []
-src/pmc/orderedhash.pmc []
-src/pmc/os.pmc []
-src/pmc/packfile.pmc []
-src/pmc/packfileannotation.pmc []
-src/pmc/packfileannotationkeys.pmc []
-src/pmc/packfileannotations.pmc []
-src/pmc/packfileconstanttable.pmc []
-src/pmc/packfiledirectory.pmc []
-src/pmc/packfilefixupentry.pmc []
-src/pmc/packfilefixuptable.pmc []
-src/pmc/packfilerawsegment.pmc []
-src/pmc/packfilesegment.pmc []
-src/pmc/parrotinterpreter.pmc []
-src/pmc/parrotlibrary.pmc []
-src/pmc/parrotrunningthread.pmc []
-src/pmc/parrotthread.pmc []
-src/pmc/pccmethod_test.pmc []
+src/pmc/addrregistry.pmc [devel]src
+src/pmc/array.pmc [devel]src
+src/pmc/bigint.pmc [devel]src
+src/pmc/bignum.pmc [devel]src
+src/pmc/boolean.pmc [devel]src
+src/pmc/bound_nci.pmc [devel]src
+src/pmc/callsignature.pmc [devel]src
+src/pmc/capture.pmc [devel]src
+src/pmc/class.pmc [devel]src
+src/pmc/closure.pmc [devel]src
+src/pmc/codestring.pmc [devel]src
+src/pmc/complex.pmc [devel]src
+src/pmc/continuation.pmc [devel]src
+src/pmc/coroutine.pmc [devel]src
+src/pmc/cpointer.pmc [devel]src
+src/pmc/default.pmc [devel]src
+src/pmc/env.pmc [devel]src
+src/pmc/eval.pmc [devel]src
+src/pmc/eventhandler.pmc [devel]src
+src/pmc/exception.pmc [devel]src
+src/pmc/exceptionhandler.pmc [devel]src
+src/pmc/exporter.pmc [devel]src
+src/pmc/file.pmc [devel]src
+src/pmc/filehandle.pmc [devel]src
+src/pmc/fixedbooleanarray.pmc [devel]src
+src/pmc/fixedfloatarray.pmc [devel]src
+src/pmc/fixedintegerarray.pmc [devel]src
+src/pmc/fixedpmcarray.pmc [devel]src
+src/pmc/fixedstringarray.pmc [devel]src
+src/pmc/float.pmc [devel]src
+src/pmc/hash.pmc [devel]src
+src/pmc/integer.pmc [devel]src
+src/pmc/iterator.pmc [devel]src
+src/pmc/key.pmc [devel]src
+src/pmc/lexinfo.pmc [devel]src
+src/pmc/lexpad.pmc [devel]src
+src/pmc/managedstruct.pmc [devel]src
+src/pmc/multisub.pmc [devel]src
+src/pmc/namespace.pmc [devel]src
+src/pmc/nci.pmc [devel]src
+src/pmc/null.pmc [devel]src
+src/pmc/object.pmc [devel]src
+src/pmc/orderedhash.pmc [devel]src
+src/pmc/os.pmc [devel]src
+src/pmc/packfile.pmc [devel]src
+src/pmc/packfileannotation.pmc [devel]src
+src/pmc/packfileannotationkeys.pmc [devel]src
+src/pmc/packfileannotations.pmc [devel]src
+src/pmc/packfileconstanttable.pmc [devel]src
+src/pmc/packfiledirectory.pmc [devel]src
+src/pmc/packfilefixupentry.pmc [devel]src
+src/pmc/packfilefixuptable.pmc [devel]src
+src/pmc/packfilerawsegment.pmc [devel]src
+src/pmc/packfilesegment.pmc [devel]src
+src/pmc/parrotinterpreter.pmc [devel]src
+src/pmc/parrotlibrary.pmc [devel]src
+src/pmc/parrotrunningthread.pmc [devel]src
+src/pmc/parrotthread.pmc [devel]src
+src/pmc/pccmethod_test.pmc [devel]src
src/pmc/pmc.num []
-src/pmc/pmcproxy.pmc []
-src/pmc/pointer.pmc []
-src/pmc/random.pmc []
-src/pmc/ref.pmc []
-src/pmc/resizablebooleanarray.pmc []
-src/pmc/resizablefloatarray.pmc []
-src/pmc/resizableintegerarray.pmc []
-src/pmc/resizablepmcarray.pmc []
-src/pmc/resizablestringarray.pmc []
-src/pmc/retcontinuation.pmc []
-src/pmc/role.pmc []
-src/pmc/scalar.pmc []
-src/pmc/scheduler.pmc []
-src/pmc/schedulermessage.pmc []
-src/pmc/sharedref.pmc []
-src/pmc/slice.pmc []
-src/pmc/string.pmc []
-src/pmc/stringhandle.pmc []
-src/pmc/sub.pmc []
-src/pmc/task.pmc []
-src/pmc/timer.pmc []
-src/pmc/tqueue.pmc []
-src/pmc/undef.pmc []
-src/pmc/unmanagedstruct.pmc []
+src/pmc/pmcproxy.pmc [devel]src
+src/pmc/pointer.pmc [devel]src
+src/pmc/random.pmc [devel]src
+src/pmc/ref.pmc [devel]src
+src/pmc/resizablebooleanarray.pmc [devel]src
+src/pmc/resizablefloatarray.pmc [devel]src
+src/pmc/resizableintegerarray.pmc [devel]src
+src/pmc/resizablepmcarray.pmc [devel]src
+src/pmc/resizablestringarray.pmc [devel]src
+src/pmc/retcontinuation.pmc [devel]src
+src/pmc/role.pmc [devel]src
+src/pmc/scalar.pmc [devel]src
+src/pmc/scheduler.pmc [devel]src
+src/pmc/schedulermessage.pmc [devel]src
+src/pmc/sharedref.pmc [devel]src
+src/pmc/slice.pmc [devel]src
+src/pmc/string.pmc [devel]src
+src/pmc/stringhandle.pmc [devel]src
+src/pmc/sub.pmc [devel]src
+src/pmc/task.pmc [devel]src
+src/pmc/timer.pmc [devel]src
+src/pmc/tqueue.pmc [devel]src
+src/pmc/undef.pmc [devel]src
+src/pmc/unmanagedstruct.pmc [devel]src
src/pmc_freeze.c []
src/runops_cores.c []
src/runops_cores.h []
@@ -2368,7 +2368,7 @@
src/trace.h []
src/tsq.c []
src/utils.c []
-src/vtable.tbl [devel]share
+src/vtable.tbl [devel]src
src/vtables.c []
src/warnings.c []
t/README []doc
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/MANIFEST.SKIP Tue Feb 17 00:31:00 2009 (r36804)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 16 06:10:54 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon Feb 16 22:04:14 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -973,8 +973,8 @@
^lib/Parrot/Config/Generated\.pm$
^lib/Parrot/Config/Generated\.pm/
# generated from svn:ignore of 'lib/Parrot/Pmc2c/'
-^lib/Parrot/Pmc2c/PCCMETHOD_BITS\.pl$
-^lib/Parrot/Pmc2c/PCCMETHOD_BITS\.pl/
+^lib/Parrot/Pmc2c/PCCMETHOD_BITS\.pm$
+^lib/Parrot/Pmc2c/PCCMETHOD_BITS\.pm/
# generated from svn:ignore of 'runtime/parrot/dynext/'
^runtime/parrot/dynext/.*\.bundle$
^runtime/parrot/dynext/.*\.bundle/
Modified: trunk/MANIFEST.generated
==============================================================================
--- trunk/MANIFEST.generated Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/MANIFEST.generated Tue Feb 17 00:31:00 2009 (r36804)
@@ -245,7 +245,7 @@
languages/punie/punie.pbc [punie]
languages/pynie/pynie.pbc [pynie]
languages/squaak/squaak.pbc [squaak]
-src/call_list.txt [devel]share
+src/call_list.txt [devel]src
src/glut_callbacks.c []
src/jit_emit.h []
src/nci.c []
@@ -260,3 +260,7 @@
lib/Parrot/PMC.pm [devel]lib
lib/Parrot/Pmc2c/PCCMETHOD_BITS.pm [devel]lib
compilers/nqp/nqp.pbc [nqp]
+vtable.dump [devel]src
+src/pmc/default.dump [devel]src
+src/pmc/string.dump [devel]src
+src/pmc/scalar.dump [devel]src
Modified: trunk/config/init/install.pm
==============================================================================
--- trunk/config/init/install.pm Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/config/init/install.pm Tue Feb 17 00:31:00 2009 (r36804)
@@ -84,6 +84,9 @@
# --mandir=DIR man documentation [PREFIX/man]
my $mandir = assign_dir( $conf, 'mandir', $prefix, '/man' );
+ # --srcdir=DIR source code files PREFIX/src]
+ my $srcdir = assign_dir( $conf, 'srcdir', $prefix, '/src' );
+
$conf->data->set(
prefix => $prefix,
exec_prefix => $eprefix,
@@ -102,6 +105,7 @@
oldincludedir => $oldincludedir,
infodir => $infodir,
mandir => $mandir,
+ srcdir => $srcdir,
# parrot internal use only
doc_dir => $datadir . "/doc",
Modified: trunk/lib/Parrot/Manifest.pm
==============================================================================
--- trunk/lib/Parrot/Manifest.pm Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/lib/Parrot/Manifest.pm Tue Feb 17 00:31:00 2009 (r36804)
@@ -142,6 +142,8 @@
: m[^lib/Parrot/] ? '[devel]lib'
: m[^runtime/] ? '[library]'
: m[^src/pmc/.*\.h] ? '[devel]include'
+ : m[^src/pmc/.*\.pmc] ? '[devel]src'
+ : m[^src/dynpmc/.*\.pmc] ? '[devel]src'
: m[^runtime/parrot/library/PCT] ? '[pct]'
: m[^docs/pct] ? '[pct]doc'
: m[^runtime/parrot/library/PCT] ? '[pge]'
@@ -174,9 +176,8 @@
docs/pmc2c.pod [devel]doc
docs/vtables.pod [devel]doc
languages/t/harness [test]
- src/call_list.txt [devel]share
- src/ops/ops.num [devel]share
- src/vtable.tbl [devel]share
+ src/ops/ops.num [devel]src
+ src/vtable.tbl [devel]src
VERSION [devel]
tools/build/ops2c.pl [devel]
tools/build/pmc2c.pl [devel]
Modified: trunk/tools/dev/install_dev_files.pl
==============================================================================
--- trunk/tools/dev/install_dev_files.pl Mon Feb 16 23:11:25 2009 (r36803)
+++ trunk/tools/dev/install_dev_files.pl Tue Feb 17 00:31:00 2009 (r36804)
@@ -73,6 +73,7 @@
includedir => '/usr/include', # parrot/ subdir added below
docdir => '/usr/share/doc', # parrot/ subdir added below
datadir => '/usr/share/', # parrot/ subdir added below
+ srcdir => '/usr/src/', # parrot/ subdir added below
'dry-run' => 0,
);
@@ -135,6 +136,10 @@
$dest =~ s/^include\/parrot//;
$dest = File::Spec->catdir( $options{includedir}, $parrotdir, $dest );
}
+ elsif ( $meta{src} ) {
+ $dest =~ s/^src//; # strip off leading src/ dir
+ $dest = File::Spec->catdir( $options{srcdir}, $parrotdir, $dest );
+ }
elsif ( $meta{doc} ) {
$dest =~ s/^docs/pod/; # docs dir are actually raw Pod
$dest = File::Spec->catdir( $options{docdir}, $parrotdir, $dest );
More information about the parrot-commits
mailing list