Skip to content

Commit

Permalink
paho lib version changed from 1.3.12 to 1.3.13 (#71)
Browse files Browse the repository at this point in the history
  • Loading branch information
sshanks-kx authored Dec 3, 2024
1 parent f53811e commit 8d67703
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 17 deletions.
6 changes: 1 addition & 5 deletions docker_linux/Dockerfile.alpine
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,13 @@ RUN apk add --update && \
apk add gcompat && \
apk add libnsl && \
cd /source && \

# MQTT Libs
/bin/sh /source/mqtt/build_libpaho.sh && \

# Clean up
apk del gcc && \
apk del cmake && \
apk del make && \
apk del wget && \
apk del build-base && \
rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.12* /source/mqtt/CmakeLists.txt
rm -rf /source/mqtt_build.sh /source/paho.mqtt.c /source/v1.3.13* /source/mqtt/CmakeLists.txt

## Update this section here to add kdb+
#COPY q/k4.lic /q/
Expand Down
3 changes: 1 addition & 2 deletions docker_linux/Dockerfile.centos7
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ RUN yum -y install gcc && \
yum -y install make && \
yum -y install vim && \
yum -y install openssl-devel && \
yum -y install unzip && \
yum -y install wget

RUN yum clean all
Expand All @@ -22,7 +21,7 @@ ENV QHOME /q
ENV PATH /q/l64:$PATH
ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH

RUN cd /source && wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.12/Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz.zip && unzip Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz.zip && tar xvf Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz -C ./paho.mqtt.c --strip-components=1
RUN cd /source && wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz && tar xvf Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz -C ./paho.mqtt.c --strip-components=1
ENV BUILD_HOME /source/paho.mqtt.c

COPY mqtt_build.sh /source
Expand Down
4 changes: 2 additions & 2 deletions docker_linux/build_libpaho.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

cd /source

wget https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.12.tar.gz
tar xvf v1.3.12.tar.gz -C ./paho.mqtt.c --strip-components=1
wget https://github.com/eclipse/paho.mqtt.c/archive/refs/tags/v1.3.13.tar.gz
tar xvf v1.3.13.tar.gz -C ./paho.mqtt.c --strip-components=1

cd paho.mqtt.c

Expand Down
14 changes: 6 additions & 8 deletions travis_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@
mkdir cbuild

if [ "$TRAVIS_OS_NAME" == "osx" ]; then
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.12/Eclipse-Paho-MQTT-C-1.3.12-Darwin.tar.gz.zip
unzip Eclipse-Paho-MQTT-C-1.3.12-Darwin.tar.gz.zip
tar xvf Eclipse-Paho-MQTT-C-1.3.12-Darwin.tar.gz -C ./cbuild --strip-components=1
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz
tar xvf Eclipse-Paho-MQTT-C-1.3.13-Darwin.tar.gz -C ./cbuild --strip-components=1
elif [ "$TRAVIS_OS_NAME" == "linux" ]; then
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.12/Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz.zip
unzip Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz.zip
tar xvf Eclipse-Paho-MQTT-C-1.3.12-Linux.tar.gz -C ./cbuild --strip-components=1
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz
tar xvf Eclipse-Paho-MQTT-C-1.3.13-Linux.tar.gz -C ./cbuild --strip-components=1
elif [ "$TRAVIS_OS_NAME" == "windows" ]; then
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.12/eclipse-paho-mqtt-c-win64-1.3.12.zip
7z x -ocbuild eclipse-paho-mqtt-c-win64-1.3.12.zip
wget https://github.com/eclipse/paho.mqtt.c/releases/download/v1.3.13/eclipse-paho-mqtt-c-win64-1.3.13.zip
7z x -ocbuild eclipse-paho-mqtt-c-win64-1.3.13.zip
else
echo "$TRAVIS_OS_NAME is currently not supported"
fi

0 comments on commit 8d67703

Please sign in to comment.