From cc3c8732fd3f8505f46802dd54bd4a21c79b72aa Mon Sep 17 00:00:00 2001 From: Petteri Aimonen Date: Sun, 4 Jan 2015 20:20:40 +0200 Subject: Actually make the protoc version check work --- tests/oneof/SConscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'tests/oneof') diff --git a/tests/oneof/SConscript b/tests/oneof/SConscript index 95f451c..22634fb 100644 --- a/tests/oneof/SConscript +++ b/tests/oneof/SConscript @@ -3,10 +3,16 @@ Import('env') import re -version = re.search('([0-9]+).([0-9]+).([0-9]+)', 'libprotoc 3.0.0').groups() + +match = None +if 'PROTOC_VERSION' in env: + match = re.search('([0-9]+).([0-9]+).([0-9]+)', env['PROTOC_VERSION']) + +if match: + version = map(int, match.groups()) # Oneof is supported by protoc >= 2.6.0 -if int(version[0]) > 2 or (int(version[0]) == 2 and int(version[1]) >= 6): +if env.GetOption('clean') or (match and (version[0] > 2 or (version[0] == 2 and version[1] >= 6))): env.NanopbProto('oneof') enc = env.Program(['encode_oneof.c', -- cgit