mirror of https://github.com/zulip/zulip.git
provision: Clean up building search extensions from source.
This generalizes the provision logic for deciding whether to build our tsearch_extras and pgroonga search extensions from source to support Ubuntu cosmic as well (and evenutally, other future platforms).
This commit is contained in:
parent
bb8bdf9960
commit
32d26c8aad
|
@ -171,7 +171,20 @@ COMMON_YUM_DEPENDENCIES = COMMON_DEPENDENCIES + [
|
|||
"libstdc++"
|
||||
] + YUM_THUMBOR_VENV_DEPENDENCIES
|
||||
|
||||
BUILD_TSEARCH_FROM_SOURCE = False
|
||||
BUILD_PGROONGA_FROM_SOURCE = False
|
||||
if vendor in ["Ubuntu", "Debian"]:
|
||||
if codename == "cosmic":
|
||||
# For platforms not supported by pgroonga, we build it frmo source.
|
||||
BUILD_PGROONGA_FROM_SOURCE = True
|
||||
BUILD_TSEARCH_FROM_SOURCE = True
|
||||
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
|
||||
pkg.format(POSTGRES_VERSION) for pkg in [
|
||||
"postgresql-{0}",
|
||||
"postgresql-server-dev-{0}",
|
||||
]
|
||||
]
|
||||
else:
|
||||
SYSTEM_DEPENDENCIES = UBUNTU_COMMON_APT_DEPENDENCIES + [
|
||||
pkg.format(POSTGRES_VERSION) for pkg in [
|
||||
"postgresql-{0}",
|
||||
|
@ -188,6 +201,7 @@ elif vendor in ["CentOS", "RedHat"]:
|
|||
"postgresql{0}-pgroonga",
|
||||
]
|
||||
] + REDHAT_VENV_DEPENDENCIES
|
||||
BUILD_TSEARCH_FROM_SOURCE = True
|
||||
elif vendor == "Fedora":
|
||||
SYSTEM_DEPENDENCIES = COMMON_YUM_DEPENDENCIES + [
|
||||
pkg.format(POSTGRES_VERSION) for pkg in [
|
||||
|
@ -196,6 +210,8 @@ elif vendor == "Fedora":
|
|||
"postgresql{0}-devel",
|
||||
]
|
||||
] + FEDORA_VENV_DEPENDENCIES
|
||||
BUILD_TSEARCH_FROM_SOURCE = True
|
||||
BUILD_PGROONGA_FROM_SOURCE = True
|
||||
|
||||
if family == 'redhat':
|
||||
TSEARCH_STOPWORDS_PATH = "/usr/pgsql-%s/share/tsearch_data/" % (POSTGRES_VERSION,)
|
||||
|
@ -240,14 +256,18 @@ def install_system_deps(retry=False):
|
|||
|
||||
if family == 'redhat':
|
||||
install_yum_deps(deps_to_install, retry=retry)
|
||||
return
|
||||
|
||||
if vendor in ["Debian", "Ubuntu"]:
|
||||
elif vendor in ["Debian", "Ubuntu"]:
|
||||
install_apt_deps(deps_to_install, retry=retry)
|
||||
return
|
||||
|
||||
else:
|
||||
raise AssertionError("Invalid vendor")
|
||||
|
||||
# For some platforms, there aren't published pgroonga or
|
||||
# tsearch-extra packages available, so we build them from source.
|
||||
if BUILD_PGROONGA_FROM_SOURCE:
|
||||
run_as_root(["./scripts/lib/build-pgroonga"])
|
||||
if BUILD_TSEARCH_FROM_SOURCE:
|
||||
run_as_root(["./scripts/lib/build-tsearch-extras"])
|
||||
|
||||
def install_apt_deps(deps_to_install, retry=False):
|
||||
# type: (List[str], bool) -> None
|
||||
if retry:
|
||||
|
@ -300,13 +320,6 @@ def install_yum_deps(deps_to_install, retry=False):
|
|||
# making our tooling auto-detect, but this is simpler.
|
||||
run_as_root(["ln", "-nsf", "/usr/%s/bin/%s" % (postgres_dir, cmd),
|
||||
"/usr/bin/%s" % (cmd,)])
|
||||
# Compile tsearch-extras from scratch, since we maintain the
|
||||
# package and haven't built an RPM package for it.
|
||||
run_as_root(["./scripts/lib/build-tsearch-extras"])
|
||||
if vendor == "Fedora":
|
||||
# Compile PGroonga from scratch, since pgroonga upstream
|
||||
# doesn't provide Fedora packages.
|
||||
run_as_root(["./scripts/lib/build-pgroonga"])
|
||||
|
||||
# From here, we do the first-time setup/initialization for the postgres database.
|
||||
pg_datadir = "/var/lib/pgsql/%s/data" % (POSTGRES_VERSION,)
|
||||
|
|
Loading…
Reference in New Issue