lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

config: Use env instead of code generation

Browse source 
Code generation messes with the actual source directory and makes it
impossible to use tools like clippy without having generated the config
via meson.
This commit is contained in:
Sophie Herold 2024-09-27 20:52:07 +02:00
parent 4370be282d
commit bf9392e8a2
9 changed files with 69 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/config.rs Normal file
View file

@ -0,0 +1,28 @@
// Copyright (c) 2024 Sophie Herold
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// SPDX-License-Identifier: GPL-3.0-or-later
pub const APP_ID: &str = default_env(option_env!("APP_ID"), "org.gnome.Loupe.Devel");
pub const PROFILE: &str = default_env(option_env!("PROFILE"), ".Devel");
pub const VERSION: &str = default_env(option_env!("VERSION"), "unknown");
pub const LOCALEDIR: &str = default_env(option_env!("LOCALEDIR"), "/usr/share/locale/");
const fn default_env(v: Option<&'static str>, default: &'static str) -> &'static str {
match v {
Some(v) => v,
None => default,
}
}

4
src/config.rs.in
View file

@ -1,4 +0,0 @@
pub const APP_ID: &str = "@APP_ID@";
pub const PROFILE: &str = "@PROFILE@";
pub const VERSION: &str = "@VERSION@";
pub const LOCALEDIR: &str = "@localedir@";

18
src/meson.build
View file

@ -1,16 +1,6 @@
configure_file(input: 'config.rs.in', output: 'config.rs', configuration: conf)
build_root = meson.project_build_root()
source_root = meson.project_source_root()
# Copy the config.rs output to the source directory.
run_command(
'cp',
build_root / 'src' / 'config.rs',
source_root / 'src' / 'config.rs',
check: true,
)
cargo_options = ['--manifest-path', source_root / 'Cargo.toml']
cargo_options += ['--target-dir', build_root / 'src']
@ -27,7 +17,13 @@ if gtk4_x11.found()
cargo_options += ['--features', 'x11']
endif
cargo_env = {'CARGO_HOME': build_root / 'cargo-home'}
cargo_env = {
'CARGO_HOME': build_root / 'cargo-home',
'APP_ID': app_id,
'PROFILE': profile,
'VERSION': version,
'LOCALEDIR': localedir,
}
cargo_build = custom_target(
'cargo-build',