On Tue, Sep 24, 2013 at 2:23 PM, Jose A. Lopes <[email protected]> wrote:
> Add remaining constants which in Python are imported from the > generated 'lib/_autoconf.py'. This will allow to completely remove > this module. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > src/Ganeti/HsConstants.hs | 63 > ++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 54 insertions(+), 9 deletions(-) > > diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs > index 94e6162..b0df151 100644 > --- a/src/Ganeti/HsConstants.hs > +++ b/src/Ganeti/HsConstants.hs > @@ -50,7 +50,12 @@ import qualified Ganeti.Runtime as Runtime > import Ganeti.Types > import qualified Ganeti.Types as Types > > --- * 'autoconf' constants for Python only > +-- * 'autoconf' constants for Python only > ('autotools/build-bash-completion') > + > +htoolsProgs :: [String] > +htoolsProgs = AutoConf.htoolsProgs > + > +-- * 'autoconf' constants for Python only ('lib/constants.py') > > drbdBarriers :: String > drbdBarriers = AutoConf.drbdBarriers > @@ -61,6 +66,54 @@ drbdNoMetaFlush = AutoConf.drbdNoMetaFlush > lvmStripecount :: Int > lvmStripecount = AutoConf.lvmStripecount > > +-- * 'autoconf' constants for Python only ('lib/pathutils.py') > + > +-- ** Build-time constants > + > +exportDir :: String > +exportDir = AutoConf.exportDir > + > +osSearchPath :: [String] > +osSearchPath = AutoConf.osSearchPath > + > +esSearchPath :: [String] > +esSearchPath = AutoConf.esSearchPath > + > +sshConfigDir :: String > +sshConfigDir = AutoConf.sshConfigDir > + > +xenConfigDir :: String > +xenConfigDir = AutoConf.xenConfigDir > + > +sysconfdir :: String > +sysconfdir = AutoConf.sysconfdir > + > +toolsdir :: String > +toolsdir = AutoConf.toolsdir > + > +localstatedir :: String > +localstatedir = AutoConf.localstatedir > + > +-- ** Paths which don't change for a virtual cluster > + > +pkglibdir :: String > +pkglibdir = AutoConf.pkglibdir > + > +-- * 'autoconf' constants for Python only ('lib/build/sphinx_ext.py') > + > +manPages :: Map String Int > +manPages = Map.fromList AutoConf.manPages > + > +-- * 'autoconf' constants for QA cluster only ('qa/qa_cluster.py') > + > +versionedsharedir :: String > +versionedsharedir = AutoConf.versionedsharedir > + > +-- * 'autoconf' constants for Python only ('tests/py/docs_unittest.py') > + > +gntScripts :: [String] > +gntScripts = AutoConf.gntScripts > + > -- * Various versions > > releaseVersion :: String > @@ -84,14 +137,6 @@ configVersion = buildVersion configMajor configMinor > configRevision > protocolVersion :: Int > protocolVersion = buildVersion configMajor configMinor 0 > > --- * Constants for 'lib/pathutils.py' > - > -osSearchPath :: [String] > -osSearchPath = AutoConf.osSearchPath > - > -esSearchPath :: [String] > -esSearchPath = AutoConf.esSearchPath > - > -- * User separation > daemonsGroup :: String > daemonsGroup = Runtime.daemonGroup (ExtraGroup DaemonsGroup) > -- > 1.8.4 > > LGTM, thanks. -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
