[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b3-229-g7971e8a
Service Account
noreply at mpich.org
Tue Jul 14 11:19:39 CDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via 7971e8a8be4eee77d68229ca1b79d7b06965d720 (commit)
via 7b9dcd4781256088e9bda702a805d754a849e518 (commit)
from 38903fffa4c8f8ac9eada9b109aee27d018c78de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/7971e8a8be4eee77d68229ca1b79d7b06965d720
commit 7971e8a8be4eee77d68229ca1b79d7b06965d720
Author: Min Si <msi at il.is.s.u-tokyo.ac.jp>
Date: Sun Jul 12 22:05:53 2015 -0500
Replace hard coded perl path with @PERL at .
In following files, the path of perl was hard coded as "/usr/bin/perl",
which was not portable. This patch replaced it with @PERL@ variable, its
value is passed from the corresponding configure (see below).
Replaced:
src/pm/hydra/hydra-doxygen.cfg.in <--- src/pm/hydra/configure.ac
Skipped (because we never build this directory)
src/pm/hydra/tools/topo/hwloc/hwloc/doc/doxygen.cfg
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac
index 2024f9d..d994d4b 100644
--- a/src/pm/hydra/configure.ac
+++ b/src/pm/hydra/configure.ac
@@ -50,6 +50,9 @@ AC_SUBST(WRAPPER_LIBS)
PAC_ARG_STRICT
+# Look for perl. The absolute path of perl is required in hydra-doxygen.cfg.
+AC_PATH_PROG(PERL,perl)
+
# In case the documentation targets are used, find doctext and attempt to find
# the source for the doctext LaTex style files. Use "false" if doctext is not
# found
diff --git a/src/pm/hydra/hydra-doxygen.cfg.in b/src/pm/hydra/hydra-doxygen.cfg.in
index 0090089..9a27be4 100644
--- a/src/pm/hydra/hydra-doxygen.cfg.in
+++ b/src/pm/hydra/hydra-doxygen.cfg.in
@@ -1321,7 +1321,7 @@ EXTERNAL_GROUPS = YES
# The PERL_PATH should be the absolute path and name of the perl script
# interpreter (i.e. the result of `which perl').
-PERL_PATH = /usr/bin/perl
+PERL_PATH = @PERL@
#---------------------------------------------------------------------------
# Configuration options related to the dot tool
http://git.mpich.org/mpich.git/commitdiff/7b9dcd4781256088e9bda702a805d754a849e518
commit 7b9dcd4781256088e9bda702a805d754a849e518
Author: Min Si <msi at il.is.s.u-tokyo.ac.jp>
Date: Sun Jul 12 14:47:22 2015 -0500
Replace @PERL@ in maint/ with "/usr/bin/env perl".
Scripts in maint/ are generated by autogen.sh which may not be executed
by end users. Thus @PERL@ may not be parsed to the correct path of perl.
This patch fixed this issue.
Note that we also replace "-w" with "use warning;" because env may
incorrectly parse "perl -w" as the application name.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/maint/checkbuilds.in b/maint/checkbuilds.in
index 132388b..ad8ca1b 100644
--- a/maint/checkbuilds.in
+++ b/maint/checkbuilds.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
# @configure_input@
#
diff --git a/maint/clmake.in b/maint/clmake.in
index 27f6260..7d760ce 100644
--- a/maint/clmake.in
+++ b/maint/clmake.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
#
# Set Defaults
diff --git a/maint/createhtmlindex.in b/maint/createhtmlindex.in
index 067d5a4..ee8d212 100644
--- a/maint/createhtmlindex.in
+++ b/maint/createhtmlindex.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
# -*- mode: perl; -*-
#
# Create an index of web pages for MPICH
diff --git a/maint/extractfixme.in b/maint/extractfixme.in
index a72c0cb..c8419a3 100644
--- a/maint/extractfixme.in
+++ b/maint/extractfixme.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
# Tested with -w 10/28/05
#
diff --git a/maint/extractstates.in b/maint/extractstates.in
index fc51054..7ff5162 100644
--- a/maint/extractstates.in
+++ b/maint/extractstates.in
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
# This file contains the routines specific to extracting the states from
# the source files and writing them to the .states-cache files. This
@@ -38,6 +38,8 @@
# Defaults for this step. These are globals variables that are used
# by routines in the extractstrings script.
# findStateDecl is the routine that is run to scan a file for information
+use warnings;
+
$scanFile = "findStateDecl";
$cachefile = '.state-cache';
$pattern = '\.[chi](pp){0,1}$';
diff --git a/maint/extractstrings.in b/maint/extractstrings.in
index 65066ac..4e8a599 100644
--- a/maint/extractstrings.in
+++ b/maint/extractstrings.in
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
#
# This script is a replacement for several scripts that process source
@@ -59,6 +59,8 @@
# fileInCache{filename} = comparison info
#
# -------------------------------------------------------------------------
+use warnings;
+
$gDebug = 0;
# verbose of 1 gives the least amount of data, higher values give
# increasing amount of detail. (0, of course, gives no detail)
diff --git a/maint/f77tof90.in b/maint/f77tof90.in
index 7f3d732..33cbf75 100644
--- a/maint/f77tof90.in
+++ b/maint/f77tof90.in
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
#
# f77tof90 indir outdir [ Makefile-template [Make-Append] ]
@@ -10,6 +10,8 @@
# We also allow the file name to be modified to help out Windows, since
# programs in a project need to have distinct names
#
+use warnings;
+
$indir = $ARGV[0];
$outdir = $ARGV[1];
$makeTemplate = $ARGV[2];
diff --git a/maint/findunusederrtxt b/maint/findunusederrtxt
index 4e088c6..9af273b 100755
--- a/maint/findunusederrtxt
+++ b/maint/findunusederrtxt
@@ -1,4 +1,6 @@
-#! /usr/bin/perl -w
+#! /usr/bin/env perl
+use warnings;
+
#
open FD, "<unusederr.txt";
%errkeys = ();
diff --git a/maint/gcovmerge.in b/maint/gcovmerge.in
index 2642ce5..7110d7b 100644
--- a/maint/gcovmerge.in
+++ b/maint/gcovmerge.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
#
# This script merges output from two files that should be applied to the
diff --git a/maint/genstates.in b/maint/genstates.in
index 16eb9ca..6f71ba0 100644
--- a/maint/genstates.in
+++ b/maint/genstates.in
@@ -1,4 +1,4 @@
-#! @PERL@
+#! /usr/bin/env perl
use File::Find;
%states = ();
diff --git a/maint/getcoverage.in b/maint/getcoverage.in
index b78bf7c..904fcd3 100644
--- a/maint/getcoverage.in
+++ b/maint/getcoverage.in
@@ -1,4 +1,4 @@
-#! @PERL@ -w
+#! /usr/bin/env perl
# -*- Mode: perl; -*-
#
# This script extracts information from files produced by gcov showing what
@@ -37,6 +37,8 @@
# it is an executable statement, we can't just ignore breaks, and we can't
# determine which type the break is without parsing the program :(.
#
+use warnings;
+
$includeFileInOutput = 0;
$skipErrExits = 1;
$outputUncovered = 1;
-----------------------------------------------------------------------
Summary of changes:
maint/checkbuilds.in | 2 +-
maint/clmake.in | 2 +-
maint/createhtmlindex.in | 2 +-
maint/extractfixme.in | 2 +-
maint/extractstates.in | 4 +++-
maint/extractstrings.in | 4 +++-
maint/f77tof90.in | 4 +++-
maint/findunusederrtxt | 4 +++-
maint/gcovmerge.in | 2 +-
maint/genstates.in | 2 +-
maint/getcoverage.in | 4 +++-
src/pm/hydra/configure.ac | 3 +++
src/pm/hydra/hydra-doxygen.cfg.in | 2 +-
13 files changed, 25 insertions(+), 12 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list