Menu
▾
▴
[Flexml-commits] flexml ChangeLog, 1.6, 1.7 Makefile, 1.46, 1.47 Makefile.defs, 1.24, 1.25 flexml.pl, 1.69, 1.70 skel, 1.41, 1.42
|
From: Martin Q. <mqu...@us...> - 2013-01-29 14:35:26
|
Update of /cvsroot/flexml/flexml In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29464 Modified Files: ChangeLog Makefile Makefile.defs flexml.pl skel Log Message: Use package version number for 'flexml --version', not file storage version in underlying RCS Index: skel =================================================================== RCS file: /cvsroot/flexml/flexml/skel,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- skel 20 Dec 2012 00:22:55 -0000 1.41 +++ skel 29 Jan 2013 14:35:24 -0000 1.42 @@ -24,8 +24,6 @@ %{ /* Version strings. */ -const char rcs_flexml_skeleton[] = - "$Id$"; FLEXML_VERSION /* ANSI headers. */ Index: Makefile.defs =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile.defs,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- Makefile.defs 20 Dec 2012 00:22:55 -0000 1.24 +++ Makefile.defs 29 Jan 2013 14:35:24 -0000 1.25 @@ -6,7 +6,7 @@ #SUFF ?=-$(VER) SUFF ?= -VER = 1.9.4 +VER = 1.9.5 # SETUP. Index: Makefile =================================================================== RCS file: /cvsroot/flexml/flexml/Makefile,v retrieving revision 1.46 retrieving revision 1.47 diff -u -d -r1.46 -r1.47 --- Makefile 20 Dec 2012 00:22:55 -0000 1.46 +++ Makefile 29 Jan 2013 14:35:24 -0000 1.47 @@ -90,6 +90,7 @@ $(FLEXML): flexml.pl sed \ + -e "s;FLEXMLVERSION;$(VER);g" \ -e "s;[.][/]flexml-act;$(ACT);g" \ -e "s;[.][/]skel;$(SKEL);g" \ -e "s;/var/tmp;$(TMPDIR);g" \ Index: flexml.pl =================================================================== RCS file: /cvsroot/flexml/flexml/flexml.pl,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- flexml.pl 20 Dec 2012 00:13:40 -0000 1.69 +++ flexml.pl 29 Jan 2013 14:35:24 -0000 1.70 @@ -5,7 +5,7 @@ # # This file is part of the FleXML XML processor generator system. # Copyright (C) 1999 Kristoffer Rose. All rights reserved. -# Copyright (C) 2003-2011 Martin Quinson. All rights reserved. +# Copyright (C) 2003-2013 Martin Quinson. All rights reserved. # # This program is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the Free @@ -23,8 +23,7 @@ use warnings; -my $Id = '$Id$ '; -$Id =~ s/\s*\$\s*//go; +my $Id = 'FLEXMLVERSION'; # IMPORTS. @@ -181,8 +180,8 @@ print <<EOT; $pre This program was generated with the FleXML XML processor generator. $pre FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved. -$pre FleXML is Copyright (C) 2003-2011 Martin Quinson. All rights reserved. -$pre ($Id). +$pre FleXML is Copyright (C) 2003-2013 Martin Quinson. All rights reserved. +$pre (FLEXMLVERSION). $pre $pre There are two, intertwined parts to this program, part A and part B. $pre @@ -191,7 +190,7 @@ $pre $pre Some parts, here collectively called "Part A", are found in the $pre FleXML package. They are Copyright (C) 1999-2005 Kristoffer Rose -$pre and Copyright (C) 2003-2011 Martin Quinson. All rights reserved. +$pre and Copyright (C) 2003-2013 Martin Quinson. All rights reserved. $pre $pre You can redistribute, use, perform, display and/or modify "Part A" $pre provided the following two conditions hold: @@ -542,7 +541,7 @@ "quiet|q" => \$quiet_parser, # Version! - "version|V" => sub { print "FleXML version $Id.\n"; exit 0; }, + "version|V" => sub { print "FleXML version FLEXMLVERSION.\n"; exit 0; }, # dry-run ? "dry-run|n" => \$dryrun, @@ -589,7 +588,7 @@ "actions|a=s" => \$actions ); -print "FleXML version $Id.\n" if $verbose; +print "FleXML version FLEXMLVERSION.\n" if $verbose; # Set DTD file name...and extract prefix for later my $prefix = $ARGV[0]; @@ -1239,8 +1238,7 @@ if ( /^FLEXML_VERSION$/ ) { - print "const char rcs_${tagprefix}flexml[] =\n" - . " \"\$\" \"$Id \$\";\n"; + print "const char ${tagprefix}flexml_version[] = \"FLEXMLVERSION\";\n"; print "const char rcs_${cdtd}_dtd[] =\n" . " \"\$\" \"$dtdrevision \$\";\n" if $dtdrevision; Index: ChangeLog =================================================================== RCS file: /cvsroot/flexml/flexml/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ChangeLog 20 Dec 2012 00:22:55 -0000 1.6 +++ ChangeLog 29 Jan 2013 14:35:23 -0000 1.7 @@ -1,3 +1,11 @@ +2013-01-29 Martin Quinson <Mar...@lo...> + + * "flexml --version" now reports the package version, not the + file version in CVS. Users often don't care about the + internal rcs numbering schema. + * Update the Copyright notices: we are in 2013 already. + * Release v1.9.5 with these cosmetics. + 2012-12-20 Martin Quinson <Mar...@lo...> * New patch from Arnaud Giersch, this time to ensure that |
