From 4a69166cc542a72cecdd3999400a15c572be928d Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Thu, 23 Dec 2021 11:31:33 +0100 Subject: [PATCH 1/6] Update scripts src directory --- scripts/build/build-server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index a479b6c75c..c6c6198bc4 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -556,7 +556,8 @@ def copy_scripts_and_libs(): ''' builddir = conf[CONF_BUILDDIR] - scripts_srcdir = os.path.join(builddir, Seafile().projdir, 'scripts') + src_seahubdir = Seahub().projdir + scripts_srcdir = os.path.join(builddir, src_seahubdir, 'scripts') serverdir = os.path.join(builddir, 'seafile-server') must_copy(os.path.join(scripts_srcdir, 'setup-seafile.sh'), @@ -603,7 +604,6 @@ def copy_scripts_and_libs(): runtimedir) # move seahub to seafile-server/seahub - src_seahubdir = Seahub().projdir dst_seahubdir = os.path.join(serverdir, 'seahub') try: shutil.move(src_seahubdir, dst_seahubdir) From 3de9efb39502398cad54f95a7896489a98e856ee Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Fri, 24 Dec 2021 12:56:40 +0100 Subject: [PATCH 2/6] Avoid copying sql scripts --- scripts/build/build-server.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index c6c6198bc4..dd70968c6f 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -589,14 +589,6 @@ def copy_scripts_and_libs(): except Exception as e: error('failed to copy upgrade scripts: %s' % e) - # copy sql scripts - sql_scriptsdir = os.path.join(scripts_srcdir, 'sql') - dst_sql_scriptsdir = os.path.join(serverdir, 'sql') - try: - shutil.copytree(sql_scriptsdir, dst_sql_scriptsdir) - except Exception as e: - error('failed to copy sql scripts: %s' % e) - # copy runtime/seahub.conf runtimedir = os.path.join(serverdir, 'runtime') must_mkdir(runtimedir) From 65c621d0502f83caee8947567677b749e3a11fbf Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Fri, 24 Dec 2021 13:26:34 +0100 Subject: [PATCH 3/6] Update build script: go-fileserver, naming schema Co-authored-by: jobenvil Co-authored-by: Thibaud Franchetti Co-authored-by: plche --- scripts/build/build-server.py | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index dd70968c6f..531a5fad1c 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -25,6 +25,7 @@ import subprocess import optparse import atexit import platform +import distro #################### ### Global variables @@ -539,6 +540,15 @@ def copy_user_manuals(): for path in glob.glob(src_pattern): must_copy(path, dst_dir) +# copy go_fileserver "fileserver" to directory seafile-server/seafile/bin +def copy_go_fileserver(): + builddir = conf[CONF_BUILDDIR] + srcdir = conf[CONF_SRCDIR] + src_go_fileserver = os.path.join(srcdir, 'fileserver') + dst_bin_dir = os.path.join(builddir, 'seafile-server', 'seafile', 'bin') + + must_copy(src_go_fileserver, dst_bin_dir) + def copy_seafdav(): dst_dir = os.path.join(conf[CONF_BUILDDIR], 'seafile-server', 'seahub', 'thirdpart') tarball = os.path.join(conf[CONF_SRCDIR], 'seafdav.tar.gz') @@ -614,6 +624,9 @@ def copy_scripts_and_libs(): copy_shared_libs() copy_user_manuals() + # copy go_fileserver + copy_go_fileserver() + def copy_pdf2htmlex(): '''Copy pdf2htmlEX exectuable and its dependent libs''' pdf2htmlEX_executable = find_in_path('pdf2htmlEX') @@ -777,10 +790,14 @@ def create_tarball(tarball_name): excludes_list = [ '--exclude=%s' % pattern for pattern in ignored_patterns ] excludes = ' '.join(excludes_list) - tar_cmd = 'tar czf %(tarball_name)s %(versioned_serverdir)s %(excludes)s' \ + # tar will copy the content the directory python3.[7-9]/ to python3.6/ + transform = '--transform=\'s,python3.[7-9]/,python3/,\'' + + tar_cmd = 'tar czf %(tarball_name)s %(transform)s %(versioned_serverdir)s %(excludes)s' \ % dict(tarball_name=tarball_name, versioned_serverdir=versioned_serverdir, - excludes=excludes) + excludes=excludes, + transform=transform) if run(tar_cmd) < 0: error('failed to generate the tarball') @@ -798,17 +815,20 @@ def gen_tarball(): # 32-bit: seafile-server_1.2.2_i386.tar.gz version = conf[CONF_VERSION] arch = os.uname()[-1].replace('_', '-') - if 'arm' in platform.machine(): - arch = 'pi' + if 'arm' in platform.machine() or 'aarch64' in platform.machine(): + arch = platform.machine() elif arch != 'x86-64': arch = 'i386' + # determine linux distribution + distribution = distro.linux_distribution()[-1].replace(' ', '-') + dbg = '' if conf[CONF_NO_STRIP]: dbg = '.dbg' - tarball_name = 'seafile-server_%(version)s_%(arch)s%(dbg)s.tar.gz' \ - % dict(version=version, arch=arch, dbg=dbg) + tarball_name = 'seafile-server-%(version)s-%(distribution)s-%(arch)s%(dbg)s.tar.gz' \ + % dict(version=version, distribution=distribution, arch=arch, dbg=dbg) dst_tarball = os.path.join(conf[CONF_OUTPUTDIR], tarball_name) # generate the tarball From 96d7b6b13ae20f411f76ce2d0cca2fa5dbb972c3 Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Sat, 1 Jan 2022 19:52:02 +0100 Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=91=8C=20Replace=20deprecated=20distr?= =?UTF-8?q?o.linux=5Fdistribution=20with=20distro.codename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build/build-server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index 531a5fad1c..537a91ff73 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -821,7 +821,7 @@ def gen_tarball(): arch = 'i386' # determine linux distribution - distribution = distro.linux_distribution()[-1].replace(' ', '-') + distribution = distro.codename().replace(' ', '-').lower() dbg = '' if conf[CONF_NO_STRIP]: From a9ea2c38a69246c92249536db4177e552438cdf7 Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Wed, 5 Jan 2022 21:14:29 +0100 Subject: [PATCH 5/6] Revert "Avoid copying sql scripts" and adapt source --- scripts/build/build-server.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index 537a91ff73..ad60b4d468 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -599,6 +599,14 @@ def copy_scripts_and_libs(): except Exception as e: error('failed to copy upgrade scripts: %s' % e) + # copy sql scripts + sql_scriptsdir = os.path.join(Seafile().projdir, 'scripts', 'sql') + dst_sql_scriptsdir = os.path.join(serverdir, 'sql') + try: + shutil.copytree(sql_scriptsdir, dst_sql_scriptsdir) + except Exception as e: + error('failed to copy sql scripts: %s' % e) + # copy runtime/seahub.conf runtimedir = os.path.join(serverdir, 'runtime') must_mkdir(runtimedir) From 5485e276929d78bb8b90854571dc1c95fcc2709b Mon Sep 17 00:00:00 2001 From: Gustl22 Date: Tue, 1 Mar 2022 09:20:38 +0100 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=91=8C=20Build:=20Tranform=20all=20py?= =?UTF-8?q?thon3=20versions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/build/build-server.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/build/build-server.py b/scripts/build/build-server.py index ad60b4d468..ce9710fafc 100755 --- a/scripts/build/build-server.py +++ b/scripts/build/build-server.py @@ -798,8 +798,8 @@ def create_tarball(tarball_name): excludes_list = [ '--exclude=%s' % pattern for pattern in ignored_patterns ] excludes = ' '.join(excludes_list) - # tar will copy the content the directory python3.[7-9]/ to python3.6/ - transform = '--transform=\'s,python3.[7-9]/,python3/,\'' + # tar will copy the content the directory python3.[0-9]+/ to python3/ + transform = '--transform=\'s,python3\.[0-9]\+/,python3/,\'' tar_cmd = 'tar czf %(tarball_name)s %(transform)s %(versioned_serverdir)s %(excludes)s' \ % dict(tarball_name=tarball_name,