-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Summary: - Added psql 3rd party dependency - Added wrapper script for running from dev env like: `~/code/yugabyte/bin/psql` - Included into release manifest Test Plan: - `ybd --sj` - Run local cluster. - `~/code/yugabyte/bin/psql -h localhost -p 5433` should work. - Launch cluster in GCP. - SSH to cluster node and try `~/tserver/bin/psql -h localhost -p 5433` as yugabyte user. Reviewers: karthik, sid, mikhail, neil Reviewed By: neil Subscribers: yql Differential Revision: https://phabricator.dev.yugabyte.com/D4600
- Loading branch information
Showing
7 changed files
with
63 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Copyright (c) YugaByte, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
# in compliance with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software distributed under the License | ||
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
# or implied. See the License for the specific language governing permissions and limitations | ||
# under the License. | ||
|
||
# This is a wrapper around the redis-cli executable in the thirdparty directory. We are putting this | ||
# in the "bin" directory of the source distribution for greater similarity in usage with YugaByte | ||
# binary distribution. | ||
|
||
. "${BASH_SOURCE%/*}"/../build-support/common-build-env.sh | ||
|
||
exec "$YB_THIRDPARTY_DIR/installed/common/bin/psql" "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# | ||
# Copyright (c) YugaByte, Inc. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except | ||
# in compliance with the License. You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software distributed under the License | ||
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express | ||
# or implied. See the License for the specific language governing permissions and limitations | ||
# under the License. | ||
# | ||
|
||
import multiprocessing | ||
import os | ||
import sys | ||
|
||
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) | ||
|
||
from build_definitions import * | ||
|
||
class PSQLDependency(Dependency): | ||
def __init__(self): | ||
super(PSQLDependency, self).__init__( | ||
'psql', '10.3', 'https://ftp.postgresql.org/pub/source/v{0}/postgresql-{0}.tar.gz', | ||
BUILD_GROUP_COMMON) | ||
self.dir = 'postgresql-{}'.format(self.version) | ||
self.copy_sources = True | ||
|
||
def build(self, builder): | ||
log_prefix = builder.log_prefix(self) | ||
args = ['./configure', '--prefix={}'.format(builder.prefix)] | ||
log_output(log_prefix, args) | ||
# Parallel build doesn't work for postgresql, fails intermittently. | ||
log_output(log_prefix, ['make', '-C', 'src/interfaces/libpq', 'install']) | ||
log_output(log_prefix, ['make', '-C', 'src/bin/psql', 'install']) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2018-04-04T14_20_38 | ||
2018-04-12T10_33_09 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2018-04-04T22_33_40 | ||
2018-04-12T03_35_36 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters