[svn:parrot] r46742 - in trunk: . config/gen/makefiles editor
coke at svn.parrot.org
coke at svn.parrot.org
Mon May 17 15:33:24 UTC 2010
Author: coke
Date: Mon May 17 15:33:24 2010
New Revision: 46742
URL: https://trac.parrot.org/parrot/changeset/46742
Log:
generate skeleton.pir to avoid hardcoding wrong values (fix TT#1526)
Added:
trunk/editor/mk_skeleton.pir
- copied, changed from r46720, trunk/editor/skeleton.pir
Deleted:
trunk/editor/skeleton.pir
Modified:
trunk/.gitignore
trunk/MANIFEST
trunk/MANIFEST.SKIP
trunk/config/gen/makefiles/editor.in
trunk/editor/ (props changed)
Modified: trunk/.gitignore
==============================================================================
--- trunk/.gitignore Mon May 17 15:10:15 2010 (r46741)
+++ trunk/.gitignore Mon May 17 15:33:24 2010 (r46742)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id
-# generated by tools/dev/mk_manifest_and_skip.pl Tue May 4 14:32:03 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon May 17 15:32:39 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -51,6 +51,8 @@
parrot-nqp
parrot-nqp.c
parrot-nqp.pbc
+parrot-prove
+parrot-prove.*
parrot.ilk
parrot.iss
parrot.pc
@@ -72,8 +74,6 @@
perl6
pirc
tags
-tapir
-tapir.*
temp.file
test
test.c
@@ -148,6 +148,7 @@
editor/imc.vim
editor/imcc.xml
editor/pir.vim
+editor/skeleton.pir
# generated from svn:ignore of 'examples/languages/abc/'
examples/languages/abc/*.c
examples/languages/abc/*.exe
@@ -311,6 +312,8 @@
runtime/parrot/library/Digest/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Getopt/'
runtime/parrot/library/Getopt/Obj.pbc
+# generated from svn:ignore of 'runtime/parrot/library/HTTP/'
+runtime/parrot/library/HTTP/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/MIME/'
runtime/parrot/library/MIME/*.pbc
# generated from svn:ignore of 'runtime/parrot/library/Math/'
Modified: trunk/MANIFEST
==============================================================================
--- trunk/MANIFEST Mon May 17 15:10:15 2010 (r46741)
+++ trunk/MANIFEST Mon May 17 15:33:24 2010 (r46742)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Mon May 17 09:44:33 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon May 17 15:32:39 2010 UT
#
# See below for documentation on the format of this file.
#
@@ -471,6 +471,7 @@
editor/filetype_parrot.vim []
editor/indent_pir.vim []
editor/kate_syntax.pl []
+editor/mk_skeleton.pir []
editor/ops2vim.pl []
editor/parrot.el []
editor/pasm.el []
@@ -478,7 +479,6 @@
editor/pir-mode.el []
editor/pir_vim.in []
editor/pmc.vim []
-editor/skeleton.pir []
editor/subversion_config []
examples/README [examples]
examples/benchmarks/addit.pasm [examples]
Modified: trunk/MANIFEST.SKIP
==============================================================================
--- trunk/MANIFEST.SKIP Mon May 17 15:10:15 2010 (r46741)
+++ trunk/MANIFEST.SKIP Mon May 17 15:33:24 2010 (r46742)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Sun May 16 22:18:35 2010 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Mon May 17 15:32:39 2010 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -267,6 +267,8 @@
^editor/imcc\.xml/
^editor/pir\.vim$
^editor/pir\.vim/
+^editor/skeleton\.pir$
+^editor/skeleton\.pir/
# generated from svn:ignore of 'examples/languages/abc/'
^examples/languages/abc/.*\.c$
^examples/languages/abc/.*\.c/
Modified: trunk/config/gen/makefiles/editor.in
==============================================================================
--- trunk/config/gen/makefiles/editor.in Mon May 17 15:10:15 2010 (r46741)
+++ trunk/config/gen/makefiles/editor.in Mon May 17 15:33:24 2010 (r46742)
@@ -7,6 +7,7 @@
VIM_IN_DIR = $(VIM_DIR)/indent
VIM_SYN_DIR = $(VIM_DIR)/syntax
+PARROT = ../parrot at exe@
PERL = @perl@
CP = @cp@
MKPATH = @mkpath@
@@ -14,7 +15,7 @@
default: all
-all: pir.vim imc.kate
+all: pir.vim imc.kate skeleton.pir
# This is a listing of all targets, that are meant to be called by users
help :
@@ -36,7 +37,10 @@
$(CP) pir_vim.in pir.vim
$(PERL) ops2vim.pl ../src/ops/*.ops >> pir.vim
-vim-install: pir.vim
+skeleton.pir: mk_skeleton.pir
+ $(PARROT) mk_skeleton.pir > skeleton.pir
+
+vim-install: pir.vim skeleton.pir
$(MKPATH) "$(VIM_DIR)"
$(CP) skeleton.pir "$(VIM_DIR)"
$(MKPATH) "$(VIM_SYN_DIR)"
Copied and modified: trunk/editor/mk_skeleton.pir (from r46720, trunk/editor/skeleton.pir)
==============================================================================
--- trunk/editor/skeleton.pir Sun May 16 22:49:33 2010 (r46720, copy source)
+++ trunk/editor/mk_skeleton.pir Mon May 17 15:33:24 2010 (r46742)
@@ -1,7 +1,34 @@
-# Copyright (C) 2006-2009, Parrot Foundation.
+# Copyright (C) 2010, Parrot Foundation.
# $Id$
+# Generate a skeleton PIR file that adheres to parrot developer standards.
+# intended for people who hack on parrot itself, not users of parrot.
+
+.include 'tm.pasm'
+
.sub 'main' :main
+ .local pmc timeArray
+ .local int epoch, year
+ epoch = time
+ timeArray = decodetime epoch
+ year = timeArray[.TM_YEAR]
+
+ # split up to avoid various svn/codingstd issues.
+ print '# Copyright (C) '
+ print year
+ say ' Parrot Foundation.'
+ print '# $'
+ say 'Id: $'
+ say ''
+ say ".sub 'main' :main"
+ say ' # For Parrot developers.'
+ say '.end'
+ say ''
+ say '# Local Variables:'
+ say '# mode: pir'
+ say '# fill-column: 100'
+ say '# End:'
+ say '# vim: expandtab shiftwidth=4 ft=pir:'
.end
# Local Variables:
Deleted: trunk/editor/skeleton.pir
==============================================================================
--- trunk/editor/skeleton.pir Mon May 17 15:33:24 2010 (r46741)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
-# Copyright (C) 2006-2009, Parrot Foundation.
-# $Id$
-
-.sub 'main' :main
-.end
-
-# Local Variables:
-# mode: pir
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4 ft=pir:
More information about the parrot-commits
mailing list