Merge branches/quickjs to trunk. This is the way.
git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3621 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
@ -19,7 +19,7 @@ root = os.path.dirname(os.path.join(os.getcwd(), os.path.dirname(__file__)))
|
||||
tmp = os.path.join(root, 'tmp')
|
||||
logs = os.path.join(root, 'logs')
|
||||
tests = os.path.join(root, 'tests')
|
||||
executable = os.path.join(root, 'tildefriends')
|
||||
executable = os.path.join(root, 'out', 'debug', 'tildefriends')
|
||||
|
||||
if not os.path.isdir(logs):
|
||||
os.makedirs(logs)
|
||||
@ -33,7 +33,7 @@ for pattern in arguments.tests:
|
||||
selectedTests.add(match)
|
||||
|
||||
env = os.environ.copy()
|
||||
env['TILDEFRIENDS'] = executable
|
||||
env['TILDEFRIENDS'] = executable + ' run -s'
|
||||
env['LOGDIR'] = logs
|
||||
|
||||
def indent(text):
|
||||
|
@ -1,10 +0,0 @@
|
||||
#!/usr/bin/python
|
||||
|
||||
import urllib
|
||||
import json
|
||||
|
||||
data = json.load(urllib.urlopen('http://omahaproxy.appspot.com/all.json'))
|
||||
for os in data:
|
||||
for version in os['versions']:
|
||||
if version['channel'] == 'stable':
|
||||
print version['v8_version'], os['os']
|
@ -21,17 +21,9 @@ if not os.path.isdir(kWork):
|
||||
os.chdir(kWork)
|
||||
|
||||
kUvRepository = 'https://github.com/libuv/libuv.git'
|
||||
kUvBranch = 'v1.18.0'
|
||||
kUvBranch = 'v1.33.1'
|
||||
kUvWork = 'uv'
|
||||
|
||||
kV8Repository = 'https://github.com/v8/v8.git'
|
||||
kV8Branch = 'branch-heads/6.3'
|
||||
kV8Work = 'v8'
|
||||
|
||||
kLmdbRepository = 'https://github.com/LMDB/lmdb.git'
|
||||
kLmdbBranch = 'LMDB_0.9.21'
|
||||
kLmdbWork = 'lmdb'
|
||||
|
||||
cores = multiprocessing.cpu_count()
|
||||
if platform.machine() == 'armv7l':
|
||||
cores = 1
|
||||
@ -84,78 +76,5 @@ def updateUv():
|
||||
env['WINDOWSSDKDIR'] = ''
|
||||
run(['cmd', '/C', 'call', 'vcbuild.bat', 'release', 'x64'], cwd=kUvWork, env=env)
|
||||
|
||||
def updateLmdb():
|
||||
print 'liblmdb'
|
||||
print
|
||||
clean = False
|
||||
|
||||
if os.path.exists(os.path.join(kLmdbWork, '.update-deps-branch')):
|
||||
haveBranch = open(os.path.join(kLmdbWork, '.update-deps-branch'), 'r').read().strip()
|
||||
if kLmdbBranch != haveBranch:
|
||||
print haveBranch, '=>', kLmdbBranch
|
||||
clean = True
|
||||
else:
|
||||
clean = True
|
||||
|
||||
if clean:
|
||||
if os.path.isdir(os.path.join(kLmdbWork)):
|
||||
print 'Cleaning', kLmdbWork
|
||||
shutil.rmtree(os.path.join(kLmdbWork), onerror=makeWritableAndRetry)
|
||||
if not os.path.isdir(kLmdbWork):
|
||||
run(['git', 'clone', '--branch', kLmdbBranch, kLmdbRepository, kLmdbWork])
|
||||
open(os.path.join(kLmdbWork, '.update-deps-branch'), 'w').write(kLmdbBranch)
|
||||
|
||||
def updateV8():
|
||||
print 'v8'
|
||||
print
|
||||
clean = False
|
||||
|
||||
if False:
|
||||
if os.path.exists(os.path.join(kV8Work, '.update-deps-branch')):
|
||||
haveBranch = open(os.path.join(kV8Work, '.update-deps-branch'), 'r').read().strip()
|
||||
if kV8Branch != haveBranch:
|
||||
print haveBranch, '=>', kV8Branch
|
||||
clean = True
|
||||
else:
|
||||
clean = True
|
||||
|
||||
if clean:
|
||||
if os.path.isdir(kV8Work):
|
||||
shutil.rmtree(kV8Work, onerror=makeWritableAndRetry)
|
||||
|
||||
if True or sys.platform == 'linux2':
|
||||
# XXX Modify this one .py file which assumes things that conflict with my debian environment.
|
||||
if os.path.isfile(os.path.join(kV8Work, 'tools/swarming_client/third_party/requests/packages/urllib3/contrib/pyopenssl.py')):
|
||||
print 'resetting tools/swarming_client'
|
||||
print run(['git', 'checkout', '.'], cwd=os.path.join(kV8Work, 'tools', 'swarming_client'))
|
||||
|
||||
extension = ''
|
||||
if sys.platform == 'win32':
|
||||
extension = '.bat'
|
||||
if not os.path.isdir(kV8Work):
|
||||
run(['fetch' + extension, 'v8'])
|
||||
|
||||
win32Env = os.environ.copy()
|
||||
win32Env['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
|
||||
win32Env['GYP_MSVS_VERSION'] = '2015'
|
||||
win32Env['GYP_GENERATORS'] = 'msvs'
|
||||
|
||||
open(os.path.join(kV8Work, '.update-deps-branch'), 'w').write(kV8Branch)
|
||||
run(['git', 'fetch'], cwd=kV8Work)
|
||||
run(['git', 'checkout', kV8Branch], cwd=kV8Work)
|
||||
|
||||
if sys.platform == 'win32':
|
||||
run(['gclient' + extension, 'sync'], cwd=kV8Work, env=win32Env)
|
||||
else:
|
||||
run(['gclient' + extension, 'sync'], cwd=kV8Work)
|
||||
|
||||
if sys.platform == 'linux2':
|
||||
run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true v8_use_external_startup_data=false is_clang=false use_sysroot=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env)
|
||||
else:
|
||||
run(['gn' + extension, 'gen', 'out', "--args=is_component_build=false v8_static_library=true v8_use_external_startup_data=false treat_warnings_as_errors=false"], cwd=kV8Work, env=win32Env)
|
||||
run(['ninja', '-C', 'out', 'v8'], cwd=kV8Work)
|
||||
|
||||
if __name__ == '__main__':
|
||||
updateUv()
|
||||
updateLmdb()
|
||||
updateV8()
|
||||
|
Reference in New Issue
Block a user