Many deployments prefer to use gcc in production and it supports
sparse, while clang supports thread safety analysis and has
more/better warnings and error messages. This patch changes
ovs-dev.py to build with both so that developers are unlikely to miss
something that one or the other could catch.
Signed-off-by: Ethan Jackson <et...@nicira.com>
---
.gitignore | 4 ++++
utilities/ovs-dev.py | 62 ++++++++++++++++++++++++++++++++++++++--------------
2 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
index 60ed30d..1c75f69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,6 +45,10 @@
/missing-distfiles
/package.m4
/stamp-h1
+/build_gcc
+/build_clang
+/_build
+/build
Module.symvers
TAGS
cscope.*
diff --git a/utilities/ovs-dev.py b/utilities/ovs-dev.py
index d33b2ba..9975d8d 100755
--- a/utilities/ovs-dev.py
+++ b/utilities/ovs-dev.py
@@ -24,7 +24,9 @@ ENV = os.environ
HOME = ENV["HOME"]
OVS_SRC = HOME + "/ovs"
ROOT = HOME + "/root"
-PATH = "%(ovs)s/utilities:%(ovs)s/ovsdb:%(ovs)s/vswitchd" % {"ovs": OVS_SRC}
+BUILD_GCC = OVS_SRC + "/build_gcc"
+BUILD_CLANG = OVS_SRC + "/build_clang"
+PATH = "%(ovs)s/utilities:%(ovs)s/ovsdb:%(ovs)s/vswitchd" % {"ovs": BUILD_GCC}
ENV["CFLAGS"] = "-g -O0"
ENV["PATH"] = PATH + ":" + ENV["PATH"]
@@ -52,10 +54,13 @@ def uname():
def conf():
tag()
- if options.clang:
- ENV["CC"] = "clang"
- configure = ["./configure", "--prefix=" + ROOT, "--localstatedir=" + ROOT,
+ try:
+ os.remove(OVS_SRC + "/Makefile")
+ except OSError:
+ pass
+
+ configure = ["../configure", "--prefix=" + ROOT, "--localstatedir=" + ROOT,
"--with-logdir=%s/log" % ROOT, "--with-rundir=%s/run" % ROOT,
"--with-linux=/lib/modules/%s/build" % uname(),
"--with-dbdir=" + ROOT]
@@ -70,21 +75,48 @@ def conf():
configure.append("--mandir=" + options.mandir)
_sh("./boot.sh")
+
+ try:
+ os.mkdir(BUILD_GCC)
+ except OSError:
+ pass # Directory exists.
+
+ os.chdir(BUILD_GCC)
_sh(*configure)
+
+ try:
+ _sh("clang --version", capture=True)
+ clang = True
+ except subprocess.CalledProcessError:
+ clang = False
+
+ if clang:
+ try:
+ os.mkdir(BUILD_CLANG)
+ except OSError:
+ pass # Directory exists.
+
+ ENV["CC"] = "clang"
+ os.chdir(BUILD_CLANG)
+ _sh(*configure)
+
+ os.chdir(OVS_SRC)
+
+ make_str = "\t$(MAKE) -C %s $@\n"
+
+ mf = open(OVS_SRC + "/Makefile", "w")
+ mf.write("all:\n%:\n")
+ if clang:
+ mf.write(make_str % BUILD_CLANG)
+ mf.write("\t$(MAKE) -C %s C=1 $@\n" % BUILD_GCC)
+ mf.write("\ncheck:\n")
+ mf.write(make_str % BUILD_GCC)
+ mf.close()
commands.append(conf)
def make(args=""):
make = "make -s -j 8 " + args
- try:
- _sh("cgcc", "--version", capture=True)
- # XXX: For some reason the clang build doesn't place nicely with
- # sparse. At some point this needs to be figured out and this check
- # removed.
- if not options.clang:
- make += " C=1"
- except OSError:
- pass
_sh(make)
commands.append(make)
@@ -169,7 +201,7 @@ def run():
_sh("ovs-vsctl --no-wait set Open_vSwitch %s ovs_version=%s"
% (root_uuid, version))
- cmd = [OVS_SRC + "/vswitchd/ovs-vswitchd"]
+ cmd = [BUILD_GCC + "/vswitchd/ovs-vswitchd"]
if options.gdb:
cmd = ["gdb", "--args"] + cmd
elif options.valgrind:
@@ -284,8 +316,6 @@ def main():
help="run ovs-vswitchd under gdb")
group.add_option("--valgrind", dest="valgrind", action="store_true",
help="run ovs-vswitchd under valgrind")
- group.add_option("--clang", dest="clang", action="store_true",
- help="build ovs-vswitchd with clang")
parser.add_option_group(group)
options, args = parser.parse_args()
--
1.8.1.2
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
