Issue 3404 - Add platform name to devenv path

packager.py

 # coding: utf-8
 
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Note: These are the base functions common to all packagers, the actual
 # packagers are implemented in packagerGecko and packagerChrome.
 
 import sys, os, re, codecs, subprocess, json, zipfile
 from StringIO import StringIO
 from chainedconfigparser import ChainedConfigParser
 
 import buildtools
 
 def getDefaultFileName(metadata, version, ext):
   return '%s-%s.%s' % (metadata.get('general', 'basename'), version, ext)
 
 def getMetadataPath(baseDir, type):
   return os.path.join(baseDir, 'metadata.%s' % type)
 
-def getDevEnvPath(baseDir):
-  return os.path.join(baseDir, 'devenv')
+def getDevEnvPath(baseDir, type):
+  return os.path.join(baseDir, 'devenv.%s' % type)

[Sebastian Noack, 2016/01/27 14:16:49]

Nit: We usually use + (instead %) if concatenating only two strings. This is
slightly easier to read (and also faster in scenarios where this matters).

[kzar, 2016/01/27 14:20:29]

Done.

 
 def readMetadata(baseDir, type):
   parser = ChainedConfigParser()
   parser.optionxform = lambda option: option
   parser.read(getMetadataPath(baseDir, type))
   return parser
 
 def getBuildNum(baseDir):
   try:
     from buildtools.ensure_dependencies import Mercurial, Git
@@ skipping 94 matching lines @@
     names = self.keys()
     names.sort(key=sortKey)
     for name in names:
       zip.writestr(name, self[name])
     zip.close()
 
   def zipToString(self, sortKey=None):
     buffer = StringIO()
     self.zip(buffer, sortKey=sortKey)
     return buffer.getvalue()