[svn:parrot] r43108 - in trunk: . examples/languages/squaak examples/languages/squaak/config examples/languages/squaak/t
fperrad at svn.parrot.org
fperrad at svn.parrot.org
Wed Dec 16 15:37:21 UTC 2009
Author: fperrad
Date: Wed Dec 16 15:37:20 2009
New Revision: 43108
URL: https://trac.parrot.org/parrot/changeset/43108
Log:
[squaak] update infrastructure with setup.pir (distutils)
Added:
trunk/examples/languages/squaak/setup.pir (contents, props changed)
Deleted:
trunk/examples/languages/squaak/Configure.pl
trunk/examples/languages/squaak/config/
trunk/examples/languages/squaak/t/harness
Modified:
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/examples/languages/squaak/ (props changed)
trunk/examples/languages/squaak/squaak.pir
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Wed Dec 16 15:12:00 2009 (r43107)
+++ trunk/MANIFEST Wed Dec 16 15:37:20 2009 (r43108)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:01:30 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:31:13 2009 UT
#
# See below for documentation on the format of this file.
#
@@ -681,10 +681,8 @@
examples/languages/abc/t/abc_functions [examples]
examples/languages/abc/t/abc_special_variables [examples]
examples/languages/abc/t/abc_statement [examples]
-examples/languages/squaak/Configure.pl [examples]
examples/languages/squaak/MAINTAINER [examples]
examples/languages/squaak/README []doc
-examples/languages/squaak/config/makefiles/root.in [examples]
examples/languages/squaak/doc/tutorial_episode_1.pod [examples]
examples/languages/squaak/doc/tutorial_episode_2.pod [examples]
examples/languages/squaak/doc/tutorial_episode_3.pod [examples]
@@ -696,13 +694,13 @@
examples/languages/squaak/doc/tutorial_episode_9.pod [examples]
examples/languages/squaak/examples/factorial.sq [examples]
examples/languages/squaak/examples/life.sq [examples]
+examples/languages/squaak/setup.pir [examples]
examples/languages/squaak/squaak.pir [examples]
examples/languages/squaak/src/builtins/say.pir [examples]
examples/languages/squaak/src/parser/actions.pm [examples]
examples/languages/squaak/src/parser/grammar.pg [examples]
examples/languages/squaak/t/00-sanity.t [examples]
examples/languages/squaak/t/01-math.t [examples]
-examples/languages/squaak/t/harness [examples]
examples/library/acorn.life [examples]
examples/library/getopt_demo.pir [examples]
examples/library/md5sum.pir [examples]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Wed Dec 16 15:12:00 2009 (r43107)
+++ trunk/MANIFEST.SKIP Wed Dec 16 15:37:20 2009 (r43108)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:01:30 2009 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Wed Dec 16 15:31:13 2009 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -348,12 +348,10 @@
^examples/languages/squaak/.*\.obj/
^examples/languages/squaak/.*\.pbc$
^examples/languages/squaak/.*\.pbc/
-^examples/languages/squaak/Makefile$
-^examples/languages/squaak/Makefile/
+^examples/languages/squaak/MANIFEST$
+^examples/languages/squaak/MANIFEST/
^examples/languages/squaak/installable_squaak$
^examples/languages/squaak/installable_squaak/
-^examples/languages/squaak/man$
-^examples/languages/squaak/man/
^examples/languages/squaak/squaak$
^examples/languages/squaak/squaak/
# generated from svn:ignore of 'examples/languages/squaak/src/'
Deleted: trunk/examples/languages/squaak/Configure.pl
==============================================================================
--- trunk/examples/languages/squaak/Configure.pl Wed Dec 16 15:37:20 2009 (r43107)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,31 +0,0 @@
-# Copyright (C) 2009, Parrot Foundation.
-# $Id$
-
-use strict;
-use warnings;
-use 5.008;
-
-create_makefiles();
-
-sub create_makefiles {
- my %makefiles = (
- 'config/makefiles/root.in' => 'Makefile',
-# 'config/makefiles/pmc.in' => 'src/pmc/Makefile',
-# 'config/makefiles/ops.in' => 'src/ops/Makefile',
- );
- my $build_tool = '../../../tools/dev/gen_makefile.pl';
-
- foreach my $template (keys %makefiles) {
- my $makefile = $makefiles{$template};
- print "Creating $makefile\n";
- system('perl', $build_tool, $template, $makefile);
- }
-}
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
-
Added: trunk/examples/languages/squaak/setup.pir
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/examples/languages/squaak/setup.pir Wed Dec 16 15:37:20 2009 (r43108)
@@ -0,0 +1,80 @@
+#! /usr/local/bin/parrot
+# Copyright (C) 2009, Parrot Foundation.
+# $Id$
+
+=head1 NAME
+
+setup.pir - Python distutils style
+
+=head1 DESCRIPTION
+
+No Configure step, no Makefile generated.
+
+See F<runtime/library/distutils.pir>.
+
+=head1 USAGE
+
+ $ parrot setup.pir
+ $ parrot setup.pir test
+ $ sudo parrot setup.pir install
+
+=cut
+
+.sub 'main' :main
+ .param pmc args
+ $S0 = shift args
+ load_bytecode 'distutils.pbc'
+
+ $P0 = new 'Hash'
+ $P0['name'] = 'Squaak'
+ $P0['abstract'] = 'Squaak is a case-study language'
+ $P0['description'] = 'Squaak is a case-study language'
+ $P0['license_type'] = 'Artistic License 2.0'
+ $P0['license_uri'] = 'http://www.perlfoundation.org/artistic_license_2_0'
+ $P0['copyright_holder'] = 'Parrot Foundation'
+ $P0['checkout_uri'] = 'https://svn.parrot.org/parrot/trunk/examples/languages/squaak'
+ $P0['browser_uri'] = 'http://trac.parrot.org/parrot/browser/trunk/examples/languages/squaak'
+ $P0['project_uri'] = 'http://trac.parrot.org/parrot/browser/trunk/examples/languages/squaak'
+
+ # build
+ $P1 = new 'Hash'
+ $P1['src/gen_grammar.pir'] = 'src/parser/grammar.pg'
+ $P0['pir_pge'] = $P1
+
+ $P2 = new 'Hash'
+ $P2['src/gen_actions.pir'] = 'src/parser/actions.pm'
+ $P0['pir_nqp'] = $P2
+
+ $P3 = new 'Hash'
+ $P4 = split "\n", <<'SOURCES'
+squaak.pir
+src/gen_actions.pir
+src/gen_grammar.pir
+src/builtins/say.pir
+SOURCES
+ $S0 = pop $P4
+ $P3['squaak.pbc'] = $P4
+ $P0['pbc_pir'] = $P3
+
+ $P5 = new 'Hash'
+ $P5['parrot-squaak'] = 'squaak.pbc'
+ $P0['exe_pbc'] = $P5
+ $P0['installable_pbc'] = $P5
+
+ # test
+ $S0 = get_parrot()
+ $S0 .= ' squaak.pbc'
+ $P0['prove_exec'] = $S0
+
+ # dist
+ $P6 = glob('doc/*.pod examples/*.sq')
+ $P0['manifest_includes'] = $P6
+
+ .tailcall setup(args :flat, $P0 :flat :named)
+.end
+
+# Local Variables:
+# mode: pir
+# fill-column: 100
+# End:
+# vim: expandtab shiftwidth=4 ft=pir:
Modified: trunk/examples/languages/squaak/squaak.pir
==============================================================================
--- trunk/examples/languages/squaak/squaak.pir Wed Dec 16 15:12:00 2009 (r43107)
+++ trunk/examples/languages/squaak/squaak.pir Wed Dec 16 15:37:20 2009 (r43108)
@@ -57,7 +57,7 @@
.end
-.include 'src/gen_builtins.pir'
+.include 'src/builtins/say.pir'
.include 'src/gen_grammar.pir'
.include 'src/gen_actions.pir'
Deleted: trunk/examples/languages/squaak/t/harness
==============================================================================
--- trunk/examples/languages/squaak/t/harness Wed Dec 16 15:37:20 2009 (r43107)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
-#! perl
-
-# $Id$
-
-use FindBin;
-use lib qw( . lib ../lib ../../../lib );
-use Parrot::Test::Harness language => 'Squaak',
- exec => ['../../../parrot', 'squaak.pbc'];
More information about the parrot-commits
mailing list