[Groff-commit] groff/contrib/glilypond ChangeLog Makefile.sub ...

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  13/04/24 21:23:39

Modified files:
        contrib/glilypond: ChangeLog Makefile.sub README.txt args.pl 
                           glilypond.pl oop_fh.pl subs.pl 
Removed files:
        contrib/glilypond: perl_test.pl 

Log message:
        args.pl, oop_fh.pl: Remove 1st line calling `perl'.
        
        subs.pl: Remove 1st line calling `perl'.  Remove sub
        &perl_version'.  Adjust sub `&usage'.
        
        glilypond.pl: Keep 1st line, which will be reset by running
        `make'.  Remove all parts of Perl testing.
        
        perl_test.pl: Remove this file.
        
        README.txt: Add information about needed Perl version.
        
        Makefile.sub: Corrections for removing Perl test.  Use `$<'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/ChangeLog?cvsroot=groff&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/Makefile.sub?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/README.txt?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/args.pl?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/glilypond.pl?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/oop_fh.pl?cvsroot=groff&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/subs.pl?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/glilypond/perl_test.pl?cvsroot=groff&r1=1.2&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/ChangeLog,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ChangeLog   24 Apr 2013 19:09:25 -0000      1.8
+++ ChangeLog   24 Apr 2013 21:23:38 -0000      1.9
@@ -1,5 +1,21 @@
 2013-04-24  Bernd Warken  <address@hidden>
 
+       * args.pl, oop_fh.pl: Remove 1st line calling `perl'.
+
+       * subs.pl: Remove 1st line calling `perl'.  Remove sub
+       `&perl_version'.  Adjust sub `&usage'.
+
+       * glilypond.pl: Keep 1st line, which will be reset by running
+       `make'.  Remove all parts of Perl testing.
+
+       * perl_test.pl: Remove this file.
+
+       * README.txt: Add information about needed Perl version.
+
+       * Makefile.sub: Corrections for removing Perl test.  Use `$<'.
+
+2013-04-24  Bernd Warken  <address@hidden>
+
        * Makefile.sub: Remove Perl test.
 
 2013-04-12  Bernd Warken  <address@hidden>

Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/Makefile.sub,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Makefile.sub        24 Apr 2013 19:09:25 -0000      1.3
+++ Makefile.sub        24 Apr 2013 21:23:38 -0000      1.4
@@ -28,7 +28,7 @@
 
 MAN1=glilypond.n
 
-MOSTLYCLEANADD=glilypond HAVE_PERL $(MAN1)
+MOSTLYCLEANADD=glilypond $(MAN1)
 
 # not all make programs have $(RM) predefined.
 RM=rm -f
@@ -38,8 +38,7 @@
 GLILYPOND=$(srcdir)/glilypond.pl \
        $(srcdir)/subs.pl \
        $(srcdir)/oop_fh.pl \
-       $(srcdir)/args.pl \
-       $(srcdir)/perl_test.pl
+       $(srcdir)/args.pl
 
 GLILYPOND_=`echo $(GLILYPOND) | sed 's|$(srcdir)/||g'`
 
@@ -51,28 +50,28 @@
                -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
                -e "s|@glilypond_dir@|$(DESTDIR)$(glilypond_dir)|g" \
                -e "s|@VERSION@|$(version)$(revision)|g" \
-               $(srcdir)/glilypond.pl >$@; \
+               $(srcdir)/glilypond.pl >$@
        chmod +x $@
 
 install_data: glilypond
-       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir); \
-       $(RM) $(DESTDIR)$(bindir)/glilypond; \
-       $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond; \
+       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+       $(RM) $(DESTDIR)$(bindir)/$<
+       $(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/$<
        -test -d $(DESTDIR)$(glilypond_dir) \
-               || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir); \
+               || $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
        for f in $(GLILYPOND_); do \
                $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
-       done; \
+       done
        for f in $(GLILYPOND_); do \
                $(INSTALL_SCRIPT) $(srcdir)/$$f \
                $(DESTDIR)$(glilypond_dir)/$$f; \
        done
 
 uninstall_sub:
