no-debug cli'den atıldı, sadece config seçeneği oldu.
This commit is contained in:
+2
-2
@@ -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)
|
||||
|
||||
@@ -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',
|
||||
|
||||
+2
-2
@@ -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 = ""
|
||||
|
||||
+2
-2
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user