From 44f809d7bd56039057e96c5b43d5c82c657b7d6f Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 19:10:31 +0200 Subject: [PATCH 01/22] install dependencies directly instead of using subprojects --- .travis.yml | 1 + install_deps.sh | 72 +++++++++++++++++++++++++++++++++++++++++++++++++ meson.build | 11 +++----- 3 files changed, 76 insertions(+), 8 deletions(-) create mode 100755 install_deps.sh diff --git a/.travis.yml b/.travis.yml index 79d18ac..5fb08e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,6 +37,7 @@ env: before_install: - sudo pip3 install --system meson + - ./install_deps before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build diff --git a/install_deps.sh b/install_deps.sh new file mode 100755 index 0000000..dd1c9d7 --- /dev/null +++ b/install_deps.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +PACKAGES="libfuse lws jansson" + +libfuse_VERSION=3.9.1 +libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz +libfuse_MD5=5f7c1062def710d8b60343524a18cc82 +libfuse_DIR=libfuse-fuse-${libfuse_VERSION} +libfuse_TYPE=meson + +lws_VERSION=3.2.0 +lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz +lws_MD5=1d06f5602604e67e6f50cef9857c6b0c +lws_DIR=libwebsockets-${lws_VERSION} +lws_TYPE=cmake + +jansson_VERSION=2.12 +jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.gz +jansson_MD5=c4b106528d5ffb521178565de1ba950d +jansson_DIR=jansson-${jansson_VERSION} +jansson_TYPE=cmake + +set -e + +install_package() { + local PACKAGE="$1" + local PACKAGE_VERSION="${PACKAGE}_VERSION" + local PACKAGE_URL="${PACKAGE}_URL" + local PACKAGE_MD5="${PACKAGE}_MD5" + local PACKAGE_TYPE="${PACKAGE}_TYPE" + local PACKAGE_DIR="${PACKAGE}_DIR" + local FILENAME="${PACKAGE}_${!PACKAGE_VERSION}.tar.gz" + + wget "${!PACKAGE_URL}" -O "${FILENAME}" + md5sum -c <(echo "${!PACKAGE_MD5}" "${FILENAME}") + tar -xf ${FILENAME} + + case "${!PACKAGE_TYPE}" in + meson) + cd "${!PACKAGE_DIR}" + meson build + cd build + ninja + ninja install + cd ../.. + ;; + cmake) + mkdir "${!PACKAGE_DIR}/build" + cd "${!PACKAGE_DIR}/build" + cmake .. + make + make install + cd ../.. + ;; + *) + echo "error: unknown package type ${!PACKAGE_TYPE}" + exit 1 + ;; + esac +} + + +CURRENT_DIR=$(pwd) +WORKING_DIR=$(mktemp -d /tmp/install_deps_XXXXXX) +cd ${WORKING_DIR} + +for package in ${PACKAGES} ; do + install_package $package +done + +cd ${CURRENT_DIR} +#rm -rf ${WORKING_DIR} diff --git a/meson.build b/meson.build index c221c21..74595f4 100644 --- a/meson.build +++ b/meson.build @@ -8,15 +8,10 @@ openssl_dep = dependency('openssl', version: '>=1.1.1') libconfig_dep = dependency('libconfig', version: '>=1.5') pam_dep = c_compiler.find_library('pam') -libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0', required: false) -if not libwebsockets_dep.found() - cmake = import('cmake') - libwebsockets = cmake.subproject('libwebsockets') - libwebsockets_dep = libwebsockets.dependency('websockets_shared') -endif +libwebsockets_dep = dependency('libwebsockets', version: '>=3.0.0') +jansson_dep = dependency('jansson', version: '>=2.11') +libfuse_dep = dependency('fuse3', version: '>=3.8.0') -jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep']) -libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep']) webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0', fallback: ['webfuse', 'webfuse_dep'], default_options: ['without_tests=true']) From 1d7f0c79ee54768eb64dc5c2c876d39beee074dd Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 19:32:02 +0200 Subject: [PATCH 02/22] fix: fixed script name --- .travis.yml | 2 +- deps.sh | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 deps.sh diff --git a/.travis.yml b/.travis.yml index 5fb08e3..ad4d478 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ env: before_install: - sudo pip3 install --system meson - - ./install_deps + - ./install_deps.sh before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build diff --git a/deps.sh b/deps.sh new file mode 100644 index 0000000..1cd49bf --- /dev/null +++ b/deps.sh @@ -0,0 +1,19 @@ +PACKAGES="libfuse lws jansson" + +libfuse_VERSION=3.9.1 +libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz +libfuse_MD5=5f7c1062def710d8b60343524a18cc82 +libfuse_DIR=libfuse-fuse-${libfuse_VERSION} +libfuse_TYPE=meson + +lws_VERSION=3.2.0 +lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz +lws_MD5=1d06f5602604e67e6f50cef9857c6b0c +lws_DIR=libwebsockets-${lws_VERSION} +lws_TYPE=cmake + +jansson_VERSION=2.12 +jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.gz +jansson_MD5=c4b106528d5ffb521178565de1ba950d +jansson_DIR=jansson-${jansson_VERSION} +jansson_TYPE=cmake From e1705d50cf11cbab100be3476a7bebd220eec7cf Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 19:48:53 +0200 Subject: [PATCH 03/22] install with sudo --- install_deps.sh | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/install_deps.sh b/install_deps.sh index dd1c9d7..679bd10 100755 --- a/install_deps.sh +++ b/install_deps.sh @@ -1,24 +1,6 @@ #!/bin/bash -PACKAGES="libfuse lws jansson" - -libfuse_VERSION=3.9.1 -libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz -libfuse_MD5=5f7c1062def710d8b60343524a18cc82 -libfuse_DIR=libfuse-fuse-${libfuse_VERSION} -libfuse_TYPE=meson - -lws_VERSION=3.2.0 -lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=1d06f5602604e67e6f50cef9857c6b0c -lws_DIR=libwebsockets-${lws_VERSION} -lws_TYPE=cmake - -jansson_VERSION=2.12 -jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.gz -jansson_MD5=c4b106528d5ffb521178565de1ba950d -jansson_DIR=jansson-${jansson_VERSION} -jansson_TYPE=cmake +. deps.sh set -e @@ -41,7 +23,7 @@ install_package() { meson build cd build ninja - ninja install + sudo ninja install cd ../.. ;; cmake) @@ -49,7 +31,7 @@ install_package() { cd "${!PACKAGE_DIR}/build" cmake .. make - make install + sudo make install cd ../.. ;; *) From b95f537a7917eb966b2d8e6dc638f8448c59c2f3 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 20:07:01 +0200 Subject: [PATCH 04/22] print error logs on failure --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ad4d478..4a7a941 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ before_script: - ninja script: - - meson test $CHECK_OPTS + - meson test --print-errorlogs $CHECK_OPTS after_success: - bash <(curl -s https://codecov.io/bash) \ No newline at end of file From 6e62076d552c32e4123b5b6ab89ba3008bb9f9e3 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 20:10:25 +0200 Subject: [PATCH 05/22] updated libwebsockets to 4.0.13 --- deps.sh | 4 ++-- doc/build.md | 6 +++--- meson.build | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deps.sh b/deps.sh index 1cd49bf..ffc5298 100644 --- a/deps.sh +++ b/deps.sh @@ -6,9 +6,9 @@ libfuse_MD5=5f7c1062def710d8b60343524a18cc82 libfuse_DIR=libfuse-fuse-${libfuse_VERSION} libfuse_TYPE=meson -lws_VERSION=3.2.0 +lws_VERSION=4.0.13 lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=1d06f5602604e67e6f50cef9857c6b0c +lws_MD5=6403448e26d302501969afb0e128143b lws_DIR=libwebsockets-${lws_VERSION} lws_TYPE=cmake diff --git a/doc/build.md b/doc/build.md index 8f4fc45..baf39ef 100644 --- a/doc/build.md +++ b/doc/build.md @@ -12,7 +12,7 @@ To install dependecies, see below. - [webfuse](https://github.com/falk-werner/webfuse) - [libfuse](https://github.com/libfuse/libfuse/) - [libwebsockets](https://libwebsockets.org/) - - [jansson](https://github.com/akheron/jansson) +- [jansson](https://github.com/akheron/jansson) - [openssl](https://www.openssl.org/) - [libconfig](https://hyperrealm.github.io/libconfig/) - [linux-pam](http://www.linux-pam.org/) @@ -37,9 +37,9 @@ To install libfuse, meson is needed. Please refer to [meson quick guide](https:/ ### libwebsockets - wget https://github.com/warmcat/libwebsockets/archive/v3.2.0.tar.gz -O libwebsockets.tar.gz + wget https://github.com/warmcat/libwebsockets/archive/v4.0.13.tar.gz -O libwebsockets.tar.gz tar -xf libwebsockets.tar.gz - cd libwebsockets-3.2.0 + cd libwebsockets-4.0.13 mkdir .build cd .build cmake .. diff --git a/meson.build b/meson.build index 74595f4..8dc0a25 100644 --- a/meson.build +++ b/meson.build @@ -8,7 +8,7 @@ openssl_dep = dependency('openssl', version: '>=1.1.1') libconfig_dep = dependency('libconfig', version: '>=1.5') pam_dep = c_compiler.find_library('pam') -libwebsockets_dep = dependency('libwebsockets', version: '>=3.0.0') +libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0') jansson_dep = dependency('jansson', version: '>=2.11') libfuse_dep = dependency('fuse3', version: '>=3.8.0') From bbe3b7b669583e7d092be8eb738b6474ca791b91 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 20:20:13 +0200 Subject: [PATCH 06/22] fix: set LD_LIBRARY_PATH --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 4a7a941..2fb0b19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,6 +28,7 @@ addons: - valgrind env: + - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" matrix: - BUILD_TYPE=debug COVERAGE=true CHECK_OPTS= - BUILD_TYPE=debug COVERAGE=false CHECK_OPTS=--wrap='valgrind --error-exitcode=42' From 9d4ddf271c711e7eb74178639b5ad7929f282c7b Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 20:41:43 +0200 Subject: [PATCH 07/22] fix: set LD_LIBRARY_PATH --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2fb0b19..04c1108 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ addons: - valgrind env: - - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" matrix: - BUILD_TYPE=debug COVERAGE=true CHECK_OPTS= - BUILD_TYPE=debug COVERAGE=false CHECK_OPTS=--wrap='valgrind --error-exitcode=42' @@ -46,6 +45,7 @@ before_script: - ninja script: + - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" - meson test --print-errorlogs $CHECK_OPTS after_success: From ef72d00d10626e5490e8c42cb36297c037883404 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 20:50:36 +0200 Subject: [PATCH 08/22] fix: set LD_LIBRARY_PATH --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 04c1108..e849586 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,8 @@ before_script: - ninja script: - - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib" + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + - echo $LD_LIBRARY_PATH - meson test --print-errorlogs $CHECK_OPTS after_success: From 2b4d2b31b9ecbfe9d59e08c7649c5385d40e9e90 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:02:37 +0200 Subject: [PATCH 09/22] fix: set LD_LIBRARY_PATH --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e849586..e73eb95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,7 @@ env: before_install: + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu - sudo pip3 install --system meson - ./install_deps.sh @@ -45,8 +46,7 @@ before_script: - ninja script: - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib - - echo $LD_LIBRARY_PATH + - echo LD_LIBRARY_PATH $LD_LIBRARY_PATH - meson test --print-errorlogs $CHECK_OPTS after_success: From 1b172b52593056262a8d8e8b1c8b3b11f37b609e Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:09:19 +0200 Subject: [PATCH 10/22] remove debug output --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e73eb95..2c4aad0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,6 @@ before_script: - ninja script: - - echo LD_LIBRARY_PATH $LD_LIBRARY_PATH - meson test --print-errorlogs $CHECK_OPTS after_success: From 9487b3c2d447397167457f6cc4d9af190e0319a8 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:25:22 +0200 Subject: [PATCH 11/22] removed subprojects --- deps.sh | 14 +++++++++++++- meson.build | 3 +-- subprojects/fuse3.wrap | 7 ------- subprojects/gtest.wrap | 10 ---------- subprojects/jansson.wrap | 10 ---------- subprojects/libwebsockets.wrap | 6 ------ subprojects/webfuse.wrap | 7 ------- 7 files changed, 14 insertions(+), 43 deletions(-) delete mode 100644 subprojects/fuse3.wrap delete mode 100644 subprojects/gtest.wrap delete mode 100644 subprojects/jansson.wrap delete mode 100644 subprojects/libwebsockets.wrap delete mode 100644 subprojects/webfuse.wrap diff --git a/deps.sh b/deps.sh index ffc5298..4b709d1 100644 --- a/deps.sh +++ b/deps.sh @@ -1,4 +1,4 @@ -PACKAGES="libfuse lws jansson" +PACKAGES="libfuse lws jansson gtest webfuse" libfuse_VERSION=3.9.1 libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz @@ -17,3 +17,15 @@ jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.g jansson_MD5=c4b106528d5ffb521178565de1ba950d jansson_DIR=jansson-${jansson_VERSION} jansson_TYPE=cmake + +gtest_VERSION=1.10.0 +gtest_URL=https://github.com/google/googletest/archive/release-${1.10.0}.tar.gz +gtest_md5=ecd1fa65e7de707cd5c00bdac56022cd +gtest_DIR=googletest-release-${1.10.0} +gtest_TYPE=cmake + +webfuse_VERSION=0.5.0 +webfuse_URL=https://github.com/falk-werner/webfuse/archive/v${webfuse_VERSION}.tar.gz +webfuse_MD5=535c9f261c90c109a138daa3ee9f95ba +webfuse_DIR=webfuse-${webfuse_VERSION} +webfuse_TYPE=meson diff --git a/meson.build b/meson.build index 8dc0a25..2bdfb7c 100644 --- a/meson.build +++ b/meson.build @@ -12,8 +12,7 @@ libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.0') jansson_dep = dependency('jansson', version: '>=2.11') libfuse_dep = dependency('fuse3', version: '>=3.8.0') -webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0', - fallback: ['webfuse', 'webfuse_dep'], default_options: ['without_tests=true']) +webfuse_adapter_dep = dependency('webfuse', version: '>=0.5.0') inc_dir = include_directories('src') diff --git a/subprojects/fuse3.wrap b/subprojects/fuse3.wrap deleted file mode 100644 index 2861f7c..0000000 --- a/subprojects/fuse3.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-file] -directory = libfuse-fuse-3.9.1 - -source_url = https://github.com/libfuse/libfuse/archive/fuse-3.9.1.tar.gz -source_filename = fuse-3.9.1.tar.gz -source_hash = 4f3dea4979c30fbd85f46b8812bee5945bd6bb4487165eb01ecde57bbfbb332f - diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap deleted file mode 100644 index d52b0b3..0000000 --- a/subprojects/gtest.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = googletest-release-1.10.0 - -source_url = https://github.com/google/googletest/archive/release-1.10.0.zip -source_filename = gtest-1.10.0.zip -source_hash = 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.10.0/1/get_zip -patch_filename = gtest-1.10.0-1-wrap.zip -patch_hash = 04ff14e8880e4e465f6260221e9dfd56fea6bc7cce4c4aff0dc528e4a2c8f514 \ No newline at end of file diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap deleted file mode 100644 index 6282afd..0000000 --- a/subprojects/jansson.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = jansson-2.11 - -source_url = http://www.digip.org/jansson/releases/jansson-2.11.tar.bz2 -source_filename = jansson-2.11.tar.bz2 -source_hash = 783132e2fc970feefc2fa54199ef65ee020bd8e0e991a78ea44b8586353a0947 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/jansson/2.11/3/get_zip -patch_filename = jansson-2.11-3-wrap.zip -patch_hash = 0bcac510994890048d42658c674e33dd7d88715fc1e3bf49d10012f57b0e0020 \ No newline at end of file diff --git a/subprojects/libwebsockets.wrap b/subprojects/libwebsockets.wrap deleted file mode 100644 index f1aa3ee..0000000 --- a/subprojects/libwebsockets.wrap +++ /dev/null @@ -1,6 +0,0 @@ -[wrap-file] -directory = libwebsockets-4.0.13 - -source_url = https://github.com/warmcat/libwebsockets/archive/v4.0.13.zip -source_filename = v4.0.13.zip -source_hash = 0914ea3fdec496daf6b6a5c00f7ba1b52eb8cc3d55b66685df92920b232fd7a5 \ No newline at end of file diff --git a/subprojects/webfuse.wrap b/subprojects/webfuse.wrap deleted file mode 100644 index 1c26202..0000000 --- a/subprojects/webfuse.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-file] -directory = webfuse-0.5.0 - -source_url = https://github.com/falk-werner/webfuse/archive/v0.5.0.tar.gz -source_filename = webfuse-0.5.0.tar.gz -source_hash = 3a84aabab55dc4ca270a644b2c35704e31bcfbc3b42d40b673ab4071baf4c1fd - From 4e168aa324558c024da72c14ff5abd7f8342f50d Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:48:57 +0200 Subject: [PATCH 12/22] fix gtest version --- deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.sh b/deps.sh index 4b709d1..df61382 100644 --- a/deps.sh +++ b/deps.sh @@ -19,9 +19,9 @@ jansson_DIR=jansson-${jansson_VERSION} jansson_TYPE=cmake gtest_VERSION=1.10.0 -gtest_URL=https://github.com/google/googletest/archive/release-${1.10.0}.tar.gz +gtest_URL=https://github.com/google/googletest/archive/release-${gtest_VERSION}.tar.gz gtest_md5=ecd1fa65e7de707cd5c00bdac56022cd -gtest_DIR=googletest-release-${1.10.0} +gtest_DIR=googletest-release-${gtest_VERSION} gtest_TYPE=cmake webfuse_VERSION=0.5.0 From 69655c578499c13b33c896173b105c91d6f27d02 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:49:21 +0200 Subject: [PATCH 13/22] use meson compile and meson install --- install_deps.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/install_deps.sh b/install_deps.sh index 679bd10..3b50814 100755 --- a/install_deps.sh +++ b/install_deps.sh @@ -21,10 +21,10 @@ install_package() { meson) cd "${!PACKAGE_DIR}" meson build - cd build - ninja - sudo ninja install - cd ../.. + meson compile -C build + sudo meson install -C build + # DESTDIR=$DESTDIR ninja install + cd .. ;; cmake) mkdir "${!PACKAGE_DIR}/build" @@ -32,6 +32,7 @@ install_package() { cmake .. make sudo make install + # DESTDIR=$DESTDIR make install cd ../.. ;; *) @@ -41,6 +42,9 @@ install_package() { esac } +#DESTDIR=$(realpath .)/.deps +#rm -rf .${DESTDIR} +#mkdir ${DESTDIR} CURRENT_DIR=$(pwd) WORKING_DIR=$(mktemp -d /tmp/install_deps_XXXXXX) From 3aaf2a6792b815ed2cf3473b73256ff22eb03945 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 22:00:30 +0200 Subject: [PATCH 14/22] fix gtest md5 --- deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.sh b/deps.sh index df61382..7d86150 100644 --- a/deps.sh +++ b/deps.sh @@ -20,7 +20,7 @@ jansson_TYPE=cmake gtest_VERSION=1.10.0 gtest_URL=https://github.com/google/googletest/archive/release-${gtest_VERSION}.tar.gz -gtest_md5=ecd1fa65e7de707cd5c00bdac56022cd +gtest_MD5=ecd1fa65e7de707cd5c00bdac56022cd gtest_DIR=googletest-release-${gtest_VERSION} gtest_TYPE=cmake From c972c17bd231a059920bdcad48b1e8f568622b99 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 22:14:27 +0200 Subject: [PATCH 15/22] updated libfuse to 3.10.0, libwebsockets to 4.1.3, libjansson to 2.13.1 --- deps.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deps.sh b/deps.sh index 7d86150..97dbc1b 100644 --- a/deps.sh +++ b/deps.sh @@ -1,20 +1,20 @@ PACKAGES="libfuse lws jansson gtest webfuse" -libfuse_VERSION=3.9.1 +libfuse_VERSION=3.10.0 libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz -libfuse_MD5=5f7c1062def710d8b60343524a18cc82 +libfuse_MD5=22aec9bc9008eea6b17e203653d1b938 libfuse_DIR=libfuse-fuse-${libfuse_VERSION} libfuse_TYPE=meson -lws_VERSION=4.0.13 +lws_VERSION=4.1.3 lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=6403448e26d302501969afb0e128143b +lws_MD5=413cbe790ccb089001f53b2ee167b9c2 lws_DIR=libwebsockets-${lws_VERSION} lws_TYPE=cmake -jansson_VERSION=2.12 +jansson_VERSION=2.13.1 jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.gz -jansson_MD5=c4b106528d5ffb521178565de1ba950d +jansson_MD5=3d589a62053874893715453a46a32a0e jansson_DIR=jansson-${jansson_VERSION} jansson_TYPE=cmake From 0126bb53cbd1dd1298358dd8e81ec7aa92b4e2e9 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 22:28:18 +0200 Subject: [PATCH 16/22] downgrade libwebsockets to 4.0.13 (incompatible with webfuse 0.5.0) --- deps.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps.sh b/deps.sh index 97dbc1b..9506c45 100644 --- a/deps.sh +++ b/deps.sh @@ -6,9 +6,9 @@ libfuse_MD5=22aec9bc9008eea6b17e203653d1b938 libfuse_DIR=libfuse-fuse-${libfuse_VERSION} libfuse_TYPE=meson -lws_VERSION=4.1.3 +lws_VERSION=4.0.13 lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=413cbe790ccb089001f53b2ee167b9c2 +lws_MD5=6403448e26d302501969afb0e128143b lws_DIR=libwebsockets-${lws_VERSION} lws_TYPE=cmake From de791d278800d5495288d9613039f6fbb42bd39b Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 22:43:09 +0200 Subject: [PATCH 17/22] use install_deps script from github --- .travis.yml | 2 +- install_deps.sh | 58 ------------------------------------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100755 install_deps.sh diff --git a/.travis.yml b/.travis.yml index 2c4aad0..7293297 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ env: before_install: - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu - sudo pip3 install --system meson - - ./install_deps.sh + - bash <(curl -s https://raw.githubusercontent.com/falk-werner/install_deps/main/install_deps.sh) before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build diff --git a/install_deps.sh b/install_deps.sh deleted file mode 100755 index 3b50814..0000000 --- a/install_deps.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -. deps.sh - -set -e - -install_package() { - local PACKAGE="$1" - local PACKAGE_VERSION="${PACKAGE}_VERSION" - local PACKAGE_URL="${PACKAGE}_URL" - local PACKAGE_MD5="${PACKAGE}_MD5" - local PACKAGE_TYPE="${PACKAGE}_TYPE" - local PACKAGE_DIR="${PACKAGE}_DIR" - local FILENAME="${PACKAGE}_${!PACKAGE_VERSION}.tar.gz" - - wget "${!PACKAGE_URL}" -O "${FILENAME}" - md5sum -c <(echo "${!PACKAGE_MD5}" "${FILENAME}") - tar -xf ${FILENAME} - - case "${!PACKAGE_TYPE}" in - meson) - cd "${!PACKAGE_DIR}" - meson build - meson compile -C build - sudo meson install -C build - # DESTDIR=$DESTDIR ninja install - cd .. - ;; - cmake) - mkdir "${!PACKAGE_DIR}/build" - cd "${!PACKAGE_DIR}/build" - cmake .. - make - sudo make install - # DESTDIR=$DESTDIR make install - cd ../.. - ;; - *) - echo "error: unknown package type ${!PACKAGE_TYPE}" - exit 1 - ;; - esac -} - -#DESTDIR=$(realpath .)/.deps -#rm -rf .${DESTDIR} -#mkdir ${DESTDIR} - -CURRENT_DIR=$(pwd) -WORKING_DIR=$(mktemp -d /tmp/install_deps_XXXXXX) -cd ${WORKING_DIR} - -for package in ${PACKAGES} ; do - install_package $package -done - -cd ${CURRENT_DIR} -#rm -rf ${WORKING_DIR} From ea40e93f5b6ced227d5faaeb14ea126573330a53 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 17 Oct 2020 21:40:21 +0200 Subject: [PATCH 18/22] fix: use sudo when installing dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7293297..881b9b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ env: before_install: - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib/x86_64-linux-gnu - sudo pip3 install --system meson - - bash <(curl -s https://raw.githubusercontent.com/falk-werner/install_deps/main/install_deps.sh) + - bash <(curl -s https://raw.githubusercontent.com/falk-werner/install_deps/main/install_deps.sh) -s before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build From c71d04dcbe308b62f4ef97b0be1728e42d345f3b Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 17 Oct 2020 22:56:51 +0200 Subject: [PATCH 19/22] updated libwebsockets to 4.1.3; updated webfuse to 0.5.1 --- deps.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deps.sh b/deps.sh index 9506c45..7cc260c 100644 --- a/deps.sh +++ b/deps.sh @@ -6,9 +6,9 @@ libfuse_MD5=22aec9bc9008eea6b17e203653d1b938 libfuse_DIR=libfuse-fuse-${libfuse_VERSION} libfuse_TYPE=meson -lws_VERSION=4.0.13 +lws_VERSION=4.1.3 lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=6403448e26d302501969afb0e128143b +lws_MD5=413cbe790ccb089001f53b2ee167b9c2 lws_DIR=libwebsockets-${lws_VERSION} lws_TYPE=cmake @@ -24,8 +24,8 @@ gtest_MD5=ecd1fa65e7de707cd5c00bdac56022cd gtest_DIR=googletest-release-${gtest_VERSION} gtest_TYPE=cmake -webfuse_VERSION=0.5.0 +webfuse_VERSION=0.5.1 webfuse_URL=https://github.com/falk-werner/webfuse/archive/v${webfuse_VERSION}.tar.gz -webfuse_MD5=535c9f261c90c109a138daa3ee9f95ba +webfuse_MD5=a2e0e9d24cf7bc2d2273b5c64788adca webfuse_DIR=webfuse-${webfuse_VERSION} webfuse_TYPE=meson From 977f823a61a5ab44a9ce05123c9f2217b6ffc67e Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 17 Oct 2020 22:58:53 +0200 Subject: [PATCH 20/22] remanded package names to match pkg-config names --- deps.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/deps.sh b/deps.sh index 7cc260c..35c5f4a 100644 --- a/deps.sh +++ b/deps.sh @@ -1,16 +1,16 @@ -PACKAGES="libfuse lws jansson gtest webfuse" +PACKAGES="fuse3 libwebsockets jansson gtest webfuse" -libfuse_VERSION=3.10.0 -libfuse_URL=https://github.com/libfuse/libfuse/archive/fuse-${libfuse_VERSION}.tar.gz -libfuse_MD5=22aec9bc9008eea6b17e203653d1b938 -libfuse_DIR=libfuse-fuse-${libfuse_VERSION} -libfuse_TYPE=meson +fuse_VERSION=3.10.0 +fuse3_URL=https://github.com/libfuse/libfuse/archive/fuse-${fuse3_VERSION}.tar.gz +fuse3_MD5=22aec9bc9008eea6b17e203653d1b938 +fuse3_DIR=libfuse-fuse-${fuse3_VERSION} +fuse3_TYPE=meson -lws_VERSION=4.1.3 -lws_URL=https://github.com/warmcat/libwebsockets/archive/v${lws_VERSION}.tar.gz -lws_MD5=413cbe790ccb089001f53b2ee167b9c2 -lws_DIR=libwebsockets-${lws_VERSION} -lws_TYPE=cmake +libwebsockets_VERSION=4.1.3 +libwebsockets_URL=https://github.com/warmcat/libwebsockets/archive/v${libwebsockets_VERSION}.tar.gz +libwebsockets_MD5=413cbe790ccb089001f53b2ee167b9c2 +libwebsockets_DIR=libwebsockets-${libwebsockets_VERSION} +libwebsockets_TYPE=cmake jansson_VERSION=2.13.1 jansson_URL=https://github.com/akheron/jansson/archive/v${jansson_VERSION}.tar.gz From ea323634b1a5e35479c892528d59734077e40969 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 17 Oct 2020 23:02:29 +0200 Subject: [PATCH 21/22] fix: fixed typo --- deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.sh b/deps.sh index 35c5f4a..b436dcb 100644 --- a/deps.sh +++ b/deps.sh @@ -1,6 +1,6 @@ PACKAGES="fuse3 libwebsockets jansson gtest webfuse" -fuse_VERSION=3.10.0 +fuse3_VERSION=3.10.0 fuse3_URL=https://github.com/libfuse/libfuse/archive/fuse-${fuse3_VERSION}.tar.gz fuse3_MD5=22aec9bc9008eea6b17e203653d1b938 fuse3_DIR=libfuse-fuse-${fuse3_VERSION} From 8ad59f6bfa9af6eeb5e86e9e98f616e416ac2385 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 17 Oct 2020 23:35:16 +0200 Subject: [PATCH 22/22] quirk: increaded timeout multiplier for tests (fix test of daemon.run) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 881b9b9..5788d6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_script: - ninja script: - - meson test --print-errorlogs $CHECK_OPTS + - meson test --print-errorlogs -t 10 $CHECK_OPTS after_success: - bash <(curl -s https://codecov.io/bash) \ No newline at end of file