Issue 4098 - Get rid of special build setup for development builds

sitescripts/extensions/bin/createNightlies.py

 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2016 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,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 104 matching lines @@
 
     def copyRepository(self):
         """
           Create a repository copy in a temporary directory
         """
         self.tempdir = tempfile.mkdtemp(prefix=self.config.repositoryName)
         command = ['hg', 'clone', '-q', self.config.repository, '-u', 'default', self.tempdir]
         subprocess.check_call(command)
 
         # Make sure to run ensure_dependencies.py if present
-        command = [
-            sys.executable,
-            os.path.join(self.tempdir, 'ensure_dependencies.py'), '-q'
-        ]
-        if os.path.isfile(command[0]):

[Vasily Kuznetsov, 2016/06/03 16:04:49]

Should not this become `command[1]` now that we've inserted python as the first
item of the list?

[Wladimir Palant, 2016/06/06 11:47:46]

Ouch, you are right. In fact, I had a better idea in order to make this code
less fragile.

[Vasily Kuznetsov, 2016/06/06 12:48:16]

Lovely!

-            subprocess.check_call(command)
+        depscript = os.path.join(self.tempdir, 'ensure_dependencies.py')
+        if os.path.isfile(depscript):
+            subprocess.check_call([sys.executable, depscript, '-q'])
 
     def writeChangelog(self, changes):
         """
           write the changelog file into the cloned repository
         """
         baseDir = os.path.join(self.config.nightliesDirectory, self.basename)
         if not os.path.exists(baseDir):
             os.makedirs(baseDir)
         changelogFile = '%s-%s.changelog.xhtml' % (self.basename, self.version)
         changelogPath = os.path.join(baseDir, changelogFile)
@@ skipping 168 matching lines @@
                     '/home/android/bin/makedebugbuild.py', '--revision',
                     self.buildNum, '--version', self.version, '--stdout'
                 ]))
                 subprocess.check_call(buildCommand, stdout=apkFile, close_fds=True)
             except:
                 # clear broken output if any
                 if os.path.exists(self.path):
                     os.remove(self.path)
                 raise
         else:
+            env = os.environ
+            spiderMonkeyBinary = self.config.spiderMonkeyBinary
+            if spiderMonkeyBinary:
+                env = dict(env, SPIDERMONKEY_BINARY=spiderMonkeyBinary)
+
             buildCommand = [
                 os.path.join(self.tempdir, 'build.py'), '-t', self.config.type,
                 'build', '-b', self.buildNum, '-k', self.config.keyFile,
                 self.path
             ]
-            subprocess.check_call(buildCommand)
+            subprocess.check_call(buildCommand, env=env)
 
         if not os.path.exists(self.path):
             raise Exception("Build failed, output file hasn't been created")
 
         linkPath = os.path.join(baseDir, '00latest%s' % self.config.packageSuffix)
         if hasattr(os, 'symlink'):
             if os.path.exists(linkPath):
                 os.remove(linkPath)
             os.symlink(os.path.basename(self.path), linkPath)
         else:
@@ skipping 293 matching lines @@
         except Exception, ex:
             logging.error('The build for %s failed:', repo)
             logging.exception(ex)
 
     file = open(nightlyConfigFile, 'wb')
     nightlyConfig.write(file)
 
 
 if __name__ == '__main__':
     main()