From 116b2a53f1b2773f7a256b52de23715cf8f7dac8 Mon Sep 17 00:00:00 2001 From: Ian Craggs Date: Tue, 16 Apr 2024 13:04:27 +0100 Subject: [PATCH] Add needed library for Windows build. Remove some unused build files --- travis-build.sh => cmake-build.sh | 0 src/CMakeLists.txt | 4 ++-- travis-deploy.sh | 1 - travis-install.sh | 29 ----------------------------- travis-setup-deploy.sh | 4 ---- 5 files changed, 2 insertions(+), 36 deletions(-) rename travis-build.sh => cmake-build.sh (100%) delete mode 100644 travis-deploy.sh delete mode 100755 travis-install.sh delete mode 100755 travis-setup-deploy.sh diff --git a/travis-build.sh b/cmake-build.sh similarity index 100% rename from travis-build.sh rename to cmake-build.sh diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 65ad6217b..1b0b604ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ #******************************************************************************* -# Copyright (c) 2015, 2023 logi.cals GmbH, Frank Pagliughi and others +# Copyright (c) 2015, 2024 logi.cals GmbH, Frank Pagliughi and others # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v2.0 @@ -56,7 +56,7 @@ if(NOT PAHO_HIGH_PERFORMANCE) endif() if(WIN32) - set(LIBS_SYSTEM ws2_32 crypt32 RpcRT4) + set(LIBS_SYSTEM ws2_32 crypt32 RpcRT4 Iphlpapi) elseif(UNIX) if(CMAKE_SYSTEM_NAME MATCHES "Linux") set(LIBS_SYSTEM c dl pthread rt) diff --git a/travis-deploy.sh b/travis-deploy.sh deleted file mode 100644 index 81b97c791..000000000 --- a/travis-deploy.sh +++ /dev/null @@ -1 +0,0 @@ -scp -v -o StrictHostKeyChecking=no build.paho/*.tar.gz icraggs@build.eclipse.org:../../../../shared/technology/paho/C/ diff --git a/travis-install.sh b/travis-install.sh deleted file mode 100755 index ca6dec95e..000000000 --- a/travis-install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -if [ "$TRAVIS_OS_NAME" == "linux" ]; then - pwd - sudo service mosquitto stop - # Stop any mosquitto instance which may be still running from previous runs - killall mosquitto - # mosquitto -h - # mosquitto -c test/tls-testing/mosquitto.conf & - - git clone https://github.com/eclipse/paho.mqtt.testing.git - cd paho.mqtt.testing/interoperability - python3 startbroker.py -c localhost_testing.conf & - cd ../.. -fi - -if [ "$TRAVIS_OS_NAME" == "osx" ]; then - pwd - # brew update - # brew install openssl mosquitto - # brew services stop mosquitto - # /usr/local/sbin/mosquitto -c test/tls-testing/mosquitto.conf & - - # brew upgrade python - git clone https://github.com/eclipse/paho.mqtt.testing.git - cd paho.mqtt.testing/interoperability - python3 startbroker.py -c localhost_testing.conf & - cd ../.. -fi diff --git a/travis-setup-deploy.sh b/travis-setup-deploy.sh deleted file mode 100755 index 0708f200a..000000000 --- a/travis-setup-deploy.sh +++ /dev/null @@ -1,4 +0,0 @@ -openssl aes-256-cbc -K $encrypted_dcd2b299f7c9_key -iv $encrypted_dcd2b299f7c9_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d -eval "$(ssh-agent -s)" -chmod 600 /tmp/deploy_rsa -ssh-add /tmp/deploy_rsa