You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2018/06/15 23:03:24 UTC
mesos git commit: Made configured shell script inputs executable.
Repository: mesos
Updated Branches:
refs/heads/master 7b4d625f7 -> 5fd3174c6
Made configured shell script inputs executable.
While this is not required for the autotools build where manual
intervention is needed to make the output of `AC_CONFIG_FILES`
executable, cmake will copy existing permissions when executing
`configure_file`. Making the input files explicitly executable
simplifies the needed steps in the cmake build and also serves as
documentation.
Review: https://reviews.apache.org/r/67604
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5fd3174c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5fd3174c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5fd3174c
Branch: refs/heads/master
Commit: 5fd3174c6d21be284bb445c9cfcdc68f818fc3e1
Parents: 7b4d625
Author: Benjamin Bannier <bb...@apache.org>
Authored: Thu Jun 14 23:02:41 2018 +0200
Committer: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Committed: Fri Jun 15 15:38:01 2018 -0700
----------------------------------------------------------------------
bin/gdb-mesos-agent.sh.in | 0
bin/gdb-mesos-local.sh.in | 0
bin/gdb-mesos-master.sh.in | 0
bin/gdb-mesos-tests.sh.in | 0
bin/lldb-mesos-agent.sh.in | 0
bin/lldb-mesos-local.sh.in | 0
bin/lldb-mesos-master.sh.in | 0
bin/lldb-mesos-tests.sh.in | 0
bin/mesos-agent-flags.sh.in | 0
bin/mesos-agent.sh.in | 0
bin/mesos-local-flags.sh.in | 0
bin/mesos-local.sh.in | 0
bin/mesos-master-flags.sh.in | 0
bin/mesos-master.sh.in | 0
bin/mesos-tests-flags.sh.in | 0
bin/mesos-tests.sh.in | 0
bin/mesos.sh.in | 0
bin/valgrind-mesos-agent.sh.in | 0
bin/valgrind-mesos-local.sh.in | 0
bin/valgrind-mesos-master.sh.in | 0
bin/valgrind-mesos-tests.sh.in | 0
cmake/MesosConfigure.cmake | 16 +---------------
src/deploy/mesos-agent-env.sh.template | 0
src/deploy/mesos-daemon.sh.in | 0
src/deploy/mesos-deploy-env.sh.template | 0
src/deploy/mesos-master-env.sh.template | 0
src/deploy/mesos-start-agents.sh.in | 0
src/deploy/mesos-start-cluster.sh.in | 0
src/deploy/mesos-start-masters.sh.in | 0
src/deploy/mesos-stop-agents.sh.in | 0
src/deploy/mesos-stop-cluster.sh.in | 0
src/deploy/mesos-stop-masters.sh.in | 0
32 files changed, 1 insertion(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/gdb-mesos-agent.sh.in
----------------------------------------------------------------------
diff --git a/bin/gdb-mesos-agent.sh.in b/bin/gdb-mesos-agent.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/gdb-mesos-local.sh.in
----------------------------------------------------------------------
diff --git a/bin/gdb-mesos-local.sh.in b/bin/gdb-mesos-local.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/gdb-mesos-master.sh.in
----------------------------------------------------------------------
diff --git a/bin/gdb-mesos-master.sh.in b/bin/gdb-mesos-master.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/gdb-mesos-tests.sh.in
----------------------------------------------------------------------
diff --git a/bin/gdb-mesos-tests.sh.in b/bin/gdb-mesos-tests.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/lldb-mesos-agent.sh.in
----------------------------------------------------------------------
diff --git a/bin/lldb-mesos-agent.sh.in b/bin/lldb-mesos-agent.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/lldb-mesos-local.sh.in
----------------------------------------------------------------------
diff --git a/bin/lldb-mesos-local.sh.in b/bin/lldb-mesos-local.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/lldb-mesos-master.sh.in
----------------------------------------------------------------------
diff --git a/bin/lldb-mesos-master.sh.in b/bin/lldb-mesos-master.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/lldb-mesos-tests.sh.in
----------------------------------------------------------------------
diff --git a/bin/lldb-mesos-tests.sh.in b/bin/lldb-mesos-tests.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-agent-flags.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-agent-flags.sh.in b/bin/mesos-agent-flags.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-agent.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-agent.sh.in b/bin/mesos-agent.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-local-flags.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-local-flags.sh.in b/bin/mesos-local-flags.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-local.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-local.sh.in b/bin/mesos-local.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-master-flags.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-master-flags.sh.in b/bin/mesos-master-flags.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-master.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-master.sh.in b/bin/mesos-master.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-tests-flags.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-tests-flags.sh.in b/bin/mesos-tests-flags.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos-tests.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos-tests.sh.in b/bin/mesos-tests.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/mesos.sh.in
----------------------------------------------------------------------
diff --git a/bin/mesos.sh.in b/bin/mesos.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/valgrind-mesos-agent.sh.in
----------------------------------------------------------------------
diff --git a/bin/valgrind-mesos-agent.sh.in b/bin/valgrind-mesos-agent.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/valgrind-mesos-local.sh.in
----------------------------------------------------------------------
diff --git a/bin/valgrind-mesos-local.sh.in b/bin/valgrind-mesos-local.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/valgrind-mesos-master.sh.in
----------------------------------------------------------------------
diff --git a/bin/valgrind-mesos-master.sh.in b/bin/valgrind-mesos-master.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/bin/valgrind-mesos-tests.sh.in
----------------------------------------------------------------------
diff --git a/bin/valgrind-mesos-tests.sh.in b/bin/valgrind-mesos-tests.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/cmake/MesosConfigure.cmake
----------------------------------------------------------------------
diff --git a/cmake/MesosConfigure.cmake b/cmake/MesosConfigure.cmake
index 0954a9c..de7dc08 100644
--- a/cmake/MesosConfigure.cmake
+++ b/cmake/MesosConfigure.cmake
@@ -96,7 +96,6 @@ set(abs_top_builddir "${CMAKE_BINARY_DIR}")
if (NOT WIN32)
# Create build bin/ directory. We will place configured scripts here.
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
- file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/bin/tmp")
# Define the variables required to configure these scripts.
set(VERSION "${PACKAGE_VERSION}")
@@ -110,22 +109,9 @@ if (NOT WIN32)
string(REGEX MATCH "(.*).in$" MATCH ${BIN_FILE})
get_filename_component(OUTPUT_BIN_FILE "${CMAKE_MATCH_1}" NAME)
- # Configure. Because CMake does not support configuring and setting
- # permissions, we do this in a two-step process: we first configure the
- # file, placing the configured file in a temporary directory, and then we
- # "copy" the configured file to the build `bin` directory, setting the
- # permissions as we go.
- #
- # NOTE: We use the `@ONLY` argument here to avoid trying to substitute
- # the value of `${@}`, which we frequently use in the scripts.
configure_file(
${BIN_FILE}
- "${CMAKE_BINARY_DIR}/bin/tmp/${OUTPUT_BIN_FILE}"
+ "${CMAKE_BINARY_DIR}/bin/${OUTPUT_BIN_FILE}"
@ONLY)
-
- file(COPY "${CMAKE_BINARY_DIR}/bin/tmp/${OUTPUT_BIN_FILE}"
- DESTINATION "${CMAKE_BINARY_DIR}/bin"
- FILE_PERMISSIONS WORLD_EXECUTE OWNER_READ OWNER_WRITE)
endforeach ()
- file(REMOVE_RECURSE "${CMAKE_BINARY_DIR}/bin/tmp")
endif ()
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-agent-env.sh.template
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-agent-env.sh.template b/src/deploy/mesos-agent-env.sh.template
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-daemon.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-daemon.sh.in b/src/deploy/mesos-daemon.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-deploy-env.sh.template
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-deploy-env.sh.template b/src/deploy/mesos-deploy-env.sh.template
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-master-env.sh.template
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-master-env.sh.template b/src/deploy/mesos-master-env.sh.template
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-start-agents.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-start-agents.sh.in b/src/deploy/mesos-start-agents.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-start-cluster.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-start-cluster.sh.in b/src/deploy/mesos-start-cluster.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-start-masters.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-start-masters.sh.in b/src/deploy/mesos-start-masters.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-stop-agents.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-stop-agents.sh.in b/src/deploy/mesos-stop-agents.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-stop-cluster.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-stop-cluster.sh.in b/src/deploy/mesos-stop-cluster.sh.in
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/mesos/blob/5fd3174c/src/deploy/mesos-stop-masters.sh.in
----------------------------------------------------------------------
diff --git a/src/deploy/mesos-stop-masters.sh.in b/src/deploy/mesos-stop-masters.sh.in
old mode 100644
new mode 100755