More build tools improvements

packager.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus build tools,
 # Copyright (C) 2006-2012 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 27 matching lines @@
     (result, dummy) = subprocess.Popen(['hg', 'id', '-R', baseDir, '-n'], stdout=subprocess.PIPE).communicate()
     return re.sub(r'\D', '', result)
   except Exception:
     return '0'
 
 def getBuildVersion(baseDir, metadata, releaseBuild, buildNum=None):
   version = metadata.get('general', 'version')
   if not releaseBuild:
     if buildNum == None:
       buildNum = getBuildNum(baseDir)
+    buildNum = str(buildNum)
     if len(buildNum) > 0:
       if re.search(r'(^|\.)\d+$', version):
         # Numerical version number - need to fill up with zeros to have three
         # version components.
         while version.count('.') < 2:
           version += '.0'
       version += '.' + buildNum
   return version
 
 def getTemplate(template, autoEscape=False):
@@ skipping 26 matching lines @@
         name = relpath + ('/' if relpath != '' else '') + file
         if (skip == None or file not in skip) and self.isIncluded(name):
           self.read(os.path.join(path, file), name)
     else:
       file = open(path, 'rb')
       if relpath in self:
         print >>sys.stderr, 'Warning: File %s defined multiple times' % relpath
       self[relpath] = file.read()
       file.close()
 
-  def readMappedFiles(self, baseDir, mappings):
-    for target, source in mappings:
+  def readMappedFiles(self, mappings):
+    for item in mappings:
+      target, source = item
+
       # Make sure the file is inside an included directory
       if '/' in target and not self.isIncluded(target):
         continue
       parts = source.split('/')
-      path = os.path.join(baseDir, *parts)
+      path = os.path.join(os.path.dirname(item.source), *parts)
       if os.path.exists(path):
         self.read(path, target)
       else:
         print >>sys.stderr, 'Warning: Mapped file %s doesn\'t exist' % source
 
   def zip(self, outFile, sortKey=None):
     zip = zipfile.ZipFile(outFile, 'w', zipfile.ZIP_DEFLATED)
     names = self.keys()
     names.sort(key=sortKey)
     for name in names:
       data = self[name]
       if self.process:
         data = self.process(name, data)
       zip.writestr(name, data)
     zip.close()
 
   def zipToString(self, sortKey=None):
     buffer = StringIO()
     self.zip(buffer, sortKey=sortKey)
     return buffer.getvalue()