Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

operations/build: Clean-up outputs

Browse Source 
Prune always printed lines about component stuff,
Dump build helper information only during build() to not pollute index output
This commit is contained in:
Ozan Çağlayan
2011-06-07 06:28:18 +00:00
parent 9cdcd7b48e
commit c70885b01c
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/operations/build.py
+16 -10
View File
@@ -242,6 +242,9 @@ class Builder:
self.delta_map = {} self.delta_map = {}
self.has_ccache = False
self.has_icecream = False
def set_spec_file(self, specuri): def set_spec_file(self, specuri):
if not specuri.is_remote_file(): if not specuri.is_remote_file():
# FIXME: doesn't work for file:// # FIXME: doesn't work for file://
@@ -334,6 +337,12 @@ class Builder:
self.set_build_type(build_type) self.set_build_type(build_type)
self.unpack_source_archives() self.unpack_source_archives()
if self.has_ccache:
ctx.ui.info(_("ccache detected..."))
if self.has_icecream:
ctx.ui.info(_("IceCream detected. Make sure your daemon "
"is up and running..."))
self.run_setup_action() self.run_setup_action()
self.run_build_action() self.run_build_action()
if ctx.get_option('debug') and not ctx.get_option('ignore_check'): if ctx.get_option('debug') and not ctx.get_option('ignore_check'):
@@ -387,23 +396,22 @@ class Builder:
"SRC_RELEASE": self.spec.getSourceRelease()} "SRC_RELEASE": self.spec.getSourceRelease()}
os.environ.update(env) os.environ.update(env)
# First check icecream, if not found use ccache, no need to use both # First check icecream, if not found use ccache
# together (according to kde-wiki it cause performance loss) # TODO: Add support for using both of them
if ctx.config.values.build.buildhelper == "icecream": if ctx.config.values.build.buildhelper == "icecream":
if os.path.exists("/opt/icecream/bin/gcc"): if os.path.exists("/opt/icecream/bin/gcc"):
# Add icecream directory for support distributed compiling :) self.has_icecream = True
os.environ["PATH"] = "/opt/icecream/bin:%(PATH)s" % os.environ os.environ["PATH"] = "/opt/icecream/bin:%(PATH)s" % os.environ
ctx.ui.info(_("IceCream detected. Make sure your daemon "
"is up and running..."))
elif ctx.config.values.build.buildhelper == "ccache": elif ctx.config.values.build.buildhelper == "ccache":
if os.path.exists("/usr/lib/ccache/bin/gcc"): if os.path.exists("/usr/lib/ccache/bin/gcc"):
# Add ccache directory for support Compiler Cache :) self.has_ccache = True
os.environ["PATH"] = "/usr/lib/ccache/bin:%(PATH)s" \ os.environ["PATH"] = "/usr/lib/ccache/bin:%(PATH)s" \
% os.environ % os.environ
# Force ccache to use /root/.ccache instead of $HOME/.ccache # Force ccache to use /root/.ccache instead of $HOME/.ccache
# which can be modified through actions.py # as $HOME can be modified through actions.py
os.environ["CCACHE_DIR"] = "/root/.ccache" os.environ["CCACHE_DIR"] = "/root/.ccache"
ctx.ui.info(_("ccache detected..."))
def fetch_files(self): def fetch_files(self):
self.specdiruri = os.path.dirname(self.specuri.get_uri()) self.specdiruri = os.path.dirname(self.specuri.get_uri())
@@ -475,7 +483,6 @@ class Builder:
if self.spec.source.partOf: if self.spec.source.partOf:
return return
ctx.ui.info(_('PartOf tag not defined, looking for component'))
diruri = util.parenturi(self.specuri.get_uri()) diruri = util.parenturi(self.specuri.get_uri())
parentdir = util.parenturi(diruri) parentdir = util.parenturi(diruri)
url = util.join_path(parentdir, 'component.xml') url = util.join_path(parentdir, 'component.xml')
@@ -500,7 +507,6 @@ class Builder:
path = url path = url
comp = component.CompatComponent() comp = component.CompatComponent()
comp.read(path) comp.read(path)
ctx.ui.info(_('Source is part of %s component') % comp.name)
self.spec.source.partOf = comp.name self.spec.source.partOf = comp.name
def fetch_source_archives(self): def fetch_source_archives(self):