aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/gems
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/repositories/gems')
-rw-r--r--paludis/repositories/gems/extra_distribution_data.cc4
-rw-r--r--paludis/repositories/gems/extra_distribution_data.hh4
-rw-r--r--paludis/repositories/gems/gem_specification.cc4
-rw-r--r--paludis/repositories/gems/gems_repository.cc28
-rw-r--r--paludis/repositories/gems/gems_repository_TEST.cc14
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc24
-rw-r--r--paludis/repositories/gems/params.hh16
7 files changed, 47 insertions, 47 deletions
diff --git a/paludis/repositories/gems/extra_distribution_data.cc b/paludis/repositories/gems/extra_distribution_data.cc
index 43ce4f3..0a39033 100644
--- a/paludis/repositories/gems/extra_distribution_data.cc
+++ b/paludis/repositories/gems/extra_distribution_data.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -38,7 +38,7 @@ namespace paludis
static std::tr1::shared_ptr<GemsDistribution> make_data(const std::tr1::shared_ptr<const KeyValueConfigFile> & k)
{
return make_shared_ptr(new GemsDistribution(make_named_values<GemsDistribution>(
- value_for<n::default_buildroot>(k->get("default_buildroot"))
+ n::default_buildroot() = k->get("default_buildroot")
)));
}
};
diff --git a/paludis/repositories/gems/extra_distribution_data.hh b/paludis/repositories/gems/extra_distribution_data.hh
index 5f8c211..990758d 100644
--- a/paludis/repositories/gems/extra_distribution_data.hh
+++ b/paludis/repositories/gems/extra_distribution_data.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2008 Ciaran McCreesh
+ * Copyright (c) 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -28,7 +28,7 @@ namespace paludis
{
namespace n
{
- struct default_buildroot;
+ typedef Name<struct default_buildroot_name> default_buildroot;
}
namespace gems
diff --git a/paludis/repositories/gems/gem_specification.cc b/paludis/repositories/gems/gem_specification.cc
index 37d6c4b..841f701 100644
--- a/paludis/repositories/gems/gem_specification.cc
+++ b/paludis/repositories/gems/gem_specification.cc
@@ -609,8 +609,8 @@ GemSpecification::need_masks_added() const
if (user_mask)
add_overridden_mask(make_shared_ptr(new OverriddenMask(
make_named_values<OverriddenMask>(
- value_for<n::mask>(user_mask),
- value_for<n::override_reason>(mro_overridden_by_user)
+ n::mask() = user_mask,
+ n::override_reason() = mro_overridden_by_user
))));
}
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 1c25260..0e629ac 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -92,12 +92,12 @@ namespace paludis
GemsRepository::GemsRepository(const gems::RepositoryParams & params) :
Repository(params.environment(), RepositoryName("gems"),
make_named_values<RepositoryCapabilities>(
- value_for<n::destination_interface>(static_cast<RepositoryDestinationInterface *>(0)),
- value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::make_virtuals_interface>(static_cast<RepositoryMakeVirtualsInterface *>(0)),
- value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
- value_for<n::provides_interface>(static_cast<RepositoryProvidesInterface *>(0)),
- value_for<n::virtuals_interface>(static_cast<RepositoryVirtualsInterface *>(0))
+ n::destination_interface() = static_cast<RepositoryDestinationInterface *>(0),
+ n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
+ n::make_virtuals_interface() = static_cast<RepositoryMakeVirtualsInterface *>(0),
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0),
+ n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
+ n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
PrivateImplementationPattern<GemsRepository>(new Implementation<GemsRepository>(params)),
_imp(PrivateImplementationPattern<GemsRepository>::_imp)
@@ -377,12 +377,12 @@ GemsRepository::repository_factory_create(
*DistributionData::get_instance()->distribution_from_string(env->distribution()))->default_buildroot();
return make_shared_ptr(new GemsRepository(make_named_values<gems::RepositoryParams>(
- value_for<n::builddir>(builddir),
- value_for<n::environment>(env),
- value_for<n::install_dir>(install_dir),
- value_for<n::location>(location),
- value_for<n::sync>(sync),
- value_for<n::sync_options>(sync_options)
+ n::builddir() = builddir,
+ n::environment() = env,
+ n::install_dir() = install_dir,
+ n::location() = location,
+ n::sync() = sync,
+ n::sync_options() = sync_options
)));
}
@@ -410,7 +410,7 @@ GemsRepository::populate_sets() const
HookResult
GemsRepository::perform_hook(const Hook &)
{
- return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
+ return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
bool
diff --git a/paludis/repositories/gems/gems_repository_TEST.cc b/paludis/repositories/gems/gems_repository_TEST.cc
index d1becae..858d953 100644
--- a/paludis/repositories/gems/gems_repository_TEST.cc
+++ b/paludis/repositories/gems/gems_repository_TEST.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -40,12 +40,12 @@ namespace test_cases
TestEnvironment env;
env.package_database()->add_repository(1, make_shared_ptr(new GemsRepository(
make_named_values<gems::RepositoryParams>(
- value_for<n::builddir>(FSEntry("gems_repository_TEST_dir/build")),
- value_for<n::environment>(&env),
- value_for<n::install_dir>(FSEntry("gems_repository_TEST_dir/install")),
- value_for<n::location>(FSEntry("gems_repository_TEST_dir/repo")),
- value_for<n::sync>(""),
- value_for<n::sync_options>("")
+ n::builddir() = FSEntry("gems_repository_TEST_dir/build"),
+ n::environment() = &env,
+ n::install_dir() = FSEntry("gems_repository_TEST_dir/install"),
+ n::location() = FSEntry("gems_repository_TEST_dir/repo"),
+ n::sync() = "",
+ n::sync_options() = ""
))));
}
} test_creation;
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index 7b86b21..ec361e0 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -97,12 +97,12 @@ InstalledGemsRepository::InstalledGemsRepository(const gems::InstalledRepository
Repository(params.environment(),
RepositoryName("installed-gems"),
make_named_values<RepositoryCapabilities>(
- value_for<n::destination_interface>(this),
- value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
- value_for<n::make_virtuals_interface>(static_cast<RepositoryMakeVirtualsInterface *>(0)),
- value_for<n::manifest_interface>(static_cast<RepositoryManifestInterface *>(0)),
- value_for<n::provides_interface>(static_cast<RepositoryProvidesInterface *>(0)),
- value_for<n::virtuals_interface>(static_cast<RepositoryVirtualsInterface *>(0))
+ n::destination_interface() = this,
+ n::environment_variable_interface() = static_cast<RepositoryEnvironmentVariableInterface *>(0),
+ n::make_virtuals_interface() = static_cast<RepositoryMakeVirtualsInterface *>(0),
+ n::manifest_interface() = static_cast<RepositoryManifestInterface *>(0),
+ n::provides_interface() = static_cast<RepositoryProvidesInterface *>(0),
+ n::virtuals_interface() = static_cast<RepositoryVirtualsInterface *>(0)
)),
PrivateImplementationPattern<InstalledGemsRepository>(new Implementation<InstalledGemsRepository>(params)),
_imp(PrivateImplementationPattern<InstalledGemsRepository>::_imp)
@@ -412,10 +412,10 @@ InstalledGemsRepository::repository_factory_create(
root = "/";
return make_shared_ptr(new InstalledGemsRepository(make_named_values<gems::InstalledRepositoryParams>(
- value_for<n::builddir>(builddir),
- value_for<n::environment>(env),
- value_for<n::install_dir>(install_dir),
- value_for<n::root>(root)
+ n::builddir() = builddir,
+ n::environment() = env,
+ n::install_dir() = install_dir,
+ n::root() = root
)));
}
@@ -428,7 +428,7 @@ InstalledGemsRepository::populate_sets() const
HookResult
InstalledGemsRepository::perform_hook(const Hook &)
{
- return make_named_values<HookResult>(value_for<n::max_exit_status>(0), value_for<n::output>(""));
+ return make_named_values<HookResult>(n::max_exit_status() = 0, n::output() = "");
}
bool
diff --git a/paludis/repositories/gems/params.hh b/paludis/repositories/gems/params.hh
index 2d6d88f..c5adda9 100644
--- a/paludis/repositories/gems/params.hh
+++ b/paludis/repositories/gems/params.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2010 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -32,13 +32,13 @@ namespace paludis
namespace n
{
- struct builddir;
- struct environment;
- struct install_dir;
- struct location;
- struct root;
- struct sync;
- struct sync_options;
+ typedef Name<struct builddir_name> builddir;
+ typedef Name<struct environment_name> environment;
+ typedef Name<struct install_dir_name> install_dir;
+ typedef Name<struct location_name> location;
+ typedef Name<struct root_name> root;
+ typedef Name<struct sync_name> sync;
+ typedef Name<struct sync_options_name> sync_options;
}
namespace gems