Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add an rpm target to make #152

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ directories.stamp:

$(OBJS): directories.stamp

install: python_code
install: python_code

rpm: setup.py
@echo "About to make RPM"
$(PYTHON) ./setup.py bdist --format=rpm

sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql directories.stamp
cp $< $@
Expand Down
2 changes: 1 addition & 1 deletion multicorn.control
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
comment = 'Multicorn Python bindings for Postgres 9.2.* Foreign Data Wrapper'
default_version = '1.3.2'
module_pathname = '$libdir/multicorn'
relocatable = true
relocatable = True
3 changes: 3 additions & 0 deletions rpm/post_install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
default_version=$(grep default_version $(pg_config --sharedir)/extension/multicorn.control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")

ln $(pg_config --sharedir)/extension/multicorn.sql $(pg_config --sharedir)/extension/multicorn--${default_version}.sql
3 changes: 3 additions & 0 deletions rpm/pre_uninstall.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
default_version=$(grep default_version $(pg_config --sharedir)/extension/multicorn.control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")

rm $(pg_config --sharedir)/extension/multicorn--${default_version}.sql
47 changes: 39 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
import sys
from setuptools import setup, find_packages, Extension


import os
from sys import platform
from setuptools.command.install import install
from distutils.command.build import build

# hum... borrowed from psycopg2
def get_pg_config(kind, pg_config="pg_config"):
p = subprocess.Popen([pg_config, '--%s' % kind], stdout=subprocess.PIPE)
Expand All @@ -26,12 +32,37 @@ def get_pg_config(kind, pg_config="pg_config"):
elif sys.version_info[1] < 6:
sys.exit("Sorry, you need at least python 2.6 for Multicorn")

class MulticornBuild(build):
def run(self):
# Original build
build.run(self)
r = subprocess.check_output(['/usr/bin/make', 'multicorn.so'])
r = r.strip().decode('utf8')
if not r:
raise Warning(p[2].readline())
# After original build

execfile('multicorn.control')


setup(
name='multicorn',
version='__VERSION__',
author='Kozea',
license='Postgresql',
package_dir={'': 'python'},
packages=['multicorn', 'multicorn.fsfdw'],
ext_modules = [multicorn_utils_module]
)
name='multicorn',
# version='__VERSION__',
version=default_version,
author='Kozea',
license='Postgresql',
options={'bdist_rpm': {'post_install': 'rpm/post_install.sh',
'pre_uninstall': 'rpm/pre_uninstall.sh',
'requires': 'postgresql95-server',
}},
package_dir={'': 'python'},
packages=['multicorn', 'multicorn.fsfdw'],
ext_modules=[multicorn_utils_module],
data_files=[
('%s/extension' % get_pg_config('sharedir'), ['multicorn.control', 'sql/multicorn.sql', 'doc/multicorn.md']),
(get_pg_config('libdir'), ['multicorn.so'])
],
cmdclass={
'build': MulticornBuild,
}
)