Merge pull request #66 from linux-credentials/cargo-offline-builds

Cargo offline builds

Author: iinuwa

credentialsd-common/meson.build

@@ -35,5 +35,8 @@
 # cargo_options += [
 #   '--target-dir', meson.project_build_root() / meson.current_build_dir() / 'target',
 # ]
+# if get_option('cargo_offline') == true
+#   cargo_options += ['--offline']
+# endif
 #
-# subdir('src')
+# subdir('src')

credentialsd-common/src/meson.build

@@ -10,7 +10,7 @@
 #   message('Building in debug mode')
 # endif
 #
-# cargo_env = ['CARGO_HOME=' + meson.project_build_root() / 'cargo-home']
+# cargo_env = ['CARGO_HOME=' + cargo_home]
 #
 # custom_target(
 #   'cargo-build',
@@ -31,4 +31,4 @@
 #     common_lib_name / 'src' / rust_target / common_lib_name,
 #     '@OUTPUT@',
 #   ],
-# )
+# )

credentialsd-ui/meson.build

@@ -63,6 +63,14 @@ if get_option('profile') == 'development'
   run_command('cp', '-f', 'hooks/pre-commit.hook', '.git/hooks/pre-commit', check: false)
 endif
 
+cargo_options = [
+  '--manifest-path', meson.project_source_root() / gui_source_dir / 'Cargo.toml',
+]
+cargo_options += ['--target-dir', meson.project_build_root() / gui_build_dir / 'target']
+if get_option('cargo_offline') == true
+  cargo_options += ['--offline']
+endif
+
 subdir('data')
 subdir('po')
 subdir('src')

credentialsd-ui/src/meson.build

@@ -22,11 +22,6 @@ run_command(
   check: true,
 )
 
-cargo_options = [
-  '--manifest-path', meson.project_source_root() / gui_source_dir / 'Cargo.toml',
-]
-cargo_options += ['--target-dir', meson.project_build_root() / gui_build_dir / 'target']
-
 if get_option('profile') == 'default'
   cargo_options += ['--release']
   rust_target = 'release'
@@ -36,7 +31,7 @@ else
   message('Building in debug mode')
 endif
 
-cargo_env = ['CARGO_HOME=' + meson.project_build_root() / 'cargo-home']
+cargo_env = ['CARGO_HOME=' + cargo_home]
 
 custom_target(
   'cargo-build',
@@ -72,4 +67,4 @@ test(
     '--nocapture',
   ],
   protocol: 'exitcode',
-)
+)

credentialsd/meson.build

@@ -48,6 +48,9 @@ cargo_options = [
 cargo_options += [
   '--target-dir', meson.project_build_root() / meson.current_build_dir() / 'target',
 ]
+if get_option('cargo_offline') == true
+  cargo_options += ['--offline']
+endif
 
 subdir('src')
-subdir('tests')
+subdir('tests')

credentialsd/src/meson.build

@@ -7,7 +7,7 @@ else
   message('Building in debug mode')
 endif
 
-cargo_env = ['CARGO_HOME=' + meson.project_build_root() / 'cargo-home']
+cargo_env = ['CARGO_HOME=' + cargo_home]
 message('@0@'.format(cargo_options))
 
 custom_target(
@@ -43,4 +43,4 @@ test(
     '--nocapture',
   ],
   protocol: 'exitcode',
-)
+)

meson.build

@@ -12,6 +12,11 @@ prefix = get_option('prefix')
 bindir = prefix / get_option('bindir')
 localedir = prefix / get_option('localedir')
 
+cargo_home = get_option('cargo_home')
+if cargo_home == ''
+  cargo_home = meson.project_build_root() / 'cargo-home'
+endif
+
 meson.add_dist_script(
   'build-aux/dist-vendor.sh',
   meson.project_build_root() / 'meson-dist' / meson.project_name()

meson.options

@@ -0,0 +1,18 @@
+option(
+  'profile',
+  type: 'combo',
+  choices: ['default', 'development'],
+  value: 'default',
+  description: 'The build profile for Credential Manager. One of "default" or "development".',
+)
+option(
+  'cargo_home',
+  type: 'string',
+  description: 'The directory to store files downloaded by Cargo',
+)
+option(
+  'cargo_offline',
+  type: 'boolean',
+  value: false,
+  description: 'Whether to perform an offline build with Cargo. Defaults to false to download crates from registries.',
+)