On Wed Mar 26 19:43:33 2008, [EMAIL PROTECTED] wrote:
> I have created the 'norevision' branch in our SVN repository to house
> work on this ... but, hey, I don't have to be the only person working in
> that branch!
>
Here is a preliminary patch -- not yet intended for application against
trunk -- of what I've done so far in the 'norevision' branch. With
this, when you call ./parrot --version, all you get is the following:
$ ./parrot --version
This is parrot version 0.6.0-devel built for i386-linux.
Copyright (C) 2001-2008, The Perl Foundation.
This code is distributed under the terms of the Artistic License 2.0.
For more details, see the full text of the license in the LICENSE file
included in the Parrot source tree.
... which is what I think we were aiming for.
kid51
Index: tools/build/revision_c.pl
===================================================================
--- tools/build/revision_c.pl (revision 26573)
+++ tools/build/revision_c.pl (working copy)
@@ -1,39 +0,0 @@
-# Copyright (C) 2001-2007, The Perl Foundation.
-# $Id$
-
-=head1 NAME
-
-tools/build/revision_c.pl
-
-=head1 DESCRIPTION
-
-Creates F<src/revision.c> with current rev number taken from
-F<.svn/entries> or F<.svk/entries> and config rev number of last
-Parrot configure run.
-
-=head1 SEE ALSO
-
-F<config/gen/revision.pl>,
-F<lib/Parrot/Revision.pm>,
-F<include/parrot/config.h>
-
-=cut
-
-use warnings;
-use strict;
-use lib qw{lib . ../lib ../../ lib};
-use Parrot::Revision::Utils qw(
- get_revision_numbers
- print_src_revision_c
-);
-
-my ($current, $config) = get_revision_numbers();
-
-print_src_revision_c($current, $config, $0);
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Index: MANIFEST
===================================================================
--- MANIFEST (revision 26573)
+++ MANIFEST (working copy)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 27 02:11:05 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Thu Mar 27 02:48:48 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -3615,7 +3615,6 @@
tools/build/pbc2c.pl [devel]
tools/build/pbcversion_h.pl []
tools/build/pmc2c.pl []
-tools/build/revision_c.pl [devel]
tools/build/vtable_extend.pl []
tools/build/vtable_h.pl []
tools/dev/.gdbinit [devel]
Index: compilers/imcc/main.c
===================================================================
--- compilers/imcc/main.c (revision 26573)
+++ compilers/imcc/main.c (working copy)
@@ -225,9 +225,7 @@
=item C<static void Parrot_version>
-Print out parrot version number and copyright message. Include warning if
-configuration and build were done at different revision numbers (applies only
-when working from repository -- not from release versions).
+Print out parrot version number.
=cut
@@ -236,19 +234,8 @@
static void
Parrot_version(PARROT_INTERP)
{
- int rev;
printf("This is parrot version " PARROT_VERSION);
- rev = Parrot_revision();
- if (rev != 0)
- printf(" (r%d)", PARROT_REVISION);
printf(" built for " PARROT_ARCHNAME ".\n");
- if (rev != 0 && PARROT_REVISION != rev) {
- printf("Warning: runtime has revision %d!\n", rev);
- }
- rev = Parrot_config_revision();
- if (rev != 0 && PARROT_REVISION != rev) {
- printf("Warning: used Configure.pl revision %d!\n", rev);
- }
printf("Copyright (C) 2001-2008, The Perl Foundation.\n\
\n\
This code is distributed under the terms of the Artistic License 2.0.\
Index: config/gen/makefiles/root.in
===================================================================
--- config/gen/makefiles/root.in (revision 26573)
+++ config/gen/makefiles/root.in (working copy)
@@ -70,10 +70,6 @@
# source directory
SRC_DIR = src
-# revision control
-#CONDITIONED_LINE(SVN_ENTRIES):[EMAIL PROTECTED]@
-#INVERSE_CONDITIONED_LINE(SVN_ENTRIES):SVN_ENTRIES=
-
###############################################################################
#
# BUILD TOOL CONFIGURATIONS:
@@ -201,7 +197,6 @@
lib/Parrot/PMC.pm \
runtime/parrot/include/config.fpmc \
$(SRC_DIR)/platform.c \
- $(SRC_DIR)/revision.c \
#CONDITIONED_LINE(platform_asm): $(SRC_DIR)/platform_asm.s \
$(SRC_DIR)/core_pmcs.c \
CFLAGS \
@@ -446,7 +441,6 @@
$(SRC_DIR)/platform$(O) \
$(SRC_DIR)/pmc_freeze$(O) \
$(SRC_DIR)/pmc$(O) \
- $(SRC_DIR)/revision$(O) \
$(SRC_DIR)/runops_cores$(O) \
$(SRC_DIR)/scheduler$(O) \
$(SRC_DIR)/spf_render$(O) \
@@ -973,9 +967,6 @@
lib/Parrot/OpsFile.pm lib/Parrot/Op.pm $(OPS_DIR)/ops.num
$(OPS_DIR)/ops.skip
$(PERL) $(BUILD_TOOLS_DIR)/ops2pm.pl $(OPS_FILES)
-$(SRC_DIR)/revision.c : $(SVN_ENTRIES) $(BUILD_TOOLS_DIR)/revision_c.pl
- $(PERL) -Ilib $(BUILD_TOOLS_DIR)/revision_c.pl > $(SRC_DIR)/revision.c
-
###############################################################################
#
# Examples (Assembly):
Index: config/gen/config_h/config_h.in
===================================================================
--- config/gen/config_h/config_h.in (revision 26573)
+++ config/gen/config_h/config_h.in (working copy)
@@ -16,7 +16,6 @@
*/
#define PARROT_VERSION "@VERSION@@DEVEL@"
-#define PARROT_REVISION @revision@
#define PARROT_CONFIG_DATE "@configdate@"
#define PARROT_MAJOR_VERSION @MAJOR@
#define PARROT_MINOR_VERSION @MINOR@
