From 085c07f0d43515e758102fd212615f4a23b66875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=2E=C3=87a=C4=9Flar=20Onur?= Date: Thu, 6 Jul 2006 10:26:51 +0000 Subject: [PATCH] =?UTF-8?q?no-debug=20cli'den=20at=C4=B1ld=C4=B1,=20sadece?= =?UTF-8?q?=20config=20se=C3=A7ene=C4=9Fi=20oldu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pisi/build.py | 4 ++-- pisi/cli/commands.py | 2 -- pisi/configfile.py | 4 ++-- pisi/util.py | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pisi/build.py b/pisi/build.py index a5363fc4..a78cb6ce 100644 --- a/pisi/build.py +++ b/pisi/build.py @@ -80,7 +80,7 @@ def check_path_collision(package, pkgList): # pinfo.path: /usr/share # path.path: /usr/share/doc if (path.path.endswith(ctx.const.ar_file_suffix) and ctx.get_option('create_static')) or \ - (path.path.endswith(ctx.const.debug_file_suffix) and not ctx.get_option('no_debug')): + (path.path.endswith(ctx.const.debug_file_suffix) and not ctx.config.values.build.generatedebug): # don't throw collision error for these files. # we'll handle this in gen_files_xml.. continue @@ -719,7 +719,7 @@ class Builder: if obj: self.spec.packages.append(obj) - if not ctx.get_option('no_debug'): + if not ctx.config.values.build.generatedebug: obj = self.generate_debug_package_object() if obj: self.spec.packages.append(obj) diff --git a/pisi/cli/commands.py b/pisi/cli/commands.py index 52021e3c..9b21f9d5 100644 --- a/pisi/cli/commands.py +++ b/pisi/cli/commands.py @@ -390,8 +390,6 @@ unpack, setup, build, install, package. default=False, help=_("bypass comar configuration agent")) self.parser.add_option("", "--create-static", action="store_true", default=False, help=_("create a static package with ar files")) - self.parser.add_option("", "--no-debug", action="store_true", - default=False, help=_("don't create a debug package with debug files")) self.parser.add_option("", "--no-install", action="store_true", default=False, help=_("don't install build dependencies, fail if a build dependency is present")) self.parser.add_option("-F", "--package-format", action="store", default='1.1', diff --git a/pisi/configfile.py b/pisi/configfile.py index fc83d5de..f1f62c46 100644 --- a/pisi/configfile.py +++ b/pisi/configfile.py @@ -24,7 +24,7 @@ # #[build] #host = i686-pc-linux-gnu -#debug = False +#generateDebug = False #jobs = "-j1" #CFLAGS= -mtune=i686 -O2 -pipe -fomit-frame-pointer #CXXFLAGS= -mtune=i686 -O2 -pipe -fomit-frame-pointer @@ -71,7 +71,7 @@ class BuildDefaults: """Default values for [build] section""" host = "i686-pc-linux-gnu" jobs = "-j1" - debug = False + generateDebug = False cflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" cxxflags = "-mtune=i686 -O2 -pipe -fomit-frame-pointer" ldflags = "" diff --git a/pisi/util.py b/pisi/util.py index 462781bc..d9a35119 100644 --- a/pisi/util.py +++ b/pisi/util.py @@ -575,14 +575,14 @@ def strip_file(filepath, outpath): return True elif "SB executable" in o: - if not ctx.get_option('no_debug'): + if not ctx.config.values.build.generatedebug: check_dir(os.path.dirname(outpath)) save_elf_debug(filepath, outpath) run_strip(filepath) return True elif "SB shared object" in o: - if not ctx.get_option('no_debug'): + if not ctx.config.values.build.generatedebug: check_dir(os.path.dirname(outpath)) save_elf_debug(filepath, outpath) run_strip(filepath, "--strip-unneeded")