-       $(RM) $(DESTDIR)$(bindir)/glilypond; \
+       $(RM) $(DESTDIR)$(bindir)/glilypond;
        for f in $(GLILYPOND_); do \
                $(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
-       done; \
+       done
        test -d $(DESTDIR)$(libdir)/groff/glilypond \
                && rmdir $(DESTDIR)$(libdir)/groff/glilypond
 

Index: README.txt
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- README.txt  29 Mar 2013 11:41:21 -0000      1.1
+++ README.txt  24 Apr 2013 21:23:38 -0000      1.2
@@ -3,7 +3,7 @@
 
     Written by Bernd Warken <address@hidden>
 
-    Last update: 28 Mar 2013
+    Last update: 24 Apr 2013
 
     Copying and distribution of this file, with or without modification,
     are permitted in any medium without royalty provided the copyright
@@ -11,6 +11,13 @@
 
     This file is part of `glilypond', which is part of `groff'.
 
+
+########################################################################
+
+In order to run `glilypond', your system must have installed Perl of at
+least version `v5.6'.
+
+
 ########################################################################
 
 In order to have this program installed by `make', the creation of a

Index: args.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/args.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- args.pl     29 Mar 2013 11:41:21 -0000      1.1
+++ args.pl     24 Apr 2013 21:23:38 -0000      1.2
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese

Index: glilypond.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/glilypond.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- glilypond.pl        12 Apr 2013 22:30:44 -0000      1.3
+++ glilypond.pl        24 Apr 2013 21:23:39 -0000      1.4
@@ -88,8 +88,6 @@
     {
      'before_make' => FALSE,
      'groff_version' => EMPTYSTRING,
-     'perl_test_file' => EMPTYSTRING,
-     'perl_version' => EMPTYSTRING,
      'prog' => EMPTYSTRING,
     };
 
@@ -135,14 +133,6 @@
 
     unshift(@INC, $glilypond_libdir);
 
-    # test perl on suitable version
-    $file_test_pl = File::Spec->catfile($glilypond_libdir,
-                                       'perl_test.pl');
-    die "$file_test_pl does not exist;" unless -f "$file_test_pl";
-    do "$file_test_pl" or die "Perl test: $@";
-
-    $Globals->{'perl_test_file'} = $file_test_pl;
-
     umask 0077; # octal output: `printf "%03o", umask;'
   }
 

Index: oop_fh.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/oop_fh.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- oop_fh.pl   29 Mar 2013 11:41:21 -0000      1.1
+++ oop_fh.pl   24 Apr 2013 21:23:39 -0000      1.2
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese

Index: subs.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/glilypond/subs.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- subs.pl     16 Apr 2013 19:00:46 -0000      1.3
+++ subs.pl     24 Apr 2013 21:23:39 -0000      1.4
@@ -1,4 +1,3 @@
-#! /usr/bin/env perl
 my $License = q*
 ########################################################################
 # Legalese
@@ -12,7 +11,7 @@
 Copyright (C) 2013 Free Software Foundation, Inc.
   Written by Bernd Warken <address@hidden>
 
-Last update: 12 Apr 2013
+  Last update: 24 Apr 2013
 
 This file is part of `glilypond', which is part of `GNU groff'.
 
@@ -325,36 +324,6 @@
 } # end sub path2abs()
 
 
-sub perl_version {
-  our ( $Globals, $Args );
-
-  my $pv = $Globals->{'perl_version'};
-  return $pv if ( $pv );
-
-  my $fh = new FH_READ_FILE( $Globals->{'perl_test_file'} );
-  $fh->open();
-
-  while ( defined( $_ = $fh->read_line() ) ) {
-    next unless ( /
-                   ^
-                   \s*
-                   require
-                   \s+
-                   (
-                     [v0-9.]+
-                   )
-                 /x );
-    $pv = $1; # Perl version
-    $fh->close();
-    $Globals->{'perl_version'} = $pv;
-    return $pv;
-  }
-
-  $fh->close();
-  return 'unknown version for Perl';
-} # end sub perl_version()
-
-
 sub run_lilypond {
   # arg is the options collection for `lilypond' to run
   # either from ly or pdf
@@ -467,9 +436,6 @@
   # --keep_files       -k: do not delete any temporary files
   # --file_prefix=...  -p: start for the names of temporary files
 
-  my $pv = &perl_version();
-  $usage .=  "\n" . 'Perl version ' . $pv . ' needed.' if ( $pv );
-
   $main::stdout->print( $usage );
 } # end sub usage()
 

Index: perl_test.pl
===================================================================
RCS file: perl_test.pl
diff -N perl_test.pl
--- perl_test.pl        12 Apr 2013 21:45:56 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-#! /usr/bin/env perl
-
-# glilypond - transform `lilypond' parts into `groff' language
-
-# Source file position: <groff-source>/contrib/groffer/perl/perl_test.sh
-# Installed position: <prefix>/lib/groff/groffer/perl_test.sh
-
-# Copyright (C) 2013
-#   Free Software Foundation, Inc.
-# Written by Bernd Warken <address@hidden>.
-
-# Last update: 12 Apr 2013
-
-# This file is part of `glilypond', which is part of `groff'.
-
-# `groff' 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 Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# `groff' is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-########################################################################
-
-# This file tests whether perl has a suitable version.  It is used by
-# glilypond.pl and Makefile.sub.
-
-# former: require v5.9.4; # for `state' in `subs.pl'
-require v5.6; # analogously to `groffer'
-
-########################################################################
-### Emacs settings
-# Local Variables:
-# mode: CPerl
-# End: