From bc6da31178f41916cb16fd696981b6ff4a78fbd5 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 10 Nov 2017 17:53:09 +0200 Subject: [PATCH 1/7] Initial meson build. --- Makefile | 35 +--- ...mond.desktop => org.gnome.Hammond.desktop} | 0 configure | 179 ++++++++++++++++++ meson.build | 32 ++++ scripts/cargo.sh | 3 + scripts/releash.sh | 36 ++++ 6 files changed, 259 insertions(+), 26 deletions(-) rename assets/{hammond.desktop => org.gnome.Hammond.desktop} (100%) create mode 100755 configure create mode 100644 meson.build create mode 100644 scripts/cargo.sh create mode 100644 scripts/releash.sh diff --git a/Makefile b/Makefile index f0f0f8e..49f2d98 100644 --- a/Makefile +++ b/Makefile @@ -1,33 +1,16 @@ -# Stolen from: -# https://github.com/mmstick/tv-renamer/blob/3f9e274e1b2300209172d4b3c991e9e7952b7259/Makefile - -DESTDIR = /usr +# Generated by configure; do not edit all: - cargo build --release + /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build install: - install -Dm 755 "target/release/hammond-gtk" "${DESTDIR}/bin/hammond" - ln -sf "${DESTDIR}/bin/hammond" "${DESTDIR}/bin/hammond-gtk" - install -Dm 644 "assets/hammond.desktop" "${DESTDIR}/share/applications/hammond.desktop" - install -Dm 644 README.md "${DESTDIR}/share/doc/hammond/README" - install -Dm 644 LICENSE "${DESTDIR}/share/licenses/hammond/COPYING" - -tar: - install -Dm 755 "target/release/hammond-gtk" "hammond/bin/hammond" - ln -sf "hammond/bin/hammond" "hammond/bin/hammond-gtk" - install -Dm 644 "assets/hammond.desktop" "hammond/share/applications/hammond.desktop" - install -Dm 644 README.md "hammond/share/doc/hammond/README" - install -Dm 644 LICENSE "hammond/share/licenses/hammond/COPYING" - tar cf - "hammond" | xz -zf > "hammond_$(shell uname -m).tar.xz" - rm -rf hammond + DESTDIR="$(DESTDIR)" /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build install uninstall: - rm "${DESTDIR}/bin/hammond" - rm "${DESTDIR}/bin/hammond-gtk" - rm "${DESTDIR}/share/applications/hammond.desktop" - rm "${DESTDIR}/share/doc/hammond/README" - rm "${DESTDIR}/share/licenses/hammond/COPYING" + /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build uninstall -clean: - cargo clean +release: + /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build release + +check: + /usr/bin/mesontest -C /home/alatiera/projects/rust/hammond/_build diff --git a/assets/hammond.desktop b/assets/org.gnome.Hammond.desktop similarity index 100% rename from assets/hammond.desktop rename to assets/org.gnome.Hammond.desktop diff --git a/configure b/configure new file mode 100755 index 0000000..0a14e10 --- /dev/null +++ b/configure @@ -0,0 +1,179 @@ +#!/bin/bash +# configure script adapter for Meson +# Based on build-api: https://github.com/cgwalters/build-api +# Copyright 2010, 2011, 2013 Colin Walters +# Copyright 2016, 2017 Emmanuele Bassi +# Copyright 2017 Iñigo Martínez +# Licensed under the new-BSD license (http://www.opensource.org/licenses/bsd-license.php) + +# Build API variables: + +# Little helper function for reading args from the commandline. +# it automatically handles -a b and -a=b variants, and returns 1 if +# we need to shift $3. +read_arg() { + # $1 = arg name + # $2 = arg value + # $3 = arg parameter + local rematch='^[^=]*=(.*)$' + if [[ $2 =~ $rematch ]]; then + read "$1" <<< "${BASH_REMATCH[1]}" + else + read "$1" <<< "$3" + # There is no way to shift our callers args, so + # return 1 to indicate they should do it instead. + return 1 + fi +} + +sanitycheck() { + # $1 = arg name + # $1 = arg command + # $2 = arg alternates + local cmd=$( which $2 2>/dev/null ) + + if [ -x "$cmd" ]; then + read "$1" <<< "$cmd" + return 0 + fi + + test -z $3 || { + for alt in $3; do + cmd=$( which $alt 2>/dev/null ) + + if [ -x "$cmd" ]; then + read "$1" <<< "$cmd" + return 0 + fi + done + } + + echo -e "\e[1;31mERROR\e[0m: Command '$2' not found" + exit 1 +} + +checkoption() { + # $1 = arg + option="${1#*--}" + action="${option%%-*}" + name="${option#*-}" + if [ ${default_options[$name]+_} ]; then + case "$action" in + enable) meson_options[$name]=true;; + disable) meson_options[$name]=false;; + *) echo -e "\e[1;33mINFO\e[0m: Ignoring unknown action '$action'";; + esac + else + echo -e "\e[1;33mINFO\e[0m: Ignoring unknown option '$option'" + fi +} + +echooption() { + # $1 = option + if [ ${meson_options[$1]+_} ]; then + echo ${meson_options[$1]} + elif [ ${default_options[$1]+_} ]; then + echo ${default_options[$1]} + fi +} + +sanitycheck MESON 'meson' +sanitycheck MESONTEST 'mesontest' +sanitycheck NINJA 'ninja' 'ninja-build' + +declare -A meson_options + +while (($# > 0)); do + case "${1%%=*}" in + --prefix) read_arg prefix "$@" || shift;; + --bindir) read_arg bindir "$@" || shift;; + --sbindir) read_arg sbindir "$@" || shift;; + --libexecdir) read_arg libexecdir "$@" || shift;; + --datarootdir) read_arg datarootdir "$@" || shift;; + --datadir) read_arg datadir "$@" || shift;; + --sysconfdir) read_arg sysconfdir "$@" || shift;; + --libdir) read_arg libdir "$@" || shift;; + --mandir) read_arg mandir "$@" || shift;; + --includedir) read_arg includedir "$@" || shift;; + *) checkoption $1;; + esac + shift +done + +# Defaults +test -z ${prefix} && prefix="/usr/local" +test -z ${bindir} && bindir=${prefix}/bin +test -z ${sbindir} && sbindir=${prefix}/sbin +test -z ${libexecdir} && libexecdir=${prefix}/bin +test -z ${datarootdir} && datarootdir=${prefix}/share +test -z ${datadir} && datadir=${datarootdir} +test -z ${sysconfdir} && sysconfdir=${prefix}/etc +test -z ${libdir} && libdir=${prefix}/lib +test -z ${mandir} && mandir=${prefix}/share/man +test -z ${includedir} && includedir=${prefix}/include + +# The source directory is the location of this file +srcdir=$(dirname $0) + +# The build directory is the current location +builddir=`pwd` + +# If we're calling this file from the source directory then +# we automatically create a build directory and ensure that +# both Meson and Ninja invocations are relative to that +# location +if [[ -f "${builddir}/meson.build" ]]; then + mkdir -p _build + builddir="${builddir}/_build" + NINJA_OPT="-C ${builddir}" +fi + +# Wrapper Makefile for Ninja +cat > Makefile < $DIST/.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF +cp -rf vendor $DIST/ + +# packaging +cd $DEST/dist +tar -czvf $VERSION.tar.gz $VERSION From 1199c9aa812808c6f80627f1db60fe2430c4a367 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 13:29:11 +0200 Subject: [PATCH 2/7] Now building with meson. --- .gitignore | 2 ++ Makefile | 16 ---------------- configure | 3 --- meson.build | 11 ++++------- scripts/releash.sh | 36 ------------------------------------ 5 files changed, 6 insertions(+), 62 deletions(-) delete mode 100644 Makefile delete mode 100644 scripts/releash.sh diff --git a/.gitignore b/.gitignore index 406e282..597aa90 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ Cargo.lock .vscode *.ui~ *.gresource +_build +vendor/ diff --git a/Makefile b/Makefile deleted file mode 100644 index 49f2d98..0000000 --- a/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Generated by configure; do not edit - -all: - /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build - -install: - DESTDIR="$(DESTDIR)" /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build install - -uninstall: - /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build uninstall - -release: - /usr/bin/ninja -C /home/alatiera/projects/rust/hammond/_build release - -check: - /usr/bin/mesontest -C /home/alatiera/projects/rust/hammond/_build diff --git a/configure b/configure index 0a14e10..3e7bd77 100755 --- a/configure +++ b/configure @@ -141,9 +141,6 @@ install: uninstall: ${NINJA} ${NINJA_OPT} uninstall -release: - ${NINJA} ${NINJA_OPT} release - check: ${MESONTEST} ${NINJA_OPT} END diff --git a/meson.build b/meson.build index 7e5acd4..9b0f5d8 100644 --- a/meson.build +++ b/meson.build @@ -11,22 +11,19 @@ hammond_minor_version = version_array[1].to_int() hammond_version_micro = version_array[2].to_int() hammond_prefix = get_option('prefix') -hammond_datadir = join_paths(hammond_prefix, get_option('datadir'), 'hammond') hammond_bindir = join_paths(hammond_prefix, get_option('bindir')) install_data('assets/org.gnome.Hammond.desktop', install_dir : get_option('datadir') + '/applications') cargo = find_program('cargo', required: false) +gresource = find_program('glib-compile-resources', required: false) +cargo_vendor = find_program('cargo-vendor', required: false) cargo_script = find_program('scripts/cargo.sh') + cargo_release = custom_target('cargo-build', build_by_default: true, - build_always: true, output: ['hammond'], install: true, install_dir: hammond_bindir, - command: ['HAMMOND_RES=' + hammond_datadir, cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@']) + command: [cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@']) -cargo = find_program('cargo-vendor', required: false) -run_target('release', command: ['scripts/release.sh', - meson.project_name() + '-' + hammond_version - ]) diff --git a/scripts/releash.sh b/scripts/releash.sh deleted file mode 100644 index 604709f..0000000 --- a/scripts/releash.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -VERSION=$1 -DEST=${MESON_BUILD_ROOT} -DIST=$DEST/dist/$VERSION - - -cd "${MESON_SOURCE_ROOT}" -mkdir -p $DIST - -# copying files -cp -rf src $DIST -cp build.rs $DIST -cp Cargo.toml $DIST -cp configure $DIST -cp meson.build $DIST -cp LICENSE.txt $DIST -cp README.md $DIST -cp -rf res $DIST -cp -rf scripts $DIST - -# cargo vendor -cargo vendor -mkdir $DIST/.cargo -cat < $DIST/.cargo/config -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF -cp -rf vendor $DIST/ - -# packaging -cd $DEST/dist -tar -czvf $VERSION.tar.gz $VERSION From 825f751bc2817866eb943dfb7e4a65eb638bf75e Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 13:38:09 +0200 Subject: [PATCH 3/7] .desktop file fix. --- assets/org.gnome.Hammond.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/org.gnome.Hammond.desktop b/assets/org.gnome.Hammond.desktop index 43942ca..829c093 100644 --- a/assets/org.gnome.Hammond.desktop +++ b/assets/org.gnome.Hammond.desktop @@ -3,7 +3,7 @@ Name=Hammond GenericName=Podcast Client Comment=Play, Subscribe and Manage Podcast Feeds. Icon=multimedia-player -Exec=hammond-gtk +Exec=hammond Terminal=false Type=Application StartupNotify=true From 021f616aef3571563a2597854f96096b75fb0b80 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 14:30:29 +0200 Subject: [PATCH 4/7] Added make release option. --- configure | 3 +++ meson.build | 4 ++++ scripts/cargo.sh | 0 scripts/release.sh | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 48 insertions(+) mode change 100644 => 100755 scripts/cargo.sh create mode 100755 scripts/release.sh diff --git a/configure b/configure index 3e7bd77..0a14e10 100755 --- a/configure +++ b/configure @@ -141,6 +141,9 @@ install: uninstall: ${NINJA} ${NINJA_OPT} uninstall +release: + ${NINJA} ${NINJA_OPT} release + check: ${MESONTEST} ${NINJA_OPT} END diff --git a/meson.build b/meson.build index 9b0f5d8..0100ab6 100644 --- a/meson.build +++ b/meson.build @@ -27,3 +27,7 @@ cargo_release = custom_target('cargo-build', install_dir: hammond_bindir, command: [cargo_script, '@CURRENT_SOURCE_DIR@', '@OUTPUT@']) +run_target('release', command: ['scripts/release.sh', + meson.project_name() + '-' + hammond_version + ], + depends: [cargo_release]) diff --git a/scripts/cargo.sh b/scripts/cargo.sh old mode 100644 new mode 100755 diff --git a/scripts/release.sh b/scripts/release.sh new file mode 100755 index 0000000..9715f8b --- /dev/null +++ b/scripts/release.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +VERSION=$1 +DEST=${MESON_BUILD_ROOT} +DIST=$DEST/dist/$VERSION + + +cd "${MESON_SOURCE_ROOT}" +mkdir -p $DIST + +# copying files +cp -rf hammond-data $DIST +cp -rf hammond-gtk $DIST +cp -rf hammond-downloader $DIST +cp build.rs $DIST +cp Cargo.toml $DIST +cp configure $DIST +cp meson.build $DIST +cp Hammond.doap $DIST +cp LICENSE $DIST +cp README.md $DIST +# cp -rf assets/org.gnome.Hammond.desktop $DIST +cp -rf assets $DIST +cp -rf scripts $DIST + +# cargo vendor +cargo vendor +mkdir $DIST/.cargo +cat < $DIST/.cargo/config +[source.crates-io] +replace-with = "vendored-sources" + +[source.vendored-sources] +directory = "vendor" +EOF +cp -rf vendor $DIST/ + +# packaging +cd $DEST/dist +tar -czvf $VERSION.tar.gz $VERSION + From b39f635cf52989f6938c8317748165b93920a222 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 14:39:03 +0200 Subject: [PATCH 5/7] Updated readme. --- README.md | 1 + configure | 3 +++ meson.build | 3 +++ 3 files changed, 7 insertions(+) diff --git a/README.md b/README.md index 64aebf6..08f1285 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ cargo run -p hammond-gtk --release ```sh git clone https://gitlab.gnome.org/alatiera/hammond.git cd Hammond/ +./configure --prefix=/usr/local make && sudo make install ``` diff --git a/configure b/configure index 0a14e10..6795f73 100755 --- a/configure +++ b/configure @@ -1,3 +1,6 @@ +# Adapted from: +# https://gitlab.gnome.org/danigm/libgepub/blob/27f0d374e0c8f6fa972dbd111d4ce0c0f3096914/configure_meson + #!/bin/bash # configure script adapter for Meson # Based on build-api: https://github.com/cgwalters/build-api diff --git a/meson.build b/meson.build index 0100ab6..f0f4be9 100644 --- a/meson.build +++ b/meson.build @@ -1,3 +1,6 @@ +# Adatped from: +# https://gitlab.gnome.org/danigm/fractal/blob/6e2911f9d2353c99a18a6c19fab7f903c4bbb431/meson.build + project( 'hammond', 'rust', version: '0.1.0', From 4e4a9d799a6b674c7c2941867e399ff5ada80f79 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 14:47:22 +0200 Subject: [PATCH 6/7] Added meson build into the gitlab-ci. --- .gitlab-ci.yml | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d53e255..f273064 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,3 @@ -# Optional: Install a C compiler, cmake and git into the container. -# You will often need this when you (or any of your dependencies) depends on C code. before_script: - apt-get update -yqq - apt-get install -yqq --no-install-recommends build-essential @@ -11,30 +9,47 @@ before_script: # variables: # RUSTFLAGS: "-C link-dead-code" +# Build with meson +build:stable: + # Stable img + # https://hub.docker.com/_/rust/ + image: "rust" + script: + - rustc --version && cargo --version + - ./configure --prefix=/usr/local + - make && sudo make install + +build:nightly: + # Nightly + # https://hub.docker.com/r/rustlang/rust/ + image: "rustlang/rust:nightly" + script: + - rustc --version && cargo --version + - ./configure --prefix=/usr/local + - make && sudo make install + test:stable: # Stable img # https://hub.docker.com/_/rust/ image: "rust" script: - - rustc --version && cargo --version # Print version info for debugging + - rustc --version && cargo --version - cargo build --all - cargo test --all --verbose - # - cargo test --all --verbose --jobs 1 test:nightly: # Nightly # https://hub.docker.com/r/rustlang/rust/ image: "rustlang/rust:nightly" script: - - rustc --version && cargo --version # Print version info for debugging + - rustc --version && cargo --version - cargo build --all - cargo test --all --verbose - # - cargo test --all --verbose --jobs 1 # - cargo bench # Configure and run rustfmt on nightly # Exits and builds fails if on bad format -test:rustfmt: +rustfmt: image: "rustlang/rust:nightly" before_script: - apt-get update -yqq @@ -48,7 +63,7 @@ test:rustfmt: # Configure and run clippy on nightly # Only fails on errors atm. -test:clippy: +clippy: image: "rustlang/rust:nightly" before_script: - apt-get update -yqq From 49bf8f3d043503d3ae54813e1164e953951feda4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Sat, 11 Nov 2017 15:34:46 +0200 Subject: [PATCH 7/7] Disabled meson builds from the ci. --- .gitlab-ci.yml | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f273064..bad76c9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,15 @@ +stages: + # meson uses cargo to do the build + # so it's ok to have the tests first. + - test + # - build + - lint + before_script: - apt-get update -yqq - apt-get install -yqq --no-install-recommends build-essential - apt-get install -yqq --no-install-recommends libgtk-3-dev +# - apt-get install -yqq --no-install-recommends meson # kcov # - apt-get install -y libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc binutils-dev libiberty-dev @@ -9,24 +17,25 @@ before_script: # variables: # RUSTFLAGS: "-C link-dead-code" -# Build with meson -build:stable: - # Stable img - # https://hub.docker.com/_/rust/ - image: "rust" - script: - - rustc --version && cargo --version - - ./configure --prefix=/usr/local - - make && sudo make install +# Currently doesnt work. +# # Build with meson +# build:stable: +# # Stable img +# # https://hub.docker.com/_/rust/ +# image: "rust" +# script: +# - rustc --version && cargo --version +# - ./configure --prefix=/usr/local +# - make && sudo make install -build:nightly: - # Nightly - # https://hub.docker.com/r/rustlang/rust/ - image: "rustlang/rust:nightly" - script: - - rustc --version && cargo --version - - ./configure --prefix=/usr/local - - make && sudo make install +# build:nightly: +# # Nightly +# # https://hub.docker.com/r/rustlang/rust/ +# image: "rustlang/rust:nightly" +# script: +# - rustc --version && cargo --version +# - ./configure --prefix=/usr/local +# - make && sudo make install test:stable: # Stable img @@ -49,7 +58,7 @@ test:nightly: # Configure and run rustfmt on nightly # Exits and builds fails if on bad format -rustfmt: +lint:rustfmt: image: "rustlang/rust:nightly" before_script: - apt-get update -yqq @@ -63,7 +72,7 @@ rustfmt: # Configure and run clippy on nightly # Only fails on errors atm. -clippy: +lint:clippy: image: "rustlang/rust:nightly" before_script: - apt-get update -yqq