Changeset: f8a0abfbd2d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8a0abfbd2d7
Modified Files:
buildtools/autogen/autogen/am.py
buildtools/autogen/autogen/msc.py
clients/Makefile.ag
clients/python/setup.py
clients/python3/setup.py
Branch: default
Log Message:
Fix Python compilation.
diffs (68 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -1004,6 +1004,7 @@ def am_python(fd, var, python, am):
pkgdirs.append(pkgdir)
fd.write("\t[ '$(srcdir)' -ef . ] || mkdir -p '%s'\n" % pkgdir)
fd.write("\t[ '$(srcdir)' -ef . ] || cp -p '$(srcdir)/%s'/*.py
'%s'\n" % (pkgdir, pkgdir))
+ fd.write("\t[ '$(srcdir)' -ef . ] || cp -p '$(srcdir)/README.rst' .\n")
fd.write("\t$(PYTHON) '%s' build\n" % f)
fd.write('install-exec-local-%s:\n' % var)
for f in python['FILES']:
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -1015,7 +1015,7 @@ def msc_python(fd, var, python, msc):
msc['SCRIPTS'].append('target_python_%s' % f)
srcs = map(lambda x: x.strip('\'" ').replace('.', '\\'),
pyre.search(open(os.path.join(msc['cwd'],
f)).read()).group(1).split(', '))
- fd.write('target_python_%s: %s %s\n' % (f, ' '.join(srcs), f))
+ fd.write('target_python_%s: %s README.rst %s\n' % (f, ' '.join(srcs),
f))
fd.write('\t$(PYTHON) %s build\n' % f)
for src in srcs:
fd.write('%s: "$(srcdir)\\%s"\n' % (src, src))
@@ -1023,6 +1023,8 @@ def msc_python(fd, var, python, msc):
fd.write('\t$(INSTALL) "$(srcdir)\\%s"\\*.py "%s"\n' % (src, src))
fd.write('%s: "$(srcdir)\\%s"\n' % (f, f))
fd.write('\t$(INSTALL) "$(srcdir)\\%s" "%s"\n' % (f, f))
+ fd.write('README.rst: "$(srcdir)\\README.rst"\n')
+ fd.write('\t$(INSTALL) "$(srcdir)\\README.rst" "README.rst"\n')
msc['INSTALL'][f] = f, '', '', '', ''
fd.write('install_%s:\n' % f)
fd.write('\t$(PYTHON) %s install --prefix "$(prefix)"\n' % f)
diff --git a/clients/Makefile.ag b/clients/Makefile.ag
--- a/clients/Makefile.ag
+++ b/clients/Makefile.ag
@@ -15,7 +15,7 @@
# Copyright August 2008-2012 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON?python NATIVE_WIN32?NT
+SUBDIRS = mapilib mapiclient HAVE_ODBC?odbc HAVE_PERL?perl php
HAVE_RUBYGEM?ruby examples HAVE_PYTHON?python HAVE_PYTHON?python3
NATIVE_WIN32?NT
EXTRA_DIST = RunMtest.in RunMtest.bat.in \
RunMapprove.in \
diff --git a/clients/python/setup.py b/clients/python/setup.py
--- a/clients/python/setup.py
+++ b/clients/python/setup.py
@@ -26,7 +26,7 @@ def read(fname):
setup(name='monetdb',
version='11.11.6',
description='Native MonetDB client Python API',
- long_description=read('README.rest'),
+ long_description=read('README.rst'),
author='MonetDB BV',
author_email='[email protected]',
url='http://www.monetdb.org/',
diff --git a/clients/python3/setup.py b/clients/python3/setup.py
--- a/clients/python3/setup.py
+++ b/clients/python3/setup.py
@@ -26,7 +26,7 @@ def read(fname):
setup(name='monetdb',
version='11.11.6',
description='Native MonetDB client Python API',
- long_description=read('README.rest'),
+ long_description=read('README.rst'),
author='MonetDB BV',
author_email='[email protected]',
url='http://www.monetdb.org/',
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
