ccache veya icecream config içinde belirtilsin, öntanımlı hiçbirşey kullanmasın. configfile'da typo fixleri

This commit is contained in:
S.Çağlar Onur
2006-03-12 14:19:30 +00:00
parent a1213d11fe
commit 4e589ddff4
2 changed files with 14 additions and 10 deletions
+5 -3
View File
@@ -208,13 +208,15 @@ class Builder:
# First check icecream, if not found use ccache, no need to use both # First check icecream, if not found use ccache, no need to use both
# together (according to kde-wiki it cause performance loss) # together (according to kde-wiki it cause performance loss)
if ctx.config.values.general.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 :) # Add icecream directory for support distributed compiling :)
os.environ["PATH"] = "/opt/icecream/bin/:" + os.environ["PATH"] os.environ["PATH"] = "/opt/icecream/bin/:%s" % os.environ["PATH"]
ctx.ui.info(_("IceCream detected. Make sure your daemon is up and running...")) ctx.ui.info(_("IceCream detected. Make sure your daemon is up and running..."))
elif os.path.exists("/usr/lib/ccache/bin/gcc"): elif ctx.config.values.general.buildhelper == "ccache":
if os.path.exists("/usr/lib/ccache/bin/gcc"):
# Add ccache directory for support Compiler Cache :) # Add ccache directory for support Compiler Cache :)
os.environ["PATH"] = "/usr/lib/ccache/bin/:" + os.environ["PATH"] os.environ["PATH"] = "/usr/lib/ccache/bin/:%s" % os.environ["PATH"]
ctx.ui.info(_("CCache detected...")) ctx.ui.info(_("CCache detected..."))
def fetch_files(self): def fetch_files(self):
+4 -2
View File
@@ -18,7 +18,8 @@
# having an INI like format like below. # having an INI like format like below.
# #
#[general] #[general]
#destinationdirectory = /tmp #destinationdirectory = /
#buildhelper = None / ccache / icecream
#autoclean = False #autoclean = False
# #
#[build] #[build]
@@ -56,9 +57,10 @@ class Error(pisi.Error):
class GeneralDefaults: class GeneralDefaults:
"""Default values for [general] section""" """Default values for [general] section"""
destinationdirectory = "/" destinationdirectory = "/"
buildhelper = None
autoclean = False autoclean = False
distribution = "Pardus" distribution = "Pardus"
distribution_release = "0.1" distribution_release = "1.0"
http_proxy = os.getenv("HTTP_PROXY") or None http_proxy = os.getenv("HTTP_PROXY") or None
https_proxy = os.getenv("HTTPS_PROXY") or None https_proxy = os.getenv("HTTPS_PROXY") or None
ftp_proxy = os.getenv("FTP_PROXY") or None ftp_proxy = os.getenv("FTP_PROXY") or None