aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-08 15:01:53 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-08 01:14:43 +0000
commit46d1a1133cec1cff2e7e7e74f3af26a1ca0a6711 (patch)
tree8c6d78224b296b3cc3f3e82af8c5d47f8d8f47c9
parentae39fcba8a7354fe31e73f8ee6b6898356260524 (diff)
downloadpaludis-46d1a1133cec1cff2e7e7e74f3af26a1ca0a6711.tar.gz
paludis-46d1a1133cec1cff2e7e7e74f3af26a1ca0a6711.tar.xz
kill more sr
-rw-r--r--paludis/repositories/fake/Makefile.am16
-rw-r--r--paludis/repositories/fake/fake_repository.cc6
-rw-r--r--paludis/repositories/fake/fake_repository.hh21
-rw-r--r--paludis/repositories/fake/fake_repository.sr23
4 files changed, 23 insertions, 43 deletions
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index 63d7e96..c0a0831 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -29,9 +29,6 @@ check_PROGRAMS = $(TESTS)
EXTRA_DIST = \
fake_repository_TEST.cc \
fake_installed_repository_TEST.cc \
- fake_repository-sr.hh \
- fake_repository-sr.cc \
- fake_repository.sr \
dep_parser_TEST.cc
fake_repository_TEST_LDADD = \
@@ -89,18 +86,7 @@ paludis_repositories_fake_include_HEADERS = \
fake_repository.hh \
fake_repository_base.hh \
fake_installed_repository.hh \
- fake_package_id.hh \
- fake_repository-sr.hh
-
-BUILT_SOURCES = \
- fake_repository-sr.hh \
- fake_repository-sr.cc
-
-fake_repository-sr.hh : fake_repository.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/fake_repository.sr > $@
-
-fake_repository-sr.cc : fake_repository.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/fake_repository.sr > $@
+ fake_package_id.hh
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/paludis/repositories/fake/fake_repository.cc b/paludis/repositories/fake/fake_repository.cc
index b344dde..3433664 100644
--- a/paludis/repositories/fake/fake_repository.cc
+++ b/paludis/repositories/fake/fake_repository.cc
@@ -35,8 +35,6 @@
using namespace paludis;
-#include <paludis/repositories/fake/fake_repository-sr.cc>
-
namespace paludis
{
template<>
@@ -82,7 +80,7 @@ FakeRepository::FakeRepository(const Environment * const env, const RepositoryNa
FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
PrivateImplementationPattern<FakeRepository>(new Implementation<FakeRepository>),
- FakeRepositoryBase(params.environment, params.name, make_named_values<RepositoryCapabilities>(
+ FakeRepositoryBase(params.environment(), params.name(), make_named_values<RepositoryCapabilities>(
value_for<n::destination_interface>(static_cast<RepositoryDestinationInterface *>(0)),
value_for<n::e_interface>(static_cast<RepositoryEInterface *>(0)),
value_for<n::environment_variable_interface>(static_cast<RepositoryEnvironmentVariableInterface *>(0)),
@@ -95,7 +93,7 @@ FakeRepository::FakeRepository(const FakeRepositoryParams & params) :
value_for<n::sets_interface>(this),
value_for<n::syncable_interface>(static_cast<RepositorySyncableInterface *>(0)),
value_for<n::virtuals_interface>((*DistributionData::get_instance()->distribution_from_string(
- params.environment->distribution())).support_old_style_virtuals() ? this : 0)
+ params.environment()->distribution())).support_old_style_virtuals() ? this : 0)
)),
_imp(PrivateImplementationPattern<FakeRepository>::_imp)
{
diff --git a/paludis/repositories/fake/fake_repository.hh b/paludis/repositories/fake/fake_repository.hh
index a4384c6..5e3ced5 100644
--- a/paludis/repositories/fake/fake_repository.hh
+++ b/paludis/repositories/fake/fake_repository.hh
@@ -21,10 +21,29 @@
#define PALUDIS_GUARD_PALUDIS_REPOSITORIES_FAKE_FAKE_REPOSITORY_HH 1
#include <paludis/repositories/fake/fake_repository_base.hh>
+#include <paludis/util/named_value.hh>
namespace paludis
{
-#include <paludis/repositories/fake/fake_repository-sr.hh>
+ namespace n
+ {
+ struct environment;
+ struct name;
+ }
+
+ /**
+ * Options for FakeRepository.
+ *
+ * \ingroup grpfakerepository
+ * \see FakeRepository
+ * \since 0.26
+ * \nosubgrouping
+ */
+ struct FakeRepositoryParams
+ {
+ NamedValue<n::environment, const Environment *> environment;
+ NamedValue<n::name, RepositoryName> name;
+ };
/**
* Fake repository for use in test cases.
diff --git a/paludis/repositories/fake/fake_repository.sr b/paludis/repositories/fake/fake_repository.sr
deleted file mode 100644
index 2be8f95..0000000
--- a/paludis/repositories/fake/fake_repository.sr
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: set tw=120 ft=sh et :
-
-make_class_FakeRepositoryParams()
-{
- visible
- allow_named_args
-
- key environment "const Environment *"
- key name "RepositoryName"
-
- doxygen_comment << "END"
- /**
- * Options for FakeRepository.
- *
- * \ingroup grpfakerepository
- * \see FakeRepository
- * \since 0.26
- * \nosubgrouping
- */
-END
-}
-
-