diff --git a/.travis.yml b/.travis.yml index 79d18ac..5788d6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,9 @@ 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) -s before_script: - meson -Dbuildtype=$BUILD_TYPE -Db_coverage=$COVERAGE build @@ -44,7 +46,7 @@ before_script: - ninja script: - - meson test $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 diff --git a/deps.sh b/deps.sh new file mode 100644 index 0000000..b436dcb --- /dev/null +++ b/deps.sh @@ -0,0 +1,31 @@ +PACKAGES="fuse3 libwebsockets jansson gtest webfuse" + +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} +fuse3_TYPE=meson + +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 +jansson_MD5=3d589a62053874893715453a46a32a0e +jansson_DIR=jansson-${jansson_VERSION} +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_DIR=googletest-release-${gtest_VERSION} +gtest_TYPE=cmake + +webfuse_VERSION=0.5.1 +webfuse_URL=https://github.com/falk-werner/webfuse/archive/v${webfuse_VERSION}.tar.gz +webfuse_MD5=a2e0e9d24cf7bc2d2273b5c64788adca +webfuse_DIR=webfuse-${webfuse_VERSION} +webfuse_TYPE=meson 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 c221c21..2bdfb7c 100644 --- a/meson.build +++ b/meson.build @@ -8,17 +8,11 @@ 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: '>=4.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']) +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 -