aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-03 19:31:23 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-09-03 19:31:23 +0000
commitddbda2276f9b38ea50387a9f843438ae7bae8cce (patch)
tree5104567c76f20d4d59c4185faaf34db1fd80b256
parent89c8f4eb442e8e204a8e296f22cf5d5e1f476526 (diff)
downloadpaludis-ddbda2276f9b38ea50387a9f843438ae7bae8cce.tar.gz
paludis-ddbda2276f9b38ea50387a9f843438ae7bae8cce.tar.xz
buildroot -> builddir. Fixes: ticket:348
-rw-r--r--doc/configuration.html.skel6
-rw-r--r--paludis/distribution.cc2
-rw-r--r--paludis/distribution.sr2
-rw-r--r--paludis/distributions/gentoo.conf2
-rw-r--r--paludis/environments/portage/portage_environment.cc16
-rw-r--r--paludis/repositories/cran/cran_installed_repository_TEST.cc2
-rw-r--r--paludis/repositories/cran/cran_repository.cc15
-rw-r--r--paludis/repositories/cran/cran_repository.sr2
-rw-r--r--paludis/repositories/cran/cran_repository_TEST.cc4
-rw-r--r--paludis/repositories/e/e_repository.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc4
-rw-r--r--paludis/repositories/e/e_repository_params.sr2
-rw-r--r--paludis/repositories/e/ebin.cc6
-rw-r--r--paludis/repositories/e/ebin.sr2
-rw-r--r--paludis/repositories/e/ebuild.cc6
-rw-r--r--paludis/repositories/e/ebuild.sr2
-rw-r--r--paludis/repositories/e/ebuild_entries.cc16
-rw-r--r--paludis/repositories/e/ebuild_id.cc2
-rw-r--r--paludis/repositories/e/make_ebin_repository.cc15
-rw-r--r--paludis/repositories/e/make_ebuild_repository.cc15
-rw-r--r--paludis/repositories/e/vdb_repository.cc20
-rw-r--r--paludis/repositories/e/vdb_repository.sr2
-rw-r--r--paludis/repositories/gems/gems_repository.cc2
-rw-r--r--paludis/repositories/gems/gems_repository_TEST.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository.cc2
-rw-r--r--paludis/repositories/gems/installed_gems_repository_TEST.cc2
-rw-r--r--paludis/repositories/gems/params.sr4
-rw-r--r--paludis/repositories/gems/registration.cc16
-rw-r--r--vim/syntax/paludis-repositories-conf.vim2
29 files changed, 98 insertions, 77 deletions
diff --git a/doc/configuration.html.skel b/doc/configuration.html.skel
index 751a309..9bba212 100644
--- a/doc/configuration.html.skel
+++ b/doc/configuration.html.skel
@@ -294,7 +294,7 @@ does, Paludis executes the latter and pretends that its stdout is the content of
<li><code>profiles</code> (mandatory), which should be a space separated list of
directories used for profile data. Later directories have priority. Inherited from
<code>master_repository</code> if unset.</li>
- <li><code>buildroot</code> (default: <code>/var/tmp/paludis</code>), which controls
+ <li><code>builddir</code> (default: <code>/var/tmp/paludis</code>), which controls
the temporary directory used by Paludis for compiling software.</li>
<li><code>cache</code> (default: <code>${location}/metadata/cache</code>), which
controls the location of the metadata cache for a repository. It should be set
@@ -359,7 +359,7 @@ been installed from a <code>ebuild</code> format repository.</p>
<ul>
<li><code>location</code> (mandatory), which <strong>must</strong> be set to
<code>${ROOT}/var/db/pkg</code>.</li>
- <li><code>buildroot</code> (default: <code>/var/tmp/paludis</code>), which is
+ <li><code>builddir</code> (default: <code>/var/tmp/paludis</code>), which is
used as a temporary directory when carrying out uninstall operations,</li>
<li><code>provides_cache</code>, which should be either <code>/var/empty</code> or
<code>${location}/.cache/provides</code>. See <a href="cachefiles.html">the
@@ -373,7 +373,7 @@ been installed from a <code>ebuild</code> format repository.</p>
<p>The following keys are available for <code>format = cran</code>:</p>
<ul>
- <li><code>buildroot</code> (default: <code>/var/tmp/paludis</code>), which controls
+ <li><code>builddir</code> (default: <code>/var/tmp/paludis</code>), which controls
the temporary directory used by Paludis for compiling software.</li>
<li><code>distdir</code> (default: <code>${location}/distfiles</code>), which
controls where downloaded files are saved.</li>
diff --git a/paludis/distribution.cc b/paludis/distribution.cc
index 52a470d..05b748a 100644
--- a/paludis/distribution.cc
+++ b/paludis/distribution.cc
@@ -70,7 +70,7 @@ namespace paludis
.default_ebuild_distdir(k.get("default_ebuild_distdir"))
.default_ebuild_write_cache(k.get("default_ebuild_write_cache"))
.default_ebuild_names_cache(k.get("default_ebuild_names_cache"))
- .default_ebuild_build_root(k.get("default_ebuild_build_root"))
+ .default_ebuild_builddir(k.get("default_ebuild_builddir"))
.default_ebuild_layout(k.get("default_ebuild_layout"))
.default_ebuild_eapi_when_unknown(k.get("default_ebuild_eapi_when_unknown"))
.default_ebuild_eapi_when_unspecified(k.get("default_ebuild_eapi_when_unspecified"))
diff --git a/paludis/distribution.sr b/paludis/distribution.sr
index 0127da4..42b32e8 100644
--- a/paludis/distribution.sr
+++ b/paludis/distribution.sr
@@ -10,7 +10,7 @@ make_class_Distribution()
key default_ebuild_distdir std::string
key default_ebuild_write_cache std::string
key default_ebuild_names_cache std::string
- key default_ebuild_build_root std::string
+ key default_ebuild_builddir std::string
key default_ebuild_layout std::string
key default_ebuild_eapi_when_unknown std::string
key default_ebuild_eapi_when_unspecified std::string
diff --git a/paludis/distributions/gentoo.conf b/paludis/distributions/gentoo.conf
index af327da..dce9006 100644
--- a/paludis/distributions/gentoo.conf
+++ b/paludis/distributions/gentoo.conf
@@ -7,7 +7,7 @@ support_old_style_virtuals = true
default_ebuild_distdir = distfiles
default_ebuild_write_cache = /var/empty
default_ebuild_names_cache =
-default_ebuild_build_root = /var/tmp/paludis
+default_ebuild_builddir = /var/tmp/paludis
default_ebuild_layout = traditional
default_ebuild_eapi_when_unknown = 0
default_ebuild_eapi_when_unspecified = 0
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 92264ed..a2533b8 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -388,10 +388,10 @@ PortageEnvironment::_add_ebuild_repository(const FSEntry & portdir, const std::s
keys->insert("master_repository", master);
keys->insert("sync", sync);
keys->insert("distdir", stringify(_imp->vars->get("DISTDIR")));
- std::string buildroot(_imp->vars->get("PORTAGE_TMPDIR"));
- if (! buildroot.empty())
- buildroot.append("/portage");
- keys->insert("buildroot", buildroot);
+ std::string builddir(_imp->vars->get("PORTAGE_TMPDIR"));
+ if (! builddir.empty())
+ builddir.append("/portage");
+ keys->insert("builddir", builddir);
package_database()->add_repository(importance,
RepositoryMaker::get_instance()->find_maker("ebuild")(this, keys));
@@ -417,10 +417,10 @@ PortageEnvironment::_add_vdb_repository()
keys->insert("names_cache", "/var/empty");
keys->insert("provides_cache", "/var/empty");
keys->insert("world", "/var/lib/portage/world");
- std::string buildroot(_imp->vars->get("PORTAGE_TMPDIR"));
- if (! buildroot.empty())
- buildroot.append("/portage");
- keys->insert("buildroot", buildroot);
+ std::string builddir(_imp->vars->get("PORTAGE_TMPDIR"));
+ if (! builddir.empty())
+ builddir.append("/portage");
+ keys->insert("builddir", builddir);
package_database()->add_repository(1,
RepositoryMaker::get_instance()->find_maker("vdb")(this, keys));
}
diff --git a/paludis/repositories/cran/cran_installed_repository_TEST.cc b/paludis/repositories/cran/cran_installed_repository_TEST.cc
index b950f61..5810045 100644
--- a/paludis/repositories/cran/cran_installed_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_installed_repository_TEST.cc
@@ -46,7 +46,7 @@ namespace test_cases
keys->insert("format", "cran_installed");
keys->insert("library", "cran_installed_repository_TEST_dir/library");
keys->insert("location", "cran_installed_repository_TEST_dir/repo1");
- keys->insert("buildroot", "cran_installed_repository_TEST_dir/tmp");
+ keys->insert("builddir", "cran_installed_repository_TEST_dir/tmp");
tr1::shared_ptr<Repository> repo(CRANInstalledRepository::make_cran_installed_repository(&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
}
diff --git a/paludis/repositories/cran/cran_repository.cc b/paludis/repositories/cran/cran_repository.cc
index 81150df..8a1339f 100644
--- a/paludis/repositories/cran/cran_repository.cc
+++ b/paludis/repositories/cran/cran_repository.cc
@@ -126,7 +126,7 @@ CRANRepository::CRANRepository(const CRANRepositoryParams & p) :
config_info->add_kv("location", stringify(_imp->params.location));
config_info->add_kv("distdir", stringify(_imp->params.distdir));
config_info->add_kv("format", "cran");
- config_info->add_kv("buildroot", stringify(_imp->params.buildroot));
+ config_info->add_kv("builddir", stringify(_imp->params.builddir));
config_info->add_kv("library", stringify(_imp->params.library));
config_info->add_kv("sync", _imp->params.sync);
@@ -411,16 +411,21 @@ CRANRepository::make_cran_repository(
if (m->end() == m->find("sync") || ((sync = m->find("sync")->second)).empty())
sync = "rsync://cran.r-project.org/CRAN";
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = "/var/tmp/paludis";
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ {
+ if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
+ builddir = "/var/tmp/paludis";
+ else
+ Log::get_instance()->message(ll_warning, lc_context) << "Key 'buildroot' is deprecated, use 'builddir' instead";
+ }
return tr1::shared_ptr<Repository>(new CRANRepository(CRANRepositoryParams::create()
.environment(env)
.location(location)
.distdir(distdir)
.sync(sync)
- .buildroot(buildroot)
+ .builddir(builddir)
.library(library)
.mirror(mirror)));
}
diff --git a/paludis/repositories/cran/cran_repository.sr b/paludis/repositories/cran/cran_repository.sr
index 2b0dc91..fb5732d 100644
--- a/paludis/repositories/cran/cran_repository.sr
+++ b/paludis/repositories/cran/cran_repository.sr
@@ -10,7 +10,7 @@ make_class_CRANRepositoryParams()
key distdir FSEntry
key mirror std::string
key sync std::string
- key buildroot FSEntry
+ key builddir FSEntry
key library FSEntry
doxygen_comment << "END"
diff --git a/paludis/repositories/cran/cran_repository_TEST.cc b/paludis/repositories/cran/cran_repository_TEST.cc
index be1d2cf..2e28938 100644
--- a/paludis/repositories/cran/cran_repository_TEST.cc
+++ b/paludis/repositories/cran/cran_repository_TEST.cc
@@ -47,7 +47,7 @@ namespace test_cases
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo1");
- keys->insert("buildroot", "cran_repository_TEST_dir/tmp");
+ keys->insert("builddir", "cran_repository_TEST_dir/tmp");
tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_category_named(CategoryNamePart("cran")));
@@ -67,7 +67,7 @@ namespace test_cases
keys->insert("format", "cran");
keys->insert("library", "cran_repository_TEST_dir/library");
keys->insert("location", "cran_repository_TEST_dir/repo2");
- keys->insert("buildroot", "cran_repository_TEST_dir/tmp");
+ keys->insert("builddir", "cran_repository_TEST_dir/tmp");
tr1::shared_ptr<Repository> repo(CRANRepository::make_cran_repository(
&env, keys));
TEST_CHECK(repo->has_package_named(QualifiedPackageName("cran/testbundle")));
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 57a726d..22b356d 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -339,7 +339,7 @@ ERepository::ERepository(const ERepositoryParams & p) :
config_info->add_kv("newsdir", stringify(_imp->params.newsdir));
config_info->add_kv("sync", _imp->params.sync);
config_info->add_kv("sync_options", _imp->params.sync_options);
- config_info->add_kv("buildroot", stringify(_imp->params.buildroot));
+ config_info->add_kv("builddir", stringify(_imp->params.builddir));
if (_imp->params.master_repository)
config_info->add_kv("master_repository", stringify(_imp->params.master_repository->name()));
config_info->add_kv("format", _imp->params.entry_format);
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index f24b05c..1cb318c 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -1023,7 +1023,7 @@ namespace test_cases
keys->insert("eapi_when_unspecified", "0");
keys->insert("profile_eapi", "0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
- keys->insert("buildroot", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
+ keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
@@ -1101,7 +1101,7 @@ namespace test_cases
keys->insert("eapi_when_unspecified", "exheres-0");
keys->insert("profile_eapi", "exheres-0");
keys->insert("distdir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "distdir"));
- keys->insert("buildroot", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
+ keys->insert("builddir", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "build"));
tr1::shared_ptr<ERepository> repo(make_ebuild_repository(&env, keys));
env.package_database()->add_repository(1, repo);
diff --git a/paludis/repositories/e/e_repository_params.sr b/paludis/repositories/e/e_repository_params.sr
index 7d254c1..57d1e84 100644
--- a/paludis/repositories/e/e_repository_params.sr
+++ b/paludis/repositories/e/e_repository_params.sr
@@ -21,7 +21,7 @@ make_class_ERepositoryParams()
key newsdir FSEntry
key sync std::string
key sync_options std::string
- key buildroot FSEntry
+ key builddir FSEntry
key master_repository "tr1::shared_ptr<const ERepository>"
key enable_destinations bool
key write_bin_uri_prefix std::string
diff --git a/paludis/repositories/e/ebin.cc b/paludis/repositories/e/ebin.cc
index c64eaee..8d92154 100644
--- a/paludis/repositories/e/ebin.cc
+++ b/paludis/repositories/e/ebin.cc
@@ -99,7 +99,7 @@ EbinCommand::operator() ()
stringify(PALUDIS_VERSION_MICRO) +
(std::string(PALUDIS_SUBVERSION_REVISION).empty() ?
std::string("") : "-r" + std::string(PALUDIS_SUBVERSION_REVISION)))
- .with_setenv("PALUDIS_TMPDIR", stringify(params.buildroot))
+ .with_setenv("PALUDIS_TMPDIR", stringify(params.builddir))
.with_setenv("PALUDIS_CONFIG_DIR", SYSCONFDIR "/paludis/")
.with_setenv("PALUDIS_BASHRC_FILES", join(bashrc_files->begin(), bashrc_files->end(), " "))
.with_setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
@@ -123,7 +123,7 @@ EbinCommand::add_portage_vars(const Command & cmd) const
{
return Command(cmd)
.with_setenv("PORTAGE_BASHRC", "/dev/null")
- .with_setenv("PORTAGE_BUILDDIR", stringify(params.buildroot) + "/" +
+ .with_setenv("PORTAGE_BUILDDIR", stringify(params.builddir) + "/" +
stringify(params.package_id->name().category) + "/" +
stringify(params.package_id->name().package) + "-" +
stringify(params.package_id->version()))
@@ -133,7 +133,7 @@ EbinCommand::add_portage_vars(const Command & cmd) const
.with_setenv("PORTAGE_INST_UID", "0")
.with_setenv("PORTAGE_MASTER_PID", stringify(::getpid()))
.with_setenv("PORTAGE_NICENCESS", stringify(::getpriority(PRIO_PROCESS, 0)))
- .with_setenv("PORTAGE_TMPDIR", stringify(params.buildroot))
+ .with_setenv("PORTAGE_TMPDIR", stringify(params.builddir))
.with_setenv("PORTAGE_TMPFS", "/dev/shm")
.with_setenv("PORTAGE_WORKDIR_MODE", "0700");
}
diff --git a/paludis/repositories/e/ebin.sr b/paludis/repositories/e/ebin.sr
index 2da3ff9..20d5ce5 100644
--- a/paludis/repositories/e/ebin.sr
+++ b/paludis/repositories/e/ebin.sr
@@ -7,7 +7,7 @@ make_class_EbinCommandParams()
key package_id "tr1::shared_ptr<const PackageID>"
key portdir FSEntry
key distdir FSEntry
- key buildroot FSEntry
+ key builddir FSEntry
doxygen_comment << "END"
/**
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 3a31be8..bfe569c 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -119,7 +119,7 @@ EbuildCommand::operator() ()
stringify(PALUDIS_VERSION_MICRO) +
(std::string(PALUDIS_SUBVERSION_REVISION).empty() ?
std::string("") : "-r" + std::string(PALUDIS_SUBVERSION_REVISION)))
- .with_setenv("PALUDIS_TMPDIR", stringify(params.buildroot))
+ .with_setenv("PALUDIS_TMPDIR", stringify(params.builddir))
.with_setenv("PALUDIS_CONFIG_DIR", SYSCONFDIR "/paludis/")
.with_setenv("PALUDIS_BASHRC_FILES", join(bashrc_files->begin(), bashrc_files->end(), " "))
.with_setenv("PALUDIS_HOOK_DIRS", join(hook_dirs->begin(), hook_dirs->end(), " "))
@@ -198,7 +198,7 @@ EbuildCommand::add_portage_vars(const Command & cmd) const
return Command(cmd)
.with_setenv("PORTAGE_ACTUAL_DISTDIR", stringify(params.distdir))
.with_setenv("PORTAGE_BASHRC", "/dev/null")
- .with_setenv("PORTAGE_BUILDDIR", stringify(params.buildroot) + "/" +
+ .with_setenv("PORTAGE_BUILDDIR", stringify(params.builddir) + "/" +
stringify(params.package_id->name().category) + "/" +
stringify(params.package_id->name().package) + "-" +
stringify(params.package_id->version()))
@@ -208,7 +208,7 @@ EbuildCommand::add_portage_vars(const Command & cmd) const
.with_setenv("PORTAGE_INST_UID", "0")
.with_setenv("PORTAGE_MASTER_PID", stringify(::getpid()))
.with_setenv("PORTAGE_NICENCESS", stringify(::getpriority(PRIO_PROCESS, 0)))
- .with_setenv("PORTAGE_TMPDIR", stringify(params.buildroot))
+ .with_setenv("PORTAGE_TMPDIR", stringify(params.builddir))
.with_setenv("PORTAGE_TMPFS", "/dev/shm")
.with_setenv("PORTAGE_WORKDIR_MODE", "0700");
}
diff --git a/paludis/repositories/e/ebuild.sr b/paludis/repositories/e/ebuild.sr
index db31a6b..fbc452c 100644
--- a/paludis/repositories/e/ebuild.sr
+++ b/paludis/repositories/e/ebuild.sr
@@ -12,7 +12,7 @@ make_class_EbuildCommandParams()
key exlibsdirs "tr1::shared_ptr<const FSEntrySequence>"
key portdir FSEntry
key distdir FSEntry
- key buildroot FSEntry
+ key builddir FSEntry
key userpriv bool
key sandbox bool
key commands std::string
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index 57481a2..e4c8f92 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -446,7 +446,7 @@ EbuildEntries::fetch(const tr1::shared_ptr<const ERepositoryID> & id,
.userpriv(phase->option("userpriv"))
.sandbox(phase->option("sandbox"))
.commands(join(phase->begin_commands(), phase->end_commands(), " "))
- .buildroot(_imp->params.buildroot));
+ .builddir(_imp->params.builddir));
EbuildNoFetchCommand nofetch_cmd(command_params,
EbuildNoFetchCommandParams::create()
@@ -553,7 +553,7 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
bool userpriv_ok((! userpriv_restrict) && (_imp->environment->reduced_gid() != getgid()));
if (userpriv_ok)
{
- FSEntry f(_imp->params.buildroot);
+ FSEntry f(_imp->params.builddir);
Context c("When checking permissions on '" + stringify(f) + "' for userpriv:");
if (f.exists())
@@ -590,9 +590,9 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
o.destination->destination_interface->merge(
MergeOptions::create()
.package_id(id)
- .image_dir(_imp->params.buildroot / stringify(id->name().category) / (stringify(id->name().package) + "-"
+ .image_dir(_imp->params.builddir / stringify(id->name().category) / (stringify(id->name().package) + "-"
+ stringify(id->version())) / "image")
- .environment_file(_imp->params.buildroot / stringify(id->name().category) / (stringify(id->name().package) + "-"
+ .environment_file(_imp->params.builddir / stringify(id->name().category) / (stringify(id->name().package) + "-"
+ stringify(id->version())) / "temp" / "loadsaveenv")
);
}
@@ -637,7 +637,7 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
.commands(join(phase->begin_commands(), phase->end_commands(), " "))
.sandbox(phase->option("sandbox"))
.userpriv(phase->option("userpriv") && userpriv_ok)
- .buildroot(_imp->params.buildroot));
+ .builddir(_imp->params.builddir));
EbuildInstallCommandParams install_params(
EbuildInstallCommandParams::create()
@@ -652,7 +652,7 @@ EbuildEntries::install(const tr1::shared_ptr<const ERepositoryID> & id,
.debug_build(o.debug_build)
.config_protect(_imp->e_repository->profile_variable("CONFIG_PROTECT"))
.config_protect_mask(_imp->e_repository->profile_variable("CONFIG_PROTECT_MASK"))
- .loadsaveenv_dir(_imp->params.buildroot / stringify(id->name().category) / (
+ .loadsaveenv_dir(_imp->params.builddir / stringify(id->name().category) / (
stringify(id->name().package) + "-" + stringify(id->version())) / "temp")
.slot(SlotName(id->slot())));
@@ -689,7 +689,7 @@ EbuildEntries::get_environment_variable(const tr1::shared_ptr<const ERepositoryI
.sandbox(phases.begin_phases()->option("sandbox"))
.userpriv(phases.begin_phases()->option("userpriv"))
.commands(join(phases.begin_phases()->begin_commands(), phases.begin_phases()->end_commands(), " "))
- .buildroot(_imp->params.buildroot),
+ .builddir(_imp->params.builddir),
var);
@@ -775,7 +775,7 @@ EbuildEntries::pretend(const tr1::shared_ptr<const ERepositoryID> & id,
.userpriv(phase->option("userpriv"))
.sandbox(phase->option("sandbox"))
.commands(join(phase->begin_commands(), phase->end_commands(), " "))
- .buildroot(_imp->params.buildroot));
+ .builddir(_imp->params.builddir));
EbuildPretendCommand pretend_cmd(command_params,
EbuildPretendCommandParams::create()
diff --git a/paludis/repositories/e/ebuild_id.cc b/paludis/repositories/e/ebuild_id.cc
index 166ca93..87a0b44 100644
--- a/paludis/repositories/e/ebuild_id.cc
+++ b/paludis/repositories/e/ebuild_id.cc
@@ -226,7 +226,7 @@ EbuildID::need_keys_added() const
.portdir(_imp->repository->params().master_repository ? _imp->repository->params().master_repository->params().location :
_imp->repository->params().location)
.distdir(_imp->repository->params().distdir)
- .buildroot(_imp->repository->params().buildroot)
+ .builddir(_imp->repository->params().builddir)
.commands(join(phases.begin_phases()->begin_commands(), phases.begin_phases()->end_commands(), " "))
.sandbox(phases.begin_phases()->option("sandbox"))
.userpriv(phases.begin_phases()->option("userpriv")));
diff --git a/paludis/repositories/e/make_ebin_repository.cc b/paludis/repositories/e/make_ebin_repository.cc
index 022df06..30bd74e 100644
--- a/paludis/repositories/e/make_ebin_repository.cc
+++ b/paludis/repositories/e/make_ebin_repository.cc
@@ -163,10 +163,15 @@ paludis::make_ebin_repository(
sync_options += "--exclude-from='" + m->find("sync_exclude")->second + "'";
}
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = DistributionData::get_instance()->distribution_from_string(
- env->default_distribution())->default_ebuild_build_root;
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ {
+ if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
+ builddir = DistributionData::get_instance()->distribution_from_string(
+ env->default_distribution())->default_ebuild_builddir;
+ else
+ Log::get_instance()->message(ll_warning, lc_context) << "Key 'buildroot' is deprecated, use 'builddir' instead";
+ }
erepository::UseManifest use_manifest(erepository::manifest_use);
if (m->end() != m->find("use_manifest") && ! m->find("use_manifest")->second.empty())
@@ -199,7 +204,7 @@ paludis::make_ebin_repository(
.profile_eapi(profile_eapi)
.use_manifest(use_manifest)
.append_repository_name_to_write_cache(true)
- .buildroot(buildroot)));
+ .builddir(builddir)));
}
tr1::shared_ptr<Repository>
diff --git a/paludis/repositories/e/make_ebuild_repository.cc b/paludis/repositories/e/make_ebuild_repository.cc
index 8ff28d3..cc37ea4 100644
--- a/paludis/repositories/e/make_ebuild_repository.cc
+++ b/paludis/repositories/e/make_ebuild_repository.cc
@@ -192,10 +192,15 @@ paludis::make_ebuild_repository(
sync_options += "--exclude-from='" + m->find("sync_exclude")->second + "'";
}
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = DistributionData::get_instance()->distribution_from_string(
- env->default_distribution())->default_ebuild_build_root;
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ {
+ if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
+ builddir = DistributionData::get_instance()->distribution_from_string(
+ env->default_distribution())->default_ebuild_builddir;
+ else
+ Log::get_instance()->message(ll_warning, lc_context) << "Key 'buildroot' is deprecated, use 'builddir' instead";
+ }
std::string layout;
if (m->end() == m->find("layout") || ((layout = m->find("layout")->second)).empty())
@@ -233,7 +238,7 @@ paludis::make_ebuild_repository(
.profile_eapi(profile_eapi)
.use_manifest(use_manifest)
.append_repository_name_to_write_cache(append_repository_name_to_write_cache)
- .buildroot(buildroot)));
+ .builddir(builddir)));
}
tr1::shared_ptr<Repository>
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 1eb3bea..2e30535 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -158,7 +158,7 @@ VDBRepository::VDBRepository(const VDBRepositoryParams & p) :
config_info->add_kv("world", stringify(_imp->params.world));
config_info->add_kv("provides_cache", stringify(_imp->params.provides_cache));
config_info->add_kv("names_cache", stringify(_imp->params.names_cache));
- config_info->add_kv("buildroot", stringify(_imp->params.buildroot));
+ config_info->add_kv("builddir", stringify(_imp->params.builddir));
_info->add_section(config_info);
}
@@ -329,16 +329,22 @@ VDBRepository::make_vdb_repository(
}
}
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = "/var/tmp/paludis";
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ {
+ if (m->end() == m->find("buildroot") || ((builddir = m->find("buildroot")->second)).empty())
+ builddir = DistributionData::get_instance()->distribution_from_string(
+ env->default_distribution())->default_ebuild_builddir;
+ else
+ Log::get_instance()->message(ll_warning, lc_context) << "Key 'buildroot' is deprecated, use 'builddir' instead";
+ }
return tr1::shared_ptr<Repository>(new VDBRepository(VDBRepositoryParams::create()
.environment(env)
.location(location)
.root(root)
.world(world)
- .buildroot(buildroot)
+ .builddir(builddir)
.provides_cache(provides_cache)
.names_cache(names_cache)));
}
@@ -421,7 +427,7 @@ VDBRepository::perform_uninstall(const tr1::shared_ptr<const ERepositoryID> & id
.sandbox(phase->option("sandbox"))
.userpriv(phase->option("userpriv"))
.commands(join(phase->begin_commands(), phase->end_commands(), " "))
- .buildroot(_imp->params.buildroot));
+ .builddir(_imp->params.builddir));
EbuildUninstallCommandParams uninstall_params(EbuildUninstallCommandParams::create()
.root(stringify(_imp->params.root) + "/")
@@ -476,7 +482,7 @@ VDBRepository::perform_config(const tr1::shared_ptr<const ERepositoryID> & id) c
.sandbox(phase->option("sandbox"))
.userpriv(phase->option("userpriv"))
.commands(join(phase->begin_commands(), phase->end_commands(), " "))
- .buildroot(_imp->params.buildroot),
+ .builddir(_imp->params.builddir),
EbuildConfigCommandParams::create()
.root(stringify(_imp->params.root) + "/")
diff --git a/paludis/repositories/e/vdb_repository.sr b/paludis/repositories/e/vdb_repository.sr
index da550f2..312b562 100644
--- a/paludis/repositories/e/vdb_repository.sr
+++ b/paludis/repositories/e/vdb_repository.sr
@@ -11,7 +11,7 @@ make_class_VDBRepositoryParams()
key world FSEntry
key provides_cache FSEntry
key names_cache FSEntry
- key buildroot FSEntry
+ key builddir FSEntry
doxygen_comment << "END"
/**
diff --git a/paludis/repositories/gems/gems_repository.cc b/paludis/repositories/gems/gems_repository.cc
index 78df2a8..4e74cad 100644
--- a/paludis/repositories/gems/gems_repository.cc
+++ b/paludis/repositories/gems/gems_repository.cc
@@ -91,7 +91,7 @@ GemsRepository::GemsRepository(const gems::RepositoryParams & params) :
config_info->add_kv("location", stringify(_imp->params.location));
config_info->add_kv("install_dir", stringify(_imp->params.install_dir));
- config_info->add_kv("buildroot", stringify(_imp->params.buildroot));
+ config_info->add_kv("builddir", stringify(_imp->params.builddir));
config_info->add_kv("sync", _imp->params.sync);
config_info->add_kv("sync_options", _imp->params.sync_options);
diff --git a/paludis/repositories/gems/gems_repository_TEST.cc b/paludis/repositories/gems/gems_repository_TEST.cc
index bbbe315..6ab8adb 100644
--- a/paludis/repositories/gems/gems_repository_TEST.cc
+++ b/paludis/repositories/gems/gems_repository_TEST.cc
@@ -44,7 +44,7 @@ namespace test_cases
.sync("")
.sync_options("")
.environment(&env)
- .buildroot(FSEntry("gems_repository_TEST_dir/build"))
+ .builddir(FSEntry("gems_repository_TEST_dir/build"))
)));
}
} test_creation;
diff --git a/paludis/repositories/gems/installed_gems_repository.cc b/paludis/repositories/gems/installed_gems_repository.cc
index b76d7a5..d5f4c7a 100644
--- a/paludis/repositories/gems/installed_gems_repository.cc
+++ b/paludis/repositories/gems/installed_gems_repository.cc
@@ -99,7 +99,7 @@ InstalledGemsRepository::InstalledGemsRepository(const gems::InstalledRepository
tr1::shared_ptr<RepositoryInfoSection> config_info(new RepositoryInfoSection("Configuration information"));
config_info->add_kv("install_dir", stringify(_imp->params.install_dir));
- config_info->add_kv("buildroot", stringify(_imp->params.buildroot));
+ config_info->add_kv("builddir", stringify(_imp->params.builddir));
_info->add_section(config_info);
}
diff --git a/paludis/repositories/gems/installed_gems_repository_TEST.cc b/paludis/repositories/gems/installed_gems_repository_TEST.cc
index 80c4369..c552940 100644
--- a/paludis/repositories/gems/installed_gems_repository_TEST.cc
+++ b/paludis/repositories/gems/installed_gems_repository_TEST.cc
@@ -41,7 +41,7 @@ namespace test_cases
gems::InstalledRepositoryParams::create()
.location(FSEntry("gems_repository_TEST_dir/installed-repo"))
.environment(&env)
- .buildroot(FSEntry("gems_repository_TEST_dir/build"))
+ .builddir(FSEntry("gems_repository_TEST_dir/build"))
.install_dir(FSEntry("gems_repository_TEST_dir/install_dir"))
)));
}
diff --git a/paludis/repositories/gems/params.sr b/paludis/repositories/gems/params.sr
index d919021..254c716 100644
--- a/paludis/repositories/gems/params.sr
+++ b/paludis/repositories/gems/params.sr
@@ -10,7 +10,7 @@ make_class_RepositoryParams()
key install_dir FSEntry
key sync std::string
key sync_options std::string
- key buildroot FSEntry
+ key builddir FSEntry
allow_named_args
}
@@ -20,7 +20,7 @@ make_class_InstalledRepositoryParams()
visible
key environment "Environment *"
- key buildroot FSEntry
+ key builddir FSEntry
key install_dir FSEntry
allow_named_args
diff --git a/paludis/repositories/gems/registration.cc b/paludis/repositories/gems/registration.cc
index 417343d..257a7e0 100644
--- a/paludis/repositories/gems/registration.cc
+++ b/paludis/repositories/gems/registration.cc
@@ -54,9 +54,9 @@ namespace
if (m->end() != m->find("sync_options"))
sync_options = m->find("sync_options")->second;
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = DistributionData::get_instance()->distribution_from_string(env->default_distribution())->default_ebuild_build_root;
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ builddir = DistributionData::get_instance()->distribution_from_string(env->default_distribution())->default_ebuild_builddir;
return make_shared_ptr(new GemsRepository(gems::RepositoryParams::create()
.location(location)
@@ -64,7 +64,7 @@ namespace
.sync_options(sync_options)
.environment(env)
.install_dir(install_dir)
- .buildroot(buildroot)));
+ .builddir(builddir)));
}
tr1::shared_ptr<Repository>
@@ -76,14 +76,14 @@ namespace
if (m->end() == m->find("install_dir") || ((install_dir = m->find("install_dir")->second)).empty())
throw gems::RepositoryConfigurationError("Key 'install_dir' not specified or empty");
- std::string buildroot;
- if (m->end() == m->find("buildroot") || ((buildroot = m->find("buildroot")->second)).empty())
- buildroot = DistributionData::get_instance()->distribution_from_string(env->default_distribution())->default_ebuild_build_root;
+ std::string builddir;
+ if (m->end() == m->find("builddir") || ((builddir = m->find("builddir")->second)).empty())
+ builddir = DistributionData::get_instance()->distribution_from_string(env->default_distribution())->default_ebuild_builddir;
return make_shared_ptr(new InstalledGemsRepository(gems::InstalledRepositoryParams::create()
.environment(env)
.install_dir(install_dir)
- .buildroot(buildroot)));
+ .builddir(builddir)));
}
}
diff --git a/vim/syntax/paludis-repositories-conf.vim b/vim/syntax/paludis-repositories-conf.vim
index 5cf32e5..2f5d9bc 100644
--- a/vim/syntax/paludis-repositories-conf.vim
+++ b/vim/syntax/paludis-repositories-conf.vim
@@ -39,7 +39,7 @@ syn region PaludisRepositoriesConfString contained start=/"/ end=/"/
\ skipwhite
syn keyword PaludisRepositoriesConfKnownKey contained
- \ location distdir format buildroot library sync root yaml_uri
+ \ location distdir format builddir library sync root yaml_uri
\ master_repository profiles pkgdir setsdir securitydir newsdir
\ names_cache sync sync_options eclassdirs cache write_cache
\ world provides_cache importance layout use_manifest