diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d4d47cb..666ffba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: apt update apt-get -y install sudo wget curl gnupg lsb-release gcovr unzip gcc-multilib libasan* sudo apt-get -y install software-properties-common + sudo apt-get -y install libcurl4-openssl-dev curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - sudo add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" sudo curl -L "https://github.com/docker/compose/releases/download/1.24.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose @@ -57,21 +58,13 @@ jobs: - name: Install pugixml run: | - git clone https://github.com/vlm/asn1c.git git clone https://github.com/zeux/pugixml.git cd ./pugixml && mkdir -p build && cd build && cmake .. && make && make install working-directory: ${{ env.working-directory }} - - name: Build and install asn1c submodule - run: | - sudo apt-get -y install libtool autoconf - cd ./asn1c && aclocal && test -f configure || autoreconf -iv && ./configure && make && make install - working-directory: ${{ env.working-directory }} - - - name: Generate ASN.1 API. + - name: Extract implementation and header files run: | export LD_LIBRARY_PATH=/usr/local/lib - git clone https://github.com/usdot-jpo-ode/scms-asn1.git cd ./asn1c_combined && bash doIt.sh working-directory: ${{ env.working-directory }} diff --git a/Dockerfile b/Dockerfile index b2cb713..121dc5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,22 +14,10 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \ librdkafka-dev \ asio-dev -# Dependencies that are not needed if asn1c is not installed in the build container: -# libtool -# automake -# autoconf -# bison -# flex - # Install pugixml ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# The codec C files are pre-generated manually so it isn't necessary to build asn1c in the container -# # Build and install asn1c submodule -# ADD ./usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined diff --git a/Dockerfile.amazonlinux b/Dockerfile.amazonlinux index 7a2ee0b..8eda7df 100644 --- a/Dockerfile.amazonlinux +++ b/Dockerfile.amazonlinux @@ -19,10 +19,6 @@ RUN dnf --enablerepo=fedora install asio-devel -y ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# Don't need to build and install asn1c submodule -# ADD ./asn1_codec/usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined diff --git a/Dockerfile.debug b/Dockerfile.debug index d1ea307..eed2ecd 100644 --- a/Dockerfile.debug +++ b/Dockerfile.debug @@ -14,22 +14,10 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \ librdkafka-dev \ asio-dev -# Dependencies that are not needed if asn1c is not installed in the build container: -# libtool -# automake -# autoconf -# bison -# flex - # Install pugixml ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# The codec C files are pre-generated manually so it isn't necessary to build asn1c in the container -# # Build and install asn1c submodule -# ADD ./usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined diff --git a/Dockerfile.dev b/Dockerfile.dev index c522d5b..3850a0d 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -14,22 +14,10 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \ librdkafka-dev \ asio-dev -# Dependencies that are not needed if asn1c is not installed in the build container: -# libtool -# automake -# autoconf -# bison -# flex - # Install pugixml ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# The codec C files are pre-generated manually so it isn't necessary to build asn1c in the container -# # Build and install asn1c submodule -# ADD ./usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined diff --git a/Dockerfile.standalone b/Dockerfile.standalone index ca3a67c..dcb47f5 100644 --- a/Dockerfile.standalone +++ b/Dockerfile.standalone @@ -13,22 +13,10 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \ librdkafka-dev \ asio-dev -# Dependencies that are not needed if asn1c is not installed in the build container: -# libtool -# automake -# autoconf -# bison -# flex - # Install pugixml ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# The codec C files are pre-generated manually so it isn't necessary to build asn1c in the container -# # Build and install asn1c submodule -# ADD ./usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined diff --git a/Dockerfile.testing b/Dockerfile.testing index ad6ed95..34913b6 100644 --- a/Dockerfile.testing +++ b/Dockerfile.testing @@ -14,22 +14,10 @@ RUN apk add --upgrade --no-cache --virtual .build-deps \ librdkafka-dev \ asio-dev -# Dependencies that are not needed if asn1c is not installed in the build container: -# libtool -# automake -# autoconf -# bison -# flex - # Install pugixml ADD ./pugixml /asn1_codec/pugixml RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install -# The codec C files are pre-generated manually so it isn't necessary to build asn1c in the container -# # Build and install asn1c submodule -# ADD ./usdot-asn1c /asn1_codec/asn1c -# RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install - # Make generated files available to the build & compile example RUN export LD_LIBRARY_PATH=/usr/local/lib ADD ./asn1c_combined /asn1_codec/asn1c_combined