You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2015/10/15 09:25:43 UTC
mesos git commit: Fixed syntax error in sed usage on OSX.
Repository: mesos
Updated Branches:
refs/heads/master 8b87d4772 -> afee34c2e
Fixed syntax error in sed usage on OSX.
5d246ce4e2d40b adopted sed syntax that works on Linux but does not work
on OSX. Apparently there is not a portable way to instruct sed not to
make a backup file; hence, we now create a backup file and then
immediately delete it.
Review: https://reviews.apache.org/r/39323
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/afee34c2
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/afee34c2
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/afee34c2
Branch: refs/heads/master
Commit: afee34c2ef14d3824580c8a19d12d4c6de293772
Parents: 8b87d47
Author: Neil Conway <ne...@gmail.com>
Authored: Thu Oct 15 09:19:45 2015 +0200
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Thu Oct 15 09:23:06 2015 +0200
----------------------------------------------------------------------
src/Makefile.am | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/afee34c2/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 2bf40f2..ba9feb1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -427,35 +427,35 @@ python/interface/src/mesos/interface/containerizer_pb2.py: \
$(PROTOC) -I$(top_srcdir)/include/mesos/containerizer \
$(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/interface $^
- sed -i 's/mesos\.mesos_pb2/mesos_pb2/' $@
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
python/interface/src/mesos/interface/scheduler_pb2.py: $(SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/scheduler \
$(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/interface $^
- sed -i 's/mesos\.mesos_pb2/mesos_pb2/' $@
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
python/interface/src/mesos/v1/interface/scheduler_pb2.py: $(V1_SCHEDULER_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1/scheduler \
$(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/v1/interface $^
- sed -i 's/mesos\.mesos_pb2/mesos_pb2/' $@
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
python/interface/src/mesos/interface/executor_pb2.py: $(EXECUTOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/executor \
$(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/interface $^
- sed -i 's/mesos\.mesos_pb2/mesos_pb2/' $@
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
python/interface/src/mesos/v1/interface/executor_pb2.py: $(V1_EXECUTOR_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) -I$(top_srcdir)/include/mesos/v1/executor \
$(PROTOCFLAGS) \
--python_out=python/interface/src/mesos/v1/interface $^
- sed -i 's/mesos\.mesos_pb2/mesos_pb2/' $@
+ $(SED) -i.bak 's/mesos\.mesos_pb2/mesos_pb2/' $@ && rm $@.bak
# We even use a convenience library for most of Mesos so that we can
# exclude third party libraries so setuptools/distribute can build a
@@ -942,9 +942,9 @@ if GIT_REPO
endif
# We need to escape the build flags properly.
-BUILD_FLAGS = $(echo $(MESOS_CPPFLAGS) $(CPPFLAGS) | sed 's/\"/\\\"/g') \
- $(echo $(AM_CFLAGS) $(CFLAGS) | sed 's/\"/\\\"/g') \
- $(echo $(AM_CXXFLAGS) $(CXXFLAGS) | sed 's/\"/\\\"/g')
+BUILD_FLAGS = $(echo $(MESOS_CPPFLAGS) $(CPPFLAGS) | $(SED) 's/\"/\\\"/g') \
+ $(echo $(AM_CFLAGS) $(CFLAGS) | $(SED) 's/\"/\\\"/g') \
+ $(echo $(AM_CXXFLAGS) $(CXXFLAGS) | $(SED) 's/\"/\\\"/g')
# TODO(benh): Provide other build flags.