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

- fix a FIXME ;).

Browse Source 
- enable create-static and create-debug by default. (buildfarm creates these packages and packages 
created locally conflict with them, having the static files...)
This commit is contained in:
Barış Metin
2006-04-20 09:43:41 +00:00
parent 0157a0d803
commit 36f57b5b3a
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/build.py
+9 -4
View File
@@ -492,7 +492,11 @@ class Builder:
static_package_obj.partOf = 'library:static'
for f in ar_files:
static_package_obj.files.append(pisi.specfile.Path(path = f[len(self.pkg_install_dir()):], fileType = "library"))
static_package_obj.packageDependencies.append(pisi.dependency.Dependency(package = self.spec.source.name))
# append all generated packages to dependencies
for p in self.spec.packages:
static_package_obj.packageDependencies.append(
pisi.dependency.Dependency(package = p.name))
return static_package_obj
@@ -515,9 +519,10 @@ class Builder:
for f in debug_files:
static_package_obj.files.append(pisi.specfile.Path(path = f[len(self.pkg_install_dir()):], fileType = "debug"))
# FIXME: This cause a dependency problem for one source -> multi binary packages. For example mysql source package
# has mysql-lib, -server and -client but mysql-debug package depends mysql which is not exists so it cannot installed.
static_package_obj.packageDependencies.append(pisi.dependency.Dependency(package = self.spec.source.name))
# append all generated packages to dependencies
for p in self.spec.packages:
static_package_obj.packageDependencies.append(
pisi.dependency.Dependency(package = p.name))
return static_package_obj
pisi/cli/commands.py
+2 -2
View File
@@ -361,9 +361,9 @@ unpack, setup, build, install, package
self.parser.add_option("-B", "--ignore-comar", action="store_true",
default=False, help=_("bypass comar configuration agent"))
self.parser.add_option("-S", "--create-static", action="store_true",
default=False, help=_("automatically create a static package with ar files"))
default=True, help=_("automatically create a static package with ar files"))
self.parser.add_option("-g", "--create-debug", action="store_true",
default=False, help=_("automatically create a debug package with debug files"))
default=True, help=_("automatically create a debug package with debug files"))
def run(self):