You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/27 20:23:49 UTC
[2/2] mesos git commit: Slave/Agent Rename Phase I: Rename
'/include/mesos/slave' folder.
Slave/Agent Rename Phase I: Rename '/include/mesos/slave' folder.
This patch did the following changes:
1. Changed the 'make install' headers installation location from
'$(DESTDIR)/include/mesos/slave' to '$(DESTDIR)include/mesos/agent'
2. As we did not change the folder name from 'include/mesos/slave'
to 'include/mesos/agent', we created a 'slave -> agent' symlink in
'$(DESTDIR)/include/mesos'
Review: https://reviews.apache.org/r/46676/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a74a3706
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a74a3706
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a74a3706
Branch: refs/heads/master
Commit: a74a3706708dd62fcbd5206cd7b26f54485158f9
Parents: 21a9d38
Author: zhou xing <xi...@cn.ibm.com>
Authored: Wed Apr 27 11:23:04 2016 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Apr 27 11:23:04 2016 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
src/Makefile.am | 26 ++++++++++++++++----------
2 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a74a3706/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9186836..115b22e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -73,6 +73,7 @@ Binary API Changes:
* [MESOS-3782] - Slave/Agent Rename Phase I - Duplicate/Rename binaries.
* [MESOS-5057] - Slave/Agent Rename Phase I - Update strings in error messages and
other strings.
+ * [MESOS-5230] - Slave/Agent Rename Phase I: Rename '/include/mesos/slave' folder
Release Notes - Mesos - Version 0.28.1
http://git-wip-us.apache.org/repos/asf/mesos/blob/a74a3706/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 12276a9..53de98f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -532,9 +532,9 @@ scheduler_HEADERS = \
nodist_scheduler_HEADERS = \
../include/mesos/scheduler/scheduler.pb.h
-slavedir = $(pkgincludedir)/slave
+agentdir = $(pkgincludedir)/agent
-slave_HEADERS = \
+agent_HEADERS = \
$(top_srcdir)/include/mesos/slave/container_logger.hpp \
$(top_srcdir)/include/mesos/slave/isolator.hpp \
$(top_srcdir)/include/mesos/slave/isolator.proto \
@@ -543,7 +543,7 @@ slave_HEADERS = \
$(top_srcdir)/include/mesos/slave/qos_controller.hpp \
$(top_srcdir)/include/mesos/slave/resource_estimator.hpp
-nodist_slave_HEADERS = \
+nodist_agent_HEADERS = \
../include/mesos/slave/isolator.pb.h \
../include/mesos/slave/oversubscription.pb.h
@@ -2142,19 +2142,24 @@ dist_testlibexec_SCRIPTS = \
endif
-# Copy mesos-agent-env.sh.template to mesos-slave-env.sh.template.
+# This target will do the following two things:
+# 1. Copy mesos-agent-env.sh.template to mesos-slave-env.sh.template.
+# 2. Create "slave->agent" symlink in the agent headers installation
+# path.
#
# TODO(tomxing): Remove this target once the
-# slave->agent rename is complete(MESOS-3782).
-copy-agent-env-template:
+# slave->agent rename is complete(MESOS-3782 & MESOS-5230).
+copy-template-and-create-symlink:
cp $(DESTDIR)/$(pkgsysconfdir)/mesos-agent-env.sh.template \
- $(DESTDIR)/$(pkgsysconfdir)/mesos-slave-env.sh.template
+ $(DESTDIR)/$(pkgsysconfdir)/mesos-slave-env.sh.template &&\
+ ln -s $(DESTDIR)/$(includedir)/mesos/agent \
+ $(DESTDIR)/$(includedir)/mesos/slave
# Install compatibility symlinks for modules that used to be in $(LIBDIR)
# but are now in $(PKGMODULEDIR). We use install-data-hook because it
# runs late in the install process after the target directories have
# been created.
-install-data-hook: copy-agent-env-template
+install-data-hook: copy-template-and-create-symlink
cd $(DESTDIR)/$(libdir) && \
for name in libfixed_resource_estimator \
libload_qos_controller \
@@ -2166,9 +2171,10 @@ install-data-hook: copy-agent-env-template
done
# TODO(tomxing): Remove this hook once the
-# slave->agent rename is complete(MESOS-3782).
+# slave->agent rename is complete(MESOS-3782 & MESOS 5230).
uninstall-hook:
- rm -f $(DESTDIR)/$(pkgsysconfdir)/mesos-slave-env.sh.template
+ rm -f $(DESTDIR)/$(pkgsysconfdir)/mesos-slave-env.sh.template &&\
+ rm -f $(DESTDIR)/$(includedir)/mesos/slave
# We use a check-local target for now to avoid the parallel test
# runner that ships with newer versions of autotools.