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

--no-static -> --create-static

Browse Source 
Don't generate -static packages by default...
This commit is contained in:
Barış Metin
2006-05-08 17:22:21 +00:00
parent 1ba7f1c033
commit e5fe913427
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+3 -3
View File
@@ -77,7 +77,7 @@ def check_path_collision(package, pkgList):
# collide. Exp: # collide. Exp:
# pinfo.path: /usr/share # pinfo.path: /usr/share
# path.path: /usr/share/doc # path.path: /usr/share/doc
if (path.path.endswith(ctx.const.ar_file_suffix) and not ctx.get_option('no_static')) or \ 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.get_option('no_debug')):
# don't throw collision error for these files. # don't throw collision error for these files.
# we'll handle this in gen_files_xml.. # we'll handle this in gen_files_xml..
@@ -610,7 +610,7 @@ class Builder:
def add_path(path): def add_path(path):
# add the files under material path # add the files under material path
for fpath, fhash in util.get_file_hashes(path, collisions, install_dir): for fpath, fhash in util.get_file_hashes(path, collisions, install_dir):
if not ctx.get_option('no_static') \ if ctx.get_option('create_static') \
and fpath.endswith(ctx.const.ar_file_suffix) \ and fpath.endswith(ctx.const.ar_file_suffix) \
and not package.name.endswith(ctx.const.static_name_suffix) \ and not package.name.endswith(ctx.const.static_name_suffix) \
and util.is_ar_file(fpath): and util.is_ar_file(fpath):
@@ -726,7 +726,7 @@ class Builder:
# Strip install directory before building .pisi packages. # Strip install directory before building .pisi packages.
self.strip_install_dir() self.strip_install_dir()
if not ctx.get_option('no_static'): if ctx.get_option('create_static'):
obj = self.generate_static_package_object() obj = self.generate_static_package_object()
if obj: if obj:
self.spec.packages.append(obj) self.spec.packages.append(obj)
pisi/cli/commands.py
+1 -1
View File
@@ -364,7 +364,7 @@ unpack, setup, build, install, package
help=_("bypass errors from ActionsAPI")) help=_("bypass errors from ActionsAPI"))
self.parser.add_option("-B", "--ignore-comar", action="store_true", self.parser.add_option("-B", "--ignore-comar", action="store_true",
default=False, help=_("bypass comar configuration agent")) default=False, help=_("bypass comar configuration agent"))
self.parser.add_option("", "--no-static", action="store_true", self.parser.add_option("", "--create-static", action="store_true",
default=False, help=_("don't create a static package with ar files")) default=False, help=_("don't create a static package with ar files"))
self.parser.add_option("", "--no-debug", action="store_true", self.parser.add_option("", "--no-debug", action="store_true",
default=False, help=_("don't create a debug package with debug files")) default=False, help=_("don't create a debug package with debug files"))