From 1389e9c5769a34c1908e2104514e8b0f5551f7c6 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Thu, 30 May 2013 04:58:46 +0900 Subject: bump dev version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index dff0c64..0620b58 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ sqlite = "sqlite" PYSQLITE_EXPERIMENTAL = False #DEV_VERSION = None -DEV_VERSION = "1" +DEV_VERSION = "2" sources = ["src/module.c", "src/connection.c", "src/cursor.c", "src/cache.c", "src/microprotocols.c", "src/prepare_protocol.c", "src/statement.c", -- cgit v1.2.3 From 2a9e7729483f3c4bbf68a8a749bc6b6695b2cd20 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 31 May 2013 01:19:22 +0900 Subject: add incude dir for libsqlcipher --- setup.py | 1 + 1 file changed, 1 insertion(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index f1f93e1..ac1a3cd 100644 --- a/setup.py +++ b/setup.py @@ -146,6 +146,7 @@ class LibSQLCipherBuilder(build_ext): description = ("Build C extension linking against libsqlcipher library.") def build_extension(self, ext): + ext.extra_compile_args.append("-I/usr/include/sqlcipher/") ext.extra_link_args.append("-lsqlcipher") build_ext.build_extension(self, ext) -- cgit v1.2.3 From f8a174b0f4a637c9867d037676069177945f0b3c Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Thu, 30 May 2013 13:31:24 -0400 Subject: remove installation of unnecessary documentation into wrong location (usr/pysqlcipher-doc/) --- setup.py | 8 -------- 1 file changed, 8 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index ac1a3cd..49b6667 100644 --- a/setup.py +++ b/setup.py @@ -306,13 +306,6 @@ def get_setup_args(): print "Fatal error: PYSQLITE_VERSION could not be detected!" sys.exit(1) - data_files = [("pysqlcipher-doc", - glob.glob("doc/*.html") - + glob.glob("doc/*.txt") - + glob.glob("doc/*.css")), - ("pysqlcipher-doc/code", - glob.glob("doc/code/*.py"))] - #XXX ? #py_modules = ["sqlcipher"], @@ -333,7 +326,6 @@ def get_setup_args(): packages=["pysqlcipher", "pysqlcipher.test"] + (["pysqlcipher.test.py25"], [])[sys.version_info < (2, 5)], scripts=[], - data_files=data_files, ext_modules=[ Extension( -- cgit v1.2.3