Copy openslides from local checkout to site-packages
We reverted to using the checkout instead of an installed openslides version when building the portable, but we still want openlides to be placed together with all the other packages
This commit is contained in:
parent
b4a4d15a7f
commit
720a993259
@ -18,8 +18,6 @@ import zipfile
|
|||||||
import distutils.ccompiler
|
import distutils.ccompiler
|
||||||
import distutils.sysconfig
|
import distutils.sysconfig
|
||||||
|
|
||||||
from contextlib import nested
|
|
||||||
|
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
||||||
sys.path.insert(0, os.getcwd())
|
sys.path.insert(0, os.getcwd())
|
||||||
@ -45,10 +43,6 @@ LIBEXCLUDE = [
|
|||||||
r"^unittest/",
|
r"^unittest/",
|
||||||
]
|
]
|
||||||
|
|
||||||
OPENSLIDES_EXCLUDE = [
|
|
||||||
r"^openslides/settings.py"
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
SITE_PACKAGES = {
|
SITE_PACKAGES = {
|
||||||
"django": {
|
"django": {
|
||||||
@ -298,12 +292,13 @@ def main():
|
|||||||
raise
|
raise
|
||||||
|
|
||||||
os.makedirs(odir)
|
os.makedirs(odir)
|
||||||
|
out_site_packages = os.path.join(odir, "site-packages")
|
||||||
|
|
||||||
collect_lib(libdir, odir)
|
collect_lib(libdir, odir)
|
||||||
collect_site_packages(sitedir, os.path.join(odir, "site-packages"))
|
collect_site_packages(sitedir, out_site_packages)
|
||||||
|
|
||||||
exclude = get_pkg_exclude("openslides", OPENSLIDES_EXCLUDE)
|
exclude = get_pkg_exclude("openslides")
|
||||||
copy_dir_exclude(exclude, ".", "openslides", odir)
|
copy_dir_exclude(exclude, ".", "openslides", out_site_packages)
|
||||||
|
|
||||||
if not compile_openslides_launcher():
|
if not compile_openslides_launcher():
|
||||||
sys.stdout.write("Using prebuild openslides.exe\n")
|
sys.stdout.write("Using prebuild openslides.exe\n")
|
||||||
|
Loading…
Reference in New Issue
Block a user