From 11343c108649dda898992cfdcc3298248f3d82f7 Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Tue, 12 May 2020 18:50:31 -0700 Subject: [PATCH] Library cleanup (#261) * library cleanup * actually run install command * Installing ubuntu capnproto is useless * use ubuntu capnp --- Dockerfile | 6 ++---- can/packer_pyx_setup.py | 4 ++-- can/parser_pyx_setup.py | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e105313..6a4bc4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ from ubuntu:16.04 -RUN apt-get update && apt-get install -y libzmq3-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl +RUN apt-get update && apt-get install -y libzmq3-dev capnproto libcapnp-dev clang wget git autoconf libtool curl make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libffi-dev liblzma-dev python-openssl RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash ENV PATH="/root/.pyenv/bin:/root/.pyenv/shims:${PATH}" @@ -13,11 +13,9 @@ RUN pip install -r /tmp/requirements.txt ENV PYTHONPATH=/project +WORKDIR /project # TODO: Add tag to cereal RUN git clone https://github.com/commaai/cereal.git /project/cereal -RUN /project/cereal/install_capnp.sh - -WORKDIR /project COPY SConstruct . COPY . /project/opendbc diff --git a/can/packer_pyx_setup.py b/can/packer_pyx_setup.py index 48d1c26..6195850 100644 --- a/can/packer_pyx_setup.py +++ b/can/packer_pyx_setup.py @@ -33,7 +33,7 @@ class BuildExtWithoutPlatformSuffix(build_ext): sourcefiles = ['packer_pyx.pyx'] -extra_compile_args = ["-std=c++11"] +extra_compile_args = ["-std=c++14"] ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg if ARCH == "aarch64": @@ -54,7 +54,7 @@ setup(name='CAN packer', extra_compile_args=extra_compile_args, include_dirs=[ BASEDIR, - os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), + os.path.join(BASEDIR, 'phonelibs'), ], extra_link_args=[ os.path.join(BASEDIR, 'opendbc', 'can', libdbc), diff --git a/can/parser_pyx_setup.py b/can/parser_pyx_setup.py index 5662530..cc532f1 100644 --- a/can/parser_pyx_setup.py +++ b/can/parser_pyx_setup.py @@ -33,7 +33,7 @@ class BuildExtWithoutPlatformSuffix(build_ext): sourcefiles = ['parser_pyx.pyx'] -extra_compile_args = ["-std=c++11"] +extra_compile_args = ["-std=c++14"] ARCH = subprocess.check_output(["uname", "-m"], encoding='utf8').rstrip() # pylint: disable=unexpected-keyword-arg if ARCH == "aarch64": @@ -54,7 +54,7 @@ setup(name='CAN parser', extra_compile_args=extra_compile_args, include_dirs=[ BASEDIR, - os.path.join(BASEDIR, 'phonelibs', 'capnp-cpp/include'), + os.path.join(BASEDIR, 'phonelibs'), ], extra_link_args=[ os.path.join(BASEDIR, 'opendbc', 'can', libdbc),