From 38a23f799877e6d8ff49b35de4f7bf4bffcac285 Mon Sep 17 00:00:00 2001 From: Steve Hancock Date: Fri, 16 Nov 2018 09:35:15 -0800 Subject: [PATCH] fixed minor build glitch --- .gitignore | 1 + README.md | 56 ++++-------------------------------- dev-bin/build.pl | 9 +++--- local-docs/Makefile | 5 ---- local-docs/README.pod | 66 ------------------------------------------- 5 files changed, 10 insertions(+), 127 deletions(-) delete mode 100644 local-docs/README.pod diff --git a/.gitignore b/.gitignore index 18c70113..7b07514a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.ba1 *.bak *.log +*.sh *.sw? *.tar.gz *.tdy diff --git a/README.md b/README.md index 3028be44..c5cf56d8 100644 --- a/README.md +++ b/README.md @@ -1,57 +1,11 @@ -# Welcome to Perltidy! +# Welcome to Perltidy -Perltidy is a tool to indent and reformat perl scripts. It can also -write scripts in html format. +Perltidy is a tool to indent and reformat scripts written in Perl5. Perltidy is free software released under the GNU General Public License -- please see the included file "COPYING" for details. -# PREREQUISITES +Documentation can be found at the web site [at GitHub](https://perltidy.github.io/perltidy/) +or [at Sourceforge](perltidy.sourceforge.net) -`perltidy` should work with most standard Perl installations. -The following modules are not required, but perltidy may use them if -detected: - - HTML::Entities will be used to encode HTML entities if detected - Pod::Html will be used to format pod text - -The total disk space needed after removing the installation directory will -about 2 Mb. - -# DOWNLOAD - -There are two source distribution files: - -- A `.tgz` "tarball", with Unix-style <lf> line endings, and -- A zip file, `.zip`, with Windows-style <cr><lf> line endings. - -In addition, the web site has links to debian and RPM packages. - -# INSTALLATION - -For most standard installations, the standard Makefile.PL method should work: - - perl Makefile.PL - make - make test - make install - -The INSTALL file has additional installation notes, and tells how -to use perltidy without doing an installation. - -# WHAT NEXT - -Please see the CHANGES file for notices of any recent updates. - -Please see the BUGS file for a list of all known open bugs. - -Documentation can be found in the `docs` directory, and it can also be -found at http://perltidy.sourceforge.net - -Reading the brief tutorial should help you use perltidy effectively. - -# FEEDBACK / BUG REPORTS - -A list of current bugs and issues can be found at the CPAN site [https://rt.cpan.org/Public/Dist/Display.html?Name=Perl-Tidy](https://rt.cpan.org/Public/Dist/Display.html?Name=Perl-Tidy) - -To report a new bug or problem, use the link on this page . +A copy of the web site in contained in the docs folder of the distribution. diff --git a/dev-bin/build.pl b/dev-bin/build.pl index 440c8cbd..88fc2b7a 100755 --- a/dev-bin/build.pl +++ b/dev-bin/build.pl @@ -199,7 +199,6 @@ sub make_docs { foreach my $file ( qw( local-docs/ChangeLog.pod - local-docs/README.pod local-docs/INSTALL.pod lib/Perl/Tidy.pod bin/perltidy @@ -284,15 +283,15 @@ sub make_zip { my ($tar_gz_file) = @_; my $dir_name = $tar_gz_file; - $dir_name =~ s/\.tar*$//; + $dir_name =~ s/\.tar\.gz//; my $command; # clean out any old build in /tmp my $result = sys_command("rm -rf /tmp/$dir_name"); - # move the file - $result = sys_command("mv $tar_gz_file /tmp"); + # copy the file + $result = sys_command("cp $tar_gz_file /tmp"); # untar it $command = "(cd /tmp; tar xvfz $tar_gz_file;)"; @@ -518,7 +517,7 @@ unchanged: (@unchanged); EOM if ( grep { $_ =~ /Tidy\.pm/ } @changed ) { - my $runme = "RUNME.sh"; + my $runme = "RUNME_after_release.sh"; make_tag_script( $new_VERSION, $runme ); print <../README.md - INSTALL: INSTALL.pod pod2markdown INSTALL.pod >../INSTALL.md diff --git a/local-docs/README.pod b/local-docs/README.pod deleted file mode 100644 index ac006f7d..00000000 --- a/local-docs/README.pod +++ /dev/null @@ -1,66 +0,0 @@ -=head1 Welcome to Perltidy! - -Perltidy is a tool to indent and reformat perl scripts. It can also -write scripts in html format. - -Perltidy is free software released under the GNU General Public -License -- please see the included file "COPYING" for details. - -=head1 PREREQUISITES - -C should work with most standard Perl installations. -The following modules are not required, but perltidy may use them if -detected: - - HTML::Entities will be used to encode HTML entities if detected - Pod::Html will be used to format pod text - -The total disk space needed after removing the installation directory will -about 2 Mb. - -=head1 DOWNLOAD - -There are two source distribution files: - -=over 4 - -=item * - -A F<.tgz> "tarball", with Unix-style line endings, and - -=item * - -A zip file, F<.zip>, with Windows-style line endings. - -=back - -In addition, the web site has links to debian and RPM packages. - -=head1 INSTALLATION - -For most standard installations, the standard Makefile.PL method should work: - - perl Makefile.PL - make - make test - make install - -The INSTALL file has additional installation notes, and tells how -to use perltidy without doing an installation. - -=head1 WHAT NEXT - -Please see the CHANGES file for notices of any recent updates. - -Please see the BUGS file for a list of all known open bugs. - -Documentation can be found in the F directory, and it can also be -found at http://perltidy.sourceforge.net - -Reading the brief tutorial should help you use perltidy effectively. - -=head1 FEEDBACK / BUG REPORTS - -A list of current bugs and issues can be found at the CPAN site L - -To report a new bug or problem, use the link on this page . -- 2.39.5