From 2f20642a9718ada79c0ce9f5236c92bb2ca788ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Wed, 3 Aug 2005 17:44:16 +0000 Subject: [PATCH] Flags class is useless as it doesn't have any state or data to carry with. For exporting variables a function is sufficient. --- pisi/actionsapi/variables.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index a0ea23a0..e162707b 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -20,9 +20,24 @@ import pisi.constants # Set individual information, that are generally needed for ActionsAPI +def exportFlags(): + '''General flags used in actions API.''' + + # Build systems depend on these environment variables. That is why + # we export them instead of using as (instance) variables. + values = pisi.config.config.values + environ['HOST'] = host = values.build.host + environ['CFLAGS'] = cflags = values.build.cflags + environ['CXXFLAGS'] = cxxflags = values.build.cxxflags + environ['LDFLAGS'] = ldflags = values.build.ldflags + + class Env(object): '''General environment variables used in actions API''' def __init__(self): + + setFlags() + self.__vars = { 'pkg_dir': 'PKG_DIR', 'work_dir': 'WORK_DIR', @@ -58,18 +73,10 @@ class Dirs: localstate = 'var/lib' defaultprefix = 'usr' -class Flags: - '''General flags used in actions API''' - values = pisi.config.config.values - environ['HOST'] = host = values.build.host - environ['CFLAGS'] = cflags = values.build.cflags - environ['CXXFLAGS'] = cxxflags = values.build.cxxflags - environ['LDFLAGS'] = ldflags = values.build.ldflags class Variables(pisi.config.Config): const = pisi.constants.const env = Env() dirs = Dirs() - flags = Flags() glb = Variables()