aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-08 19:18:57 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-08 19:18:57 +0000
commitf39658e408fe92f259a1594fccc1b12c96f5a242 (patch)
tree41e2d30cde8a920e954debd01fc7a64def87cad1
parentaa8c67b6921e2c4dfd1986b4b5e86e67ec8eafdb (diff)
downloadpaludis-f39658e408fe92f259a1594fccc1b12c96f5a242.tar.gz
paludis-f39658e408fe92f259a1594fccc1b12c96f5a242.tar.xz
kill more sr
-rw-r--r--paludis/environments/paludis/Makefile.am12
-rw-r--r--paludis/environments/paludis/paludis_config.cc2
-rw-r--r--paludis/environments/paludis/paludis_config.hh3
-rw-r--r--paludis/environments/paludis/use_config_entry.sr71
4 files changed, 1 insertions, 87 deletions
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 94f099b..3963145 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -1,6 +1,4 @@
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
-DISTCLEANFILES = \
- use_config_entry-sr.hh use_config_entry-sr.cc
BUILT_SOURCES = $(DISTCLEANFILES)
MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -49,7 +47,6 @@ paludis_environment_paludis_includedir = $(includedir)/paludis-$(PALUDIS_PC_SLOT
paludis_environment_paludis_include_HEADERS = \
paludis_config.hh \
paludis_environment.hh \
- use_config_entry-sr.hh \
use_conf.hh \
keywords_conf.hh \
licenses_conf.hh \
@@ -63,8 +60,7 @@ EXTRA_DIST = \
paludis_environment_TEST_setup.sh \
paludis_environment_TEST.cc \
paludis_environment_TEST_cleanup.sh \
- $(BUILT_SOURCES) \
- use_config_entry.sr
+ $(BUILT_SOURCES)
TESTS = paludis_environment_TEST
@@ -120,12 +116,6 @@ endif
built-sources : $(BUILT_SOURCES)
for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-use_config_entry-sr.hh : use_config_entry.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --header $(srcdir)/use_config_entry.sr > $@
-
-use_config_entry-sr.cc : use_config_entry.sr $(top_srcdir)/misc/make_sr.bash
- $(top_srcdir)/misc/make_sr.bash --source $(srcdir)/use_config_entry.sr > $@
-
distcheck-deps-local : $(DISTCHECK_DEPS)
distcheck-deps : distcheck-deps-subdirs
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 97ab114..5a6b6fc 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.cc
@@ -79,8 +79,6 @@ using namespace paludis::paludis_environment;
template class WrappedForwardIterator<PaludisConfig::RepositoryConstIteratorTag, const std::tr1::function<std::string (const std::string &)> >;
-#include <paludis/environments/paludis/use_config_entry-sr.cc>
-
namespace
{
std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
diff --git a/paludis/environments/paludis/paludis_config.hh b/paludis/environments/paludis/paludis_config.hh
index 1ef3e01..9f64c3f 100644
--- a/paludis/environments/paludis/paludis_config.hh
+++ b/paludis/environments/paludis/paludis_config.hh
@@ -25,7 +25,6 @@
#include <paludis/environment_factory.hh>
#include <paludis/util/exception.hh>
#include <paludis/util/instantiation_policy.hh>
-#include <paludis/util/sr.hh>
#include <paludis/util/sequence-fwd.hh>
#include <paludis/util/map-fwd.hh>
#include <paludis/util/wrapped_forward_iterator-fwd.hh>
@@ -90,8 +89,6 @@ namespace paludis
///\}
};
-#include <paludis/environments/paludis/use_config_entry-sr.hh>
-
/**
* PaludisConfig is used by PaludisEnvironment to access the user's
* configuration settings from on-disk configuration files.
diff --git a/paludis/environments/paludis/use_config_entry.sr b/paludis/environments/paludis/use_config_entry.sr
deleted file mode 100644
index 4ca8964..0000000
--- a/paludis/environments/paludis/use_config_entry.sr
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-# vim: set sw=4 sts=4 et :
-
-make_class_SetUseConfigMinusStarEntry()
-{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
- key prefix std::string
-
- doxygen_comment << "END"
- /**
- * Represents a PaludisConfig set -* use configuration entry.
- *
- * \see PaludisConfig
- * \ingroup grppaludisconfig
- * \nosubgrouping
- */
-END
-}
-
-make_class_SetKeywordConfigEntry()
-{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
- key keyword KeywordName
-
- doxygen_comment << "END"
- /**
- * Represents a PaludisConfig set keywords configuration entry.
- *
- * \see PaludisConfig
- * \ingroup grppaludisconfig
- * \nosubgrouping
- */
-END
-}
-
-make_class_SetLicenseConfigEntry()
-{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
- key license std::string
-
- doxygen_comment << "END"
- /**
- * Represents a PaludisConfig set licence configuration entry.
- *
- * \see PaludisConfig
- * \ingroup grppaludisconfig
- * \nosubgrouping
- */
-END
-}
-
-make_class_SetMaskConfigEntry()
-{
- key set_name "std::tr1::shared_ptr<const SetName>"
- key dep_spec "std::tr1::shared_ptr<const DepSpec>"
-
- doxygen_comment << "END"
- /**
- * Represents a PaludisConfig set mask or unmask configuration entry.
- *
- * \see PaludisConfig
- * \ingroup grppaludisconfig
- * \nosubgrouping
- */
-END
-}
-
-