- just give a warning if strip command fails (others do like that or simply ignoring the error too)
- move strip action into build_packages for build-* commands to behave better...
This commit is contained in:
+4
-2
@@ -162,8 +162,6 @@ class PisiBuild:
|
|||||||
self.run_build_action()
|
self.run_build_action()
|
||||||
self.run_install_action()
|
self.run_install_action()
|
||||||
|
|
||||||
self.strip_install_dir()
|
|
||||||
|
|
||||||
# after all, we are ready to build/prepare the packages
|
# after all, we are ready to build/prepare the packages
|
||||||
self.build_packages()
|
self.build_packages()
|
||||||
|
|
||||||
@@ -431,6 +429,10 @@ class PisiBuild:
|
|||||||
def build_packages(self):
|
def build_packages(self):
|
||||||
"""Build each package defined in PSPEC file. After this process there
|
"""Build each package defined in PSPEC file. After this process there
|
||||||
will be .pisi files hanging around, AS INTENDED ;)"""
|
will be .pisi files hanging around, AS INTENDED ;)"""
|
||||||
|
|
||||||
|
# Strip install directory before building .pisi packages.
|
||||||
|
self.strip_install_dir()
|
||||||
|
|
||||||
for package in self.spec.packages:
|
for package in self.spec.packages:
|
||||||
|
|
||||||
# store additional files
|
# store additional files
|
||||||
|
|||||||
+1
-1
@@ -381,7 +381,7 @@ def strip_file(filepath):
|
|||||||
p = os.popen("strip %s %s" %(flags, f))
|
p = os.popen("strip %s %s" %(flags, f))
|
||||||
ret = p.close()
|
ret = p.close()
|
||||||
if ret:
|
if ret:
|
||||||
raise UtilError, "strip command failed!"
|
ctx.ui.warning("strip command failed for file '%s'!" % f)
|
||||||
|
|
||||||
if "current ar archive" in o:
|
if "current ar archive" in o:
|
||||||
run_strip(filepath, "-g")
|
run_strip(filepath, "-g")
|
||||||
|
|||||||
Reference in New Issue
Block a user