client/deps/pgpool/pgpool.py - Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2"

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: client/deps/pgpool/pgpool.py

Issue 3541002: Revert "Merge remote branch 'cros/upstream' into tempbranch2" (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git

Patch Set: Created 10 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 #!/usr/bin/python	1 #!/usr/bin/python

2	2

3 import os	3 import os

	4 import common

4 from autotest_lib.client.bin import utils	5 from autotest_lib.client.bin import utils

5	6

6 version = 1	7 version = 1

7	8

8 def setup(tarball, topdir):	9 def setup(tarball, topdir):

9 # FIXME - Waiting to be able to specify dependency.	10 # FIXME - Waiting to be able to specify dependency.

10 #self.job.setup_dep(['pgsql'])	11 #self.job.setup_dep(['pgsql'])

11 srcdir = os.path.join(topdir, 'src')	12 srcdir = os.path.join(topdir, 'src')

12 if not os.path.exists(tarball):	13 if not os.path.exists(tarball):

13 utils.get_file('http://pgfoundry.org/frs/download.php/1083/pgpool-II-1.0 .1.tar.gz', tarball)	14 utils.get_file('http://pgfoundry.org/frs/download.php/1083/pgpool-II-1.0 .1.tar.gz', tarball)

14 utils.extract_tarball_to_dir(tarball, 'src')	15 utils.extract_tarball_to_dir(tarball, 'src')

15 os.chdir(srcdir)	16 os.chdir(srcdir)

16 # FIXEME - Waiting to be able to use self.autodir instead of	17 # FIXEME - Waiting to be able to use self.autodir instead of

17 # os.environ['AUTODIR']	18 # os.environ['AUTODIR']

18 utils.configure('--prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsql' \	19 utils.system('./configure --prefix=%s/pgpool --with-pgsql=%s/deps/pgsql/pgsq l' \

19 % (topdir, os.environ['AUTODIR']))	20 % (topdir, os.environ['AUTODIR']))

20 utils.make('-j %d' % utils.count_cpus())	21 utils.system('make -j %d' % utils.count_cpus())

21 utils.make('install')	22 utils.system('make install')

22	23

23 os.chdir(topdir)	24 os.chdir(topdir)

24	25

25 pwd = os.getcwd()	26 pwd = os.getcwd()

26 tarball = os.path.join(pwd, 'pgpool-II-1.0.1.tar.gz')	27 tarball = os.path.join(pwd, 'pgpool-II-1.0.1.tar.gz')

27 utils.update_version(pwd+'/src', False, version, setup, tarball, pwd)	28 utils.update_version(pwd+'/src', False, version, setup, tarball, pwd)

OLD	NEW

« no previous file with comments | « client/deps/pgpool/common.py ('k') | client/deps/pgsql/common.py » ('j') | no next file with comments »