Skip to content

Commit 4dc8ff7

Browse files
authored
Merge pull request #126 from linux-credentials/push-zmokxltvwuuz
Fix executable copying on build
2 parents a4b64a7 + 99ff327 commit 4dc8ff7

3 files changed

Lines changed: 10 additions & 4 deletions

File tree

BUILDING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ environment variables.
116116
# Run the server, with debug logging enabled
117117
export GSETTINGS_SCHEMA_DIR=build/credentialsd-ui/data
118118
export RUST_LOG=credentialsd=debug,credentials_ui=debug
119-
./build/credentialsd/target/debug/credentialsd &
120-
./build/credentialsd-ui/target/debug/credentialsd-ui
119+
./build/credentialsd/src/credentialsd &
120+
./build/credentialsd-ui/src/credentialsd-ui
121121
```
122122

123123
## Testing development builds with Firefox Web Add-On

credentialsd-ui/src/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,16 @@ custom_target(
5050
install_dir: bindir,
5151
depends: resources,
5252
command: [
53+
'rm',
54+
'-f', '@OUTPUT@',
55+
'&&',
5356
'env',
5457
cargo_env,
5558
cargo,
5659
'build',
5760
cargo_options,
5861
'&&',
59-
'cp',
62+
'ln',
6063
cargo_target_dir / rust_profile / gui_executable_name,
6164
'@OUTPUT@',
6265
],

credentialsd/src/meson.build

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,16 @@ custom_target(
1919
install: true,
2020
install_dir: bindir,
2121
command: [
22+
'rm',
23+
'-f', '@OUTPUT@',
24+
'&&',
2225
'env',
2326
cargo_env,
2427
cargo,
2528
'build',
2629
cargo_options,
2730
'&&',
28-
'cp',
31+
'ln',
2932
cargo_target_dir / rust_profile / backend_executable_name,
3033
'@OUTPUT@',
3134
],

0 commit comments

Comments
 (0)