From 3c6e83819f8ba053b5eec75fe03f55b107800e10 Mon Sep 17 00:00:00 2001 From: Dave Thaler Date: Thu, 4 Aug 2016 12:33:49 -0700 Subject: [PATCH] Enable WITH_UPSTREAM_LIBCOAP on Windows Make Windows start using the upstream libcoap rather than the forked version Change-Id: Iae4257d4f8246e033116381ef058668180e11ee2 Signed-off-by: Dave Thaler Reviewed-on: https://gerrit.iotivity.org/gerrit/10041 Reviewed-by: David Antler Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai Reviewed-by: Ashok Babu Channa --- extlibs/libcoap/SConscript | 6 ++++++ run.bat | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/extlibs/libcoap/SConscript b/extlibs/libcoap/SConscript index 52a75ac..4038b65 100644 --- a/extlibs/libcoap/SConscript +++ b/extlibs/libcoap/SConscript @@ -146,6 +146,12 @@ if with_upstream_libcoap == '1': coap_h_pc_file = os.path.join(libcoap_dir, 'include', 'coap', 'coap.h.in') coap_h_output = os.path.join(libcoap_dir, 'include', 'coap', 'coap.h') + # Generate coap_config.h + # TODO: generate coap_config.h dynamically. For now we use a pregenerated version + # per target OS. + if target_os == 'windows': + libcoap_env.Textfile(target = libcoap_dir + '/include/coap/coap_config.h', source = [File(libcoap_dir + '/coap_config.h.windows')]) + libcoap_version = libcoap_branch lib_prefix = '' + str(libcoap_env.get('PREFIX')) pc_vars = { diff --git a/run.bat b/run.bat index a81745e..33068cc 100644 --- a/run.bat +++ b/run.bat @@ -39,7 +39,7 @@ set TEST=1 set LOGGING=OFF set WITH_RD=1 set ROUTING=EP -set WITH_UPSTREAM_LIBCOAP=0 +set WITH_UPSTREAM_LIBCOAP=1 set BUILD_OPTIONS= TARGET_OS=%TARGET_OS% TARGET_ARCH=%TARGET_ARCH% RELEASE=0 WITH_RA=0 TARGET_TRANSPORT=IP SECURED=%SECURED% WITH_TCP=0 BUILD_SAMPLE=ON LOGGING=%LOGGING% TEST=%TEST% WITH_RD=%WITH_RD% ROUTING=%ROUTING% WITH_UPSTREAM_LIBCOAP=%WITH_UPSTREAM_LIBCOAP% -- 2.7.4