[Cmake-commits] CMake branch, master, updated. v3.9.0-rc2-23-gcab94b7
Kitware Robot
kwrobot at kitware.com
Thu Jun 8 09:35:07 EDT 2017
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 "CMake".
The branch, master has been updated
via cab94b7c4f82653796e407c90c8d348e8f45a904 (commit)
via 9c0d1e7531edbebc7943d5b981353b17631ed632 (commit)
via 567bac890c060c56ff311bda24280873c8641b0a (commit)
via 380bd70cc2cea6b77e24c2424374365ac30fa046 (commit)
via e61979a71cb7a32bdaa19aca9dbb3c8dfcb2e495 (commit)
from 2a83bffdb9c845545eb8f533a19b32688cfc48b8 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cab94b7c4f82653796e407c90c8d348e8f45a904
commit cab94b7c4f82653796e407c90c8d348e8f45a904
Merge: 2a83bff 9c0d1e7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 8 13:24:10 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Jun 8 09:25:52 2017 -0400
Merge topic 'bootstrap-cleanup'
9c0d1e75 bootstrap: implement cmake_extract_standard_flags() without loop
567bac89 bootstrap: use "grep -q" instead of output redirection
380bd70c bootstrap: implement cmake_toupper() using tr
e61979a7 bootstrap: don't use 'cat x | sed', let sed open the file instead
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !937
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c0d1e7531edbebc7943d5b981353b17631ed632
commit 9c0d1e7531edbebc7943d5b981353b17631ed632
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 7 19:34:10 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 7 19:52:40 2017 +0200
bootstrap: implement cmake_extract_standard_flags() without loop
Pass all files to sed at once, and don't even change the directory for this.
diff --git a/bootstrap b/bootstrap
index c89bffc..2cf7847 100755
--- a/bootstrap
+++ b/bootstrap
@@ -9,11 +9,8 @@ die() {
# Compile flag extraction function.
cmake_extract_standard_flags()
{
- cd "${cmake_source_dir}/Modules/Compiler/"
- for file in ${1:-*}-${2}.cmake; do
- sed -n "s/ *set *( *CMAKE_${2}${3}_EXTENSION_COMPILE_OPTION *\"\{0,1\}\([^\")]*\).*/\1/p" \
- "${file}" | tr ';' ' '
- done
+ sed -n "s/ *set *( *CMAKE_${2}${3}_EXTENSION_COMPILE_OPTION *\"\{0,1\}\([^\")]*\).*/\1/p" \
+ "${file}" "${cmake_source_dir}/Modules/Compiler/"${1:-*}-${2}.cmake 2>/dev/null | tr ';' ' '
}
# Version number extraction function.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567bac890c060c56ff311bda24280873c8641b0a
commit 567bac890c060c56ff311bda24280873c8641b0a
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 7 19:22:35 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 7 19:52:40 2017 +0200
bootstrap: use "grep -q" instead of output redirection
diff --git a/bootstrap b/bootstrap
index 280655e..c89bffc 100755
--- a/bootstrap
+++ b/bootstrap
@@ -83,7 +83,7 @@ cmake_sphinx_build=""
cmake_sphinx_flags=""
# Determine whether this is a Cygwin environment.
-if echo "${cmake_system}" | grep CYGWIN >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q CYGWIN; then
cmake_system_cygwin=true
cmake_doc_dir_keyword="CYGWIN"
cmake_man_dir_keyword="CYGWIN"
@@ -92,21 +92,21 @@ else
fi
# Determine whether this is a MinGW environment.
-if echo "${cmake_system}" | grep 'MINGW\|MSYS' >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q 'MINGW\|MSYS'; then
cmake_system_mingw=true
else
cmake_system_mingw=false
fi
# Determine whether this is OS X
-if echo "${cmake_system}" | grep Darwin >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q Darwin; then
cmake_system_darwin=true
else
cmake_system_darwin=false
fi
# Determine whether this is BeOS
-if echo "${cmake_system}" | grep BeOS >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q BeOS; then
cmake_system_beos=true
cmake_doc_dir_keyword="HAIKU"
cmake_man_dir_keyword="HAIKU"
@@ -115,7 +115,7 @@ else
fi
# Determine whether this is Haiku
-if echo "${cmake_system}" | grep Haiku >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q Haiku; then
cmake_system_haiku=true
cmake_doc_dir_keyword="HAIKU"
cmake_man_dir_keyword="HAIKU"
@@ -124,21 +124,21 @@ else
fi
# Determine whether this is OpenVMS
-if echo "${cmake_system}" | grep OpenVMS >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q OpenVMS; then
cmake_system_openvms=true
else
cmake_system_openvms=false
fi
# Determine whether this is HP-UX
-if echo "${cmake_system}" | grep HP-UX >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q HP-UX; then
cmake_system_hpux=true
else
cmake_system_hpux=false
fi
# Determine whether this is Linux
-if echo "${cmake_system}" | grep Linux >/dev/null 2>&1; then
+if echo "${cmake_system}" | grep -q Linux; then
cmake_system_linux=true
else
cmake_system_linux=false
@@ -149,11 +149,11 @@ else
# may falsely detect parisc on HP-UX m68k
cmake_machine_parisc=false
if ${cmake_system_linux}; then
- if uname -m | grep parisc >/dev/null 2>&1; then
+ if uname -m | grep -q parisc; then
cmake_machine_parisc=true
fi
elif ${cmake_system_hpux}; then
- if uname -m | grep ia64 >/dev/null 2>&1; then : ; else
+ if uname -m | grep -q ia64; then : ; else
cmake_machine_parisc=true
fi
fi
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=380bd70cc2cea6b77e24c2424374365ac30fa046
commit 380bd70cc2cea6b77e24c2424374365ac30fa046
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 7 19:17:42 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 7 19:52:40 2017 +0200
bootstrap: implement cmake_toupper() using tr
diff --git a/bootstrap b/bootstrap
index 46f81c5..280655e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -41,7 +41,7 @@ cmake_install_dest_default()
cmake_toupper()
{
- echo "$1" | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'
+ echo "$1" | tr '[:lower:]' '[:upper:]'
}
# Detect system and directory information.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e61979a71cb7a32bdaa19aca9dbb3c8dfcb2e495
commit e61979a71cb7a32bdaa19aca9dbb3c8dfcb2e495
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Jun 7 19:16:42 2017 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Jun 7 19:52:40 2017 +0200
bootstrap: don't use 'cat x | sed', let sed open the file instead
diff --git a/bootstrap b/bootstrap
index 84df54a..46f81c5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -11,24 +11,23 @@ cmake_extract_standard_flags()
{
cd "${cmake_source_dir}/Modules/Compiler/"
for file in ${1:-*}-${2}.cmake; do
- cat "${file}" \
- | sed -n "s/ *set *( *CMAKE_${2}${3}_EXTENSION_COMPILE_OPTION *\"\{0,1\}\([^\")]*\).*/\1/p" \
- | tr ';' ' '
+ sed -n "s/ *set *( *CMAKE_${2}${3}_EXTENSION_COMPILE_OPTION *\"\{0,1\}\([^\")]*\).*/\1/p" \
+ "${file}" | tr ';' ' '
done
}
# Version number extraction function.
cmake_version_component()
{
- cat "${cmake_source_dir}/Source/CMakeVersion.cmake" | sed -n "
+ sed -n "
/^set(CMake_VERSION_${1}/ {s/set(CMake_VERSION_${1} *\([0-9]*\))/\1/;p;}
-"
+" "${cmake_source_dir}/Source/CMakeVersion.cmake"
}
# Install destination extraction function.
cmake_install_dest_default()
{
- cat "${cmake_source_dir}/Source/CMakeInstallDestinations.cmake" | sed -n '
+ sed -n '
/^ *set(CMAKE_'"${1}"'_DIR_DEFAULT.*) # '"${2}"'$/ {
s/^ *set(CMAKE_'"${1}"'_DIR_DEFAULT *"\([^"]*\)").*$/\1/
s/${CMake_VERSION_MAJOR}/'"${cmake_version_major}"'/
@@ -37,7 +36,7 @@ cmake_install_dest_default()
p
q
}
-'
+' "${cmake_source_dir}/Source/CMakeInstallDestinations.cmake"
}
cmake_toupper()
@@ -581,8 +580,7 @@ cmake_replace_string ()
SEARCHFOR="$3"
REPLACEWITH="$4"
if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
- cat "${INFILE}" |
- sed "s/\@${SEARCHFOR}\@/${REPLACEWITH}/g" > "${OUTFILE}${_tmp}"
+ sed "s/\@${SEARCHFOR}\@/${REPLACEWITH}/g" "${INFILE}" > "${OUTFILE}${_tmp}"
if [ -f "${OUTFILE}${_tmp}" ]; then
if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
#echo "Files are the same"
@@ -604,15 +602,14 @@ cmake_kwsys_config_replace_string ()
APPEND="$*"
if [ -f "${INFILE}" ] || ${cmake_system_openvms}; then
echo "${APPEND}" > "${OUTFILE}${_tmp}"
- cat "${INFILE}" |
- sed "/./ {s/\@KWSYS_NAMESPACE\@/cmsys/g;
- s/@KWSYS_BUILD_SHARED@/${KWSYS_BUILD_SHARED}/g;
- s/@KWSYS_LFS_AVAILABLE@/${KWSYS_LFS_AVAILABLE}/g;
- s/@KWSYS_LFS_REQUESTED@/${KWSYS_LFS_REQUESTED}/g;
- s/@KWSYS_NAME_IS_KWSYS@/${KWSYS_NAME_IS_KWSYS}/g;
- s/@KWSYS_STL_HAS_WSTRING@/${KWSYS_STL_HAS_WSTRING}/g;
- s/@KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H@/${KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H}/g;
- }" >> "${OUTFILE}${_tmp}"
+ sed "/./ {s/\@KWSYS_NAMESPACE\@/cmsys/g;
+ s/@KWSYS_BUILD_SHARED@/${KWSYS_BUILD_SHARED}/g;
+ s/@KWSYS_LFS_AVAILABLE@/${KWSYS_LFS_AVAILABLE}/g;
+ s/@KWSYS_LFS_REQUESTED@/${KWSYS_LFS_REQUESTED}/g;
+ s/@KWSYS_NAME_IS_KWSYS@/${KWSYS_NAME_IS_KWSYS}/g;
+ s/@KWSYS_STL_HAS_WSTRING@/${KWSYS_STL_HAS_WSTRING}/g;
+ s/@KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H@/${KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H}/g;
+ }" "${INFILE}" >> "${OUTFILE}${_tmp}"
if [ -f "${OUTFILE}${_tmp}" ]; then
if "${_diff}" "${OUTFILE}" "${OUTFILE}${_tmp}" > /dev/null 2> /dev/null ; then
#echo "Files are the same"
-----------------------------------------------------------------------
Summary of changes:
bootstrap | 58 ++++++++++++++++++++++++++--------------------------------
1 file changed, 26 insertions(+), 32 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list