Repository: mesos Updated Branches: refs/heads/master e32163cee -> ed27acff4
Moved Mesos version from mesos.hpp to version.hpp. This allows the Module subsystem to simply include <mesos/version.hpp> instead of inheriting the whole protobuf header chain. Review: https://reviews.apache.org/r/26303 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ed27acff Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ed27acff Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ed27acff Branch: refs/heads/master Commit: ed27acff41a76c826291e86f11fc5cdfe56688e3 Parents: e32163c Author: Kapil Arya <[email protected]> Authored: Thu Oct 2 17:56:01 2014 -0700 Committer: Niklas Q. Nielsen <[email protected]> Committed: Thu Oct 2 17:56:01 2014 -0700 ---------------------------------------------------------------------- configure.ac | 2 +- include/mesos/mesos.hpp | 26 ++++++++++++++++++++++++++ include/mesos/mesos.hpp.in | 28 ---------------------------- include/mesos/version.hpp.in | 26 ++++++++++++++++++++++++++ src/Makefile.am | 5 +++-- 5 files changed, 56 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/ed27acff/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 86d448c..36d2083 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,7 @@ AC_CONFIG_FILES([src/deploy/mesos-stop-cluster.sh]) AC_CONFIG_FILES([src/deploy/mesos-stop-masters.sh]) AC_CONFIG_FILES([src/deploy/mesos-stop-slaves.sh]) -AC_CONFIG_FILES([include/mesos/mesos.hpp]) +AC_CONFIG_FILES([include/mesos/version.hpp]) AC_CONFIG_FILES([src/java/generated/org/apache/mesos/MesosNativeLibrary.java]) http://git-wip-us.apache.org/repos/asf/mesos/blob/ed27acff/include/mesos/mesos.hpp ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.hpp b/include/mesos/mesos.hpp new file mode 100644 index 0000000..371d14a --- /dev/null +++ b/include/mesos/mesos.hpp @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __MESOS_HPP__ +#define __MESOS_HPP__ + +#include <mesos/mesos.pb.h> // ONLY USEFUL AFTER RUNNING PROTOC. + +#include <mesos/version.hpp> + +#endif // __MESOS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/ed27acff/include/mesos/mesos.hpp.in ---------------------------------------------------------------------- diff --git a/include/mesos/mesos.hpp.in b/include/mesos/mesos.hpp.in deleted file mode 100644 index 8aedf8c..0000000 --- a/include/mesos/mesos.hpp.in +++ /dev/null @@ -1,28 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __MESOS_HPP__ -#define __MESOS_HPP__ - -#include <mesos/mesos.pb.h> // ONLY USEFUL AFTER RUNNING PROTOC. - -#define MESOS_VERSION "@PACKAGE_VERSION@" - -// TODO(benh): MESOS_MAJOR_VERSION, MESOS_MINOR_VERSION, MESOS_PATCH_VERSION. - -#endif // __MESOS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/ed27acff/include/mesos/version.hpp.in ---------------------------------------------------------------------- diff --git a/include/mesos/version.hpp.in b/include/mesos/version.hpp.in new file mode 100644 index 0000000..524cebc --- /dev/null +++ b/include/mesos/version.hpp.in @@ -0,0 +1,26 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __MESOS_VERSION_HPP__ +#define __MESOS_VERSION_HPP__ + +#define MESOS_VERSION "@PACKAGE_VERSION@" + +// TODO(benh): MESOS_MAJOR_VERSION, MESOS_MINOR_VERSION, MESOS_PATCH_VERSION. + +#endif // __MESOS_VERSION_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/ed27acff/src/Makefile.am ---------------------------------------------------------------------- diff --git a/src/Makefile.am b/src/Makefile.am index e588fd0..c62a974 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -306,13 +306,14 @@ libmesos_no_3rdparty_la_SOURCES = \ pkginclude_HEADERS = \ $(top_srcdir)/include/mesos/executor.hpp \ - $(top_srcdir)/include/mesos/scheduler.hpp \ + $(top_srcdir)/include/mesos/mesos.hpp \ $(top_srcdir)/include/mesos/resources.hpp \ + $(top_srcdir)/include/mesos/scheduler.hpp \ $(top_srcdir)/include/mesos/values.hpp \ $(top_srcdir)/include/mesos/mesos.proto nodist_pkginclude_HEADERS = \ - ../include/mesos/mesos.hpp \ + ../include/mesos/version.hpp \ ../include/mesos/mesos.pb.h containerizerdir = $(pkgincludedir)/containerizer
