Forcefully re-autoconf Mozilla since the build breaks so often.
This commit is contained in:
Родитель
4a6c0bec54
Коммит
743644db60
|
@ -15,7 +15,9 @@ source = InterpKit
|
|||
|
||||
[mi]
|
||||
source = mozilla-inbound
|
||||
conf = CC="ccache cc" CXX="ccache g++" ../configure --enable-optimize --disable-debug --enable-threadsafe --with-system-nspr --with-nspr-prefix=/usr/local
|
||||
|
||||
[bc]
|
||||
source = ionmonkey
|
||||
conf = CC="ccache cc" CXX="ccache g++" ../configure --enable-optimize --disable-debug --enable-threadsafe --with-system-nspr --with-nspr-prefix=/usr/local
|
||||
|
||||
|
|
|
@ -1,7 +1,9 @@
|
|||
# vim: set ts=4 sw=4 tw=99 et:
|
||||
import os
|
||||
import sys
|
||||
import utils
|
||||
import puller
|
||||
import platform
|
||||
import subprocess
|
||||
from utils import Run
|
||||
|
||||
|
@ -117,6 +119,7 @@ class Mozilla(Engine):
|
|||
super(Mozilla, self).__init__(conf)
|
||||
self.puller = 'hg'
|
||||
self.source = conf.get(source, 'source')
|
||||
self.config_line = conf.get(source, 'conf')
|
||||
self.args = None
|
||||
self.important = True
|
||||
|
||||
|
@ -129,7 +132,24 @@ class Mozilla(Engine):
|
|||
return env
|
||||
|
||||
def build(self):
|
||||
os.system("make -j 3 -C " + os.path.join('js', 'src', 'Opt'))
|
||||
# Step 1. autoconf.
|
||||
with utils.FolderChanger(os.path.join('js', 'src')):
|
||||
if platform.system() == "Darwin":
|
||||
utils.Shell("autoconf213")
|
||||
elif platform.system() == "Linux":
|
||||
utils.Shell("autoconf2.13")
|
||||
elif platform.system() == "Windows":
|
||||
utils.Shell("autoconf-2.13")
|
||||
|
||||
os.mkdir(os.path.join('js', 'src', 'Opt'))
|
||||
|
||||
# Step 2. configure
|
||||
with utils.FolderChanger(os.path.join('js', 'src', 'Opt')):
|
||||
self.config_line
|
||||
utils.Shell(self.config_line)
|
||||
|
||||
# Step 3. build
|
||||
utils.Shell("make -j 3 -C " + os.path.join('js', 'src', 'Opt'))
|
||||
|
||||
def shell(self):
|
||||
return os.path.join('js', 'src', 'Opt', 'js')
|
||||
|
|
|
@ -27,8 +27,9 @@ NumUpdated = 0
|
|||
for e in KnownEngines:
|
||||
try:
|
||||
cset, updated = e.updateAndBuild(True, False)
|
||||
except:
|
||||
except Exception as err:
|
||||
print('Build failed!')
|
||||
print(err)
|
||||
continue
|
||||
if cset == None:
|
||||
continue
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
# vim: set ts=4 sw=4 tw=99 et:
|
||||
import os
|
||||
import commands
|
||||
import subprocess
|
||||
|
||||
class FolderChanger:
|
||||
|
@ -24,3 +25,9 @@ def Run(vec):
|
|||
print(o)
|
||||
return o
|
||||
|
||||
def Shell(string):
|
||||
print(string)
|
||||
status, output = commands.getstatusoutput(string)
|
||||
print(output)
|
||||
return output
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче