[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge] bin: hopefully fixed mysql stripping
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2011-10-16 12:24:37
Message-ID: 20111016122437.76821A60B9 () git ! kde ! org
[Download RAW message or body]

Git commit 9ace51c8722acbe107fb8274e672308f63965940 by Patrick von Reth.
Committed on 15/10/2011 at 17:27.
Pushed by vonreth into branch 'master'.

hopefully fixed mysql stripping
(cherry picked from commit 41292c323d86042be846fb0c11ea875e16b5e951)

M  +2    -1    bin/Package/PackageBase.py
M  +6    -6    bin/Packager/CollectionPackagerBase.py

http://commits.kde.org/emerge/9ace51c8722acbe107fb8274e672308f63965940

diff --git a/bin/Package/PackageBase.py b/bin/Package/PackageBase.py
index 65d09a3..136f7b7 100644
--- a/bin/Package/PackageBase.py
+++ b/bin/Package/PackageBase.py
@@ -207,12 +207,13 @@ class PackageBase (EmergeBase):
     def strip( self , fileName ):
         """strip debugging informations from shared libraries and executables - \
                mingw only!!! """
         if self.subinfo.options.package.disableStriping or not isMinGW(): 
-            debug("Skiping stipping of " + fileName ,1 )
+            utils.debug("Skiping stipping of " + fileName ,2 )
             return True
         basepath = os.path.join( self.installDir() )
         filepath = os.path.join( basepath, "bin",  fileName )
 
         cmd = "strip -s " + filepath
+        utils.debug(cmd,2)
         os.system( cmd )
         return True
 
diff --git a/bin/Packager/CollectionPackagerBase.py \
b/bin/Packager/CollectionPackagerBase.py index 13f6da0..a78845e 100644
--- a/bin/Packager/CollectionPackagerBase.py
+++ b/bin/Packager/CollectionPackagerBase.py
@@ -118,7 +118,7 @@ class CollectionPackagerBase( PackagerBase ):
             defaultTarget = portage.findPossibleTargets( category, package, version \
                )
             _package = portage.getPackageInstance( category, package, defaultTarget \
                )
             imageDirs.append( ( os.path.join( self.__buildRoot( category, package, \
                version ),
-                    self.__imageDirPattern( _package, defaultTarget ) ), \
_package.subinfo.options.merge.destinationPath ) ) +                    \
self.__imageDirPattern( _package, defaultTarget ) ), \
_package.subinfo.options.merge.destinationPath , \
_package.subinfo.options.package.disableStriping ) )  # this loop collects the files \
from all image directories  return imageDirs
 
@@ -195,7 +195,7 @@ class CollectionPackagerBase( PackagerBase ):
                 elif os.path.isfile( f ) and whitelist( z ):
                     yield f
 
-    def copyFiles( self, srcDir, destDir ):
+    def copyFiles( self, srcDir, destDir, strip  ):
         """
             Copy the binaries for the Package from srcDir to the imageDir
             directory
@@ -220,7 +220,7 @@ class CollectionPackagerBase( PackagerBase ):
                 utils.createDir( os.path.dirname( entry_target ) )
             shutil.copy( entry, entry_target )
             utils.debug( "Copied %s to %s" % ( entry, entry_target ), 2 )
-            if entry_target.endswith(".dll") or entry_target.endswith(".exe"):
+            if strip and entry_target.endswith(".dll") or \
entry_target.endswith(".exe"):  self.strip( entry_target )
         for entry in duplicates:
             entry_target = entry.replace( srcDir, os.path.join( destDir + \
os.path.sep ) ) @@ -228,7 +228,7 @@ class CollectionPackagerBase( PackagerBase ):
                 utils.createDir( os.path.dirname( entry_target ) )
             shutil.copy( entry, entry_target )
             utils.debug( "Copied %s to %s" % ( entry, entry_target ), 2 )
-            if entry_target.endswith(".dll") or entry_target.endswith(".exe"):
+            if strip and entry_target.endswith(".dll") or \
entry_target.endswith(".exe"):  self.strip( entry_target )
           
     def internalCreatePackage( self ):
@@ -236,12 +236,12 @@ class CollectionPackagerBase( PackagerBase ):
         if not utils.envAsBool("EMERGE_NOCLEAN"):
             utils.debug( "cleaning imagedir: %s" % self.imageDir() )
             utils.cleanDirectory( self.imageDir() )
-            for directory, mergeDir in self.__getImageDirectories():
+            for directory, mergeDir, strip  in self.__getImageDirectories():
                 imageDir = self.imageDir()
                 if mergeDir:
                     imageDir = os.path.join( imageDir, mergeDir )
                 if os.path.exists( directory ):
-                    self.copyFiles(directory, imageDir)
+                    self.copyFiles(directory, imageDir, strip)
                 else:
                     utils.warning( "image directory %s does not exist!" % directory \
)  


[prev in list] [next in list] [prev in thread] [next in thread]