From 73895f22e7d6ba51615448e305815114f304b948 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Moreno?= Date: Wed, 8 Nov 2017 12:44:55 +0100 Subject: [PATCH] Compiling and install using meson --- .gitignore | 3 + README.md | 13 ++- build.rs | 23 +++++ configure | 183 ++++++++++++++++++++++++++++++++++ meson.build | 30 ++++++ res/{icon.svg => fractal.svg} | 0 res/org.gnome.Fractal.desktop | 11 ++ scripts/cargo.sh | 3 + src/app.rs | 11 +- 9 files changed, 272 insertions(+), 5 deletions(-) create mode 100644 build.rs create mode 100755 configure create mode 100644 meson.build rename res/{icon.svg => fractal.svg} (100%) create mode 100644 res/org.gnome.Fractal.desktop create mode 100755 scripts/cargo.sh diff --git a/.gitignore b/.gitignore index 891bfb54..5aecb404 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ target *~ *.swp *.swo +Makefile +_build +Cargo.lock diff --git a/README.md b/README.md index 9762cfb3..f091f3ab 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,17 @@ Fractal is a Gtk+ Matrix.org client written in Rust. ![screenshot](https://gitlab.gnome.org/danigm/fractal/raw/master/screenshots/fractal.png) +## How to Build + +You need meson and jinja to build this project. Rust and cargo are also +needed. + +``` +./configure --prefix=/usr/local +make +sudo make install +``` + ## Supported m.room.message (msgtypes) msgtypes | Recv | Send @@ -33,4 +44,4 @@ REST API. The first version of this project was called guillotine, based on french revolution, in relation with the Riot client name, but it's a negative name so we decide -to change for a math one. \ No newline at end of file +to change for a math one. diff --git a/build.rs b/build.rs new file mode 100644 index 00000000..05ce6713 --- /dev/null +++ b/build.rs @@ -0,0 +1,23 @@ +use std::env; +use std::fs::File; +use std::io::Write; +use std::path::Path; + + +fn main() { + let out_dir = env::var("OUT_DIR").unwrap(); + let fractal_res = env::var("FRACTAL_RES").unwrap_or(String::from("res")); + let dest_path = Path::new(&out_dir).join("config.rs"); + let mut f = File::create(&dest_path).unwrap(); + + let code = format!(" + mod config {{ + pub fn datadir(res: &str) -> String {{ + let out = String::from(\"{}/\"); + out + res + }} + }} + ", fractal_res); + + f.write_all(code.as_bytes()).unwrap(); +} diff --git a/configure b/configure new file mode 100755 index 00000000..4f4f1a97 --- /dev/null +++ b/configure @@ -0,0 +1,183 @@ +#!/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 default_options=( + ['introspection']=true +) + +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 <