github
/
teleport
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tmp: adjust build scripts.

dev
Apex Liu 2020-07-13 02:47:40 +08:00
parent 1722244670
commit 5353008364
3 changed files with 115 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
build/build.py
View File

@ -61,15 +61,15 @@ def main():
if x == 'q': if x == 'q':
break break
if x == 'c': # if x == 'c':
clean_all() # clean_all()
continue # continue
elif x == 'a': # elif x == 'a':
clean_everything() # clean_everything()
continue # continue
elif x == 'e': # elif x == 'e':
clean_external() # clean_external()
continue # continue
try: try:
x = int(x) x = int(x)
@ -78,10 +78,10 @@ def main():
continue continue
opt = select_option_by_id(int(x)) opt = select_option_by_id(int(x))
if 'config' == opt['name']: # if 'config' == opt['name']:
if make_config(): # if make_config():
make_options() # make_options()
continue # continue
if opt is None: if opt is None:
cc.e('unknown selection: ', x) cc.e('unknown selection: ', x)
@ -153,9 +153,12 @@ def do_opt(opt):
elif 'pysrt' == opt['name']: elif 'pysrt' == opt['name']:
script = 'build-pysrt.py' script = 'build-pysrt.py'
elif 'external' == opt['name']: # elif 'external' == opt['name']:
# script = 'build-external.py'
# arg = '%s %s' % (ctx.target_path, opt['bits'])
elif opt['name'] in ['ext-client', 'ext-server', 'clear-ext-client', 'clear-ext-server']:
script = 'build-external.py' script = 'build-external.py'
arg = '%s %s' % (ctx.target_path, opt['bits']) arg = '%s %s %s' % (opt['name'], ctx.target_path, opt['bits'])
elif 'server' == opt['name']: elif 'server' == opt['name']:
script = 'build-server.py' script = 'build-server.py'
@ -166,13 +169,13 @@ def do_opt(opt):
# arg = 'installer' # arg = 'installer'
arg = '%s %s installer' % (ctx.dist, opt['bits']) arg = '%s %s installer' % (ctx.dist, opt['bits'])
elif 'assist-exe' == opt['name']: elif 'client' == opt['name']:
script = 'build-assist.py' script = 'build-assist.py'
arg = '%s %s exe' % (ctx.target_path, opt['bits']) arg = '%s %s exe' % (ctx.target_path, opt['bits'])
# elif 'assist-rdp' == opt['name']: # elif 'assist-rdp' == opt['name']:
# script = 'build-assist.py' # script = 'build-assist.py'
# arg = '%s rdp' % (opt['bits']) # arg = '%s rdp' % (opt['bits'])
elif 'assist-installer' == opt['name']: elif 'client-installer' == opt['name']:
script = 'build-assist.py' script = 'build-assist.py'
arg = '%s %s installer' % (ctx.dist, opt['bits']) arg = '%s %s installer' % (ctx.dist, opt['bits'])
@ -218,40 +221,52 @@ def add_option(bits, name, disp):
options.append({'id': options_idx, 'name': name, 'disp': disp, 'bits': bits}) options.append({'id': options_idx, 'name': name, 'disp': disp, 'bits': bits})
def add_split(): def add_split(title=None):
global options global options
options.append(None) # options.append(None)
options.append({'id': '--SPLIT-LINE--', 'title': title})
def make_options(): def make_options():
# global options, options_idx
#
# options = list()
# options_idx = 0
if ctx.host_os in ['windows']: if ctx.host_os in ['windows']:
add_split('common')
add_option('x86', 'ver', 'Update version setting') add_option('x86', 'ver', 'Update version setting')
add_option('x86', 'pysrt', 'Make Python-Runtime for python%s-x86' % env.py_ver_str) add_split('client side')
add_option('x86', 'external', 'Build external dependency') # add_option('x86', 'external', '[OBSOLETE] Build external dependency')
add_split() add_option('x86', 'ext-client', 'Build external libraries for client')
add_option('x86', 'assist-exe', 'Assist Execute [%s]' % ctx.target_path) # add_option('x86', 'assist-exe', '[OBSOLETE] Assist Execute [%s]' % ctx.target_path)
add_option('x86', 'client', 'Build client applications [%s]' % ctx.target_path)
# add_option('x86', 'assist-rdp', 'Teleport RDP [%s]' % ctx.target_path) # add_option('x86', 'assist-rdp', 'Teleport RDP [%s]' % ctx.target_path)
add_option('x86', 'assist-installer', 'Assist Installer') # add_option('x86', 'assist-installer', '[OBSOLETE] Assist Installer')
add_split() add_option('x86', 'client-installer', 'Make client installer')
add_option('x86', 'clear-ext-client', 'Clear external libraries for client')
add_split('server side')
add_option('x86', 'pysrt', 'Make Python-Runtime for python%s-x86' % env.py_ver_str)
add_option('x86', 'ext-server', 'Build external libraries for server')
add_option('x86', 'server', 'Teleport Server [%s]' % ctx.target_path) add_option('x86', 'server', 'Teleport Server [%s]' % ctx.target_path)
add_split() # add_option('x86', 'installer', '[OBSOLETE] Teleport Installer for %s' % ctx.host_os)
add_option('x86', 'installer', 'Teleport Installer for %s' % ctx.host_os) add_option('x86', 'server-installer', 'Teleport Installer for %s' % ctx.host_os)
add_option('x86', 'clear-ext-server', 'Clear external libraries for server')
elif ctx.host_os == 'macos': elif ctx.host_os == 'macos':
add_option('x64', 'ver', 'Update version setting')
add_option('x86', 'ext-client', 'Build external libraries for client')
add_option('x64', 'assist-exe', 'Assist Execute [%s]' % ctx.target_path) add_option('x64', 'assist-exe', 'Assist Execute [%s]' % ctx.target_path)
add_option('x64', 'assist-installer', 'Assist Installer') add_option('x64', 'assist-installer', 'Assist Installer')
add_split()
add_option('x86', 'clear-ext-client', 'Clear external libraries for client')
else: else:
add_option('x64', 'ver', 'Update version setting') add_option('x64', 'ver', 'Update version setting')
add_split()
add_option('x64', 'pysrt', 'Make Python-Runtime for python%s-x64' % env.py_ver_str) add_option('x64', 'pysrt', 'Make Python-Runtime for python%s-x64' % env.py_ver_str)
add_option('x64', 'external', 'Build external dependency') # add_option('x64', 'external', '[OBSOLETE] Build external dependency')
# add_option('x86', 'ext-client', 'Build external libraries for client')
add_option('x86', 'ext-server', 'Build external libraries for server')
add_option('x64', 'server', 'Build server applications [%s]' % ctx.target_path)
# add_option('x64', 'installer', '[OBSOLETE] Make server installer for %s' % ctx.host_os)
add_option('x86', 'server-installer', 'Make server installer for %s' % ctx.host_os)
add_split() add_split()
add_option('x64', 'server', 'Build server app [%s]' % ctx.target_path) add_option('x86', 'clear-ext-client', 'Clear external libraries for client')
add_split() add_option('x86', 'clear-ext-server', 'Clear external libraries for server')
add_option('x64', 'installer', 'Make server installer for %s' % ctx.host_os)
def get_input(msg, log_func=cc.w): def get_input(msg, log_func=cc.w):
@ -263,27 +278,36 @@ def get_input(msg, log_func=cc.w):
def show_logo(): def show_logo():
cc.v('[]=======================================================[]') cc.v('[]==========================================================[]')
cc.o((cc.CR_VERBOSE, ' | '), (cc.CR_INFO, 'Teleport Projects Builder'), (cc.CR_VERBOSE, ' |')) cc.o((cc.CR_VERBOSE, ' | '), (cc.CR_INFO, 'Teleport Projects Builder'), (cc.CR_VERBOSE, ' |'))
cc.v(' | auth: apex.liu@qq.com |') cc.v(' | auth: apex.liu@qq.com |')
cc.v('[]=======================================================[]') cc.v('[]==========================================================[]')
def show_menu(): def show_menu():
cc.v('') cc.v('\n=====================[ MENU ]===============================')
cc.v('=========================================================')
for o in range(len(options)): for o in range(len(options)):
if options[o] is None: if options[o]['id'] == '--SPLIT-LINE--':
cc.v(' -------------------------------------------------------') if options[o]['title'] is not None:
# title = ' {}: '.format(options[o]['title'])
# pad = '-' * (60 - len(title))
# cc.v('\n{}{}'.format(title, pad))
cc.w('\n {}:'.format(options[o]['title']))
else:
cc.v('\n ----------------------------------------------------------')
continue continue
# if options[o] is None:
# cc.v(' -------------------------------------------------------')
# continue
cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, '%2d' % options[o]['id']), (cc.CR_NORMAL, '] ', options[o]['disp'])) cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, '%2d' % options[o]['id']), (cc.CR_NORMAL, '] ', options[o]['disp']))
cc.v(' -------------------------------------------------------') # cc.v(' -------------------------------------------------------')
cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' E'), (cc.CR_NORMAL, '] clean external temp. files.')) # cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' E'), (cc.CR_NORMAL, '] clean external temp. files.'))
cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' C'), (cc.CR_NORMAL, '] clean build and dist.')) # cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' C'), (cc.CR_NORMAL, '] clean build and dist.'))
cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' A'), (cc.CR_NORMAL, '] clean everything.')) # cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' A'), (cc.CR_NORMAL, '] clean everything.'))
cc.v(' -------------------------------------------------------') cc.v('\n ----------------------------------------------------------')
cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' Q'), (cc.CR_NORMAL, '] exit')) cc.o((cc.CR_NORMAL, ' ['), (cc.CR_INFO, ' Q'), (cc.CR_NORMAL, '] exit'))
cc.w('\nselect action: ', end='') cc.w('\nselect action: ', end='')

51
build/builder/build-external.py
View File

@ -108,9 +108,6 @@ class BuilderBase:
def _prepare_python(self): def _prepare_python(self):
cc.e("_prepare_python() pure-virtual function.") cc.e("_prepare_python() pure-virtual function.")
def fix_output(self):
pass
class BuilderWin(BuilderBase): class BuilderWin(BuilderBase):
def __init__(self): def __init__(self):
@ -365,9 +362,6 @@ class BuilderWin(BuilderBase):
else: else:
cc.w('already exists, skip.') cc.w('already exists, skip.')
def fix_output(self):
pass
class BuilderLinux(BuilderBase): class BuilderLinux(BuilderBase):
def __init__(self): def __init__(self):
@ -597,9 +591,6 @@ class BuilderLinux(BuilderBase):
# use os.unlink() because some file should be a link. # use os.unlink() because some file should be a link.
os.unlink(os.path.join(self.PATH_RELEASE, 'lib', i)) os.unlink(os.path.join(self.PATH_RELEASE, 'lib', i))
def fix_output(self):
pass
class BuilderMacOS(BuilderBase): class BuilderMacOS(BuilderBase):
def __init__(self): def __init__(self):
@ -697,6 +688,13 @@ class BuilderMacOS(BuilderBase):
os.system('make install') os.system('make install')
os.chdir(old_p) os.chdir(old_p)
rm = ['libuv.la', 'libuv.dylib', 'libuv.so.1', 'libuv.so', 'libuv.so.1.0.0']
for i in rm:
_path = os.path.join(self.PATH_RELEASE, 'lib', i)
if os.path.exists(_path):
utils.remove(_path)
def _build_mbedtls(self, file_name): def _build_mbedtls(self, file_name):
if not self._download_mbedtls(file_name): if not self._download_mbedtls(file_name):
return return
@ -831,15 +829,6 @@ class BuilderMacOS(BuilderBase):
def _prepare_python(self): def _prepare_python(self):
pass pass
def fix_output(self):
# remove .so files, otherwise will link to .so but not .a in default.
# rm = ['libsqlite3.la', 'libsqlite3.so.0', 'libsqlite3.so', 'libsqlite3.so.0.8.6', 'libuv.la', 'libuv.so.1', 'libuv.so', 'libuv.so.1.0.0']
rm = ['libuv.la', 'libuv.dylib', 'libuv.so.1', 'libuv.so', 'libuv.so.1.0.0']
for i in rm:
_path = os.path.join(self.PATH_RELEASE, 'lib', i)
if os.path.exists(_path):
utils.remove(_path)
def gen_builder(dist): def gen_builder(dist):
if dist == 'windows': if dist == 'windows':
@ -862,9 +851,12 @@ def main():
builder = None builder = None
argv = sys.argv[1:] argv = sys.argv[1:]
command = ''
for i in range(len(argv)): for i in range(len(argv)):
if 'debug' == argv[i]: if argv[i] in ['ext-client', 'ext-server', 'clear-ext-client', 'clear-ext-server']:
command = argv[i]
elif 'debug' == argv[i]:
ctx.set_target(TARGET_DEBUG) ctx.set_target(TARGET_DEBUG)
elif 'x86' == argv[i]: elif 'x86' == argv[i]:
ctx.set_bits(BITS_32) ctx.set_bits(BITS_32)
@ -876,17 +868,16 @@ def main():
if builder is None: if builder is None:
builder = gen_builder(ctx.host_os) builder = gen_builder(ctx.host_os)
builder.prepare_python() if command == 'ext-client':
builder.build_jsoncpp()
builder.build_jsoncpp() builder.build_mongoose()
builder.build_mongoose() builder.build_openssl()
builder.build_openssl() elif command == 'ext-server':
builder.build_libuv() builder.prepare_python()
builder.build_mbedtls() builder.build_mbedtls()
builder.build_zlib() builder.build_libuv()
builder.build_libssh() builder.build_zlib()
builder.build_libssh()
builder.fix_output()
if __name__ == '__main__': if __name__ == '__main__':

21
build/qt-helper.bat Normal file
View File

@ -0,0 +1,21 @@
@echo off
set qtenv=%1
set vcvarsall=%2
set bits=%3
set tmp_path=%4
set prj_path=%5
set target=%6
echo %qtenv%
echo %vcvarsall% %bits%
echo %tmp_path%
echo %prj_path%
echo %target%
call %qtenv%
call %vcvarsall% %bits%
cd %tmp_path%
qmake %prj_path%
nmake %target%