Merge lp:~ralsina/u1db/cmake3 into lp:u1db

[Roberto Alsina]

Implement the install/dist targets.

Implement the install/dist targets.

With this branch you can do:

"make install" which installs everything in (hopefully) the right places.

"make dist" which creates a source tarball.

You can change the installation prefix by setting CMAKE_INSTALL_PREFIX via ccmake or through any other means. It also supports DESTDIR. If anything doesn't work or is not done according to what's needed to package it, well, that's why it's up for review :-)

[dobey (dobey)]

Did cmake . && make check which worked fine, then got this:

[dobey@lunatari:cmake3]: make dist
make: *** No rule to make target `dist'. Stop.
[dobey@lunatari:cmake3]: make DESTDIR=/tmp/foo install
[ 0%] Built target ReplicatePythonSourceTree
[100%] Built target u1db
Install the project...
-- Install configuration: ""
CMake Error at cmake_install.cmake:36 (FILE):
  file INSTALL cannot find
  "/home/dobey/Projects/canonical/u1db/cmake3/temp//usr/local".

make: *** [install] Error 1

review: Needs Fixing

[dobey (dobey)]

The built cython module is getting installed it seems: /tmp/foo/usr/local/lib/python2.7/dist-packages/u1db/tests/c_backend_wrapper.so

And the installed u1db-client and u1db-server scripts seem to not have the executable bit set.

I suppose this is because you're doing the python install into temp/ and then copying everything out. It should probably only install the C bits and the install-python target should have setup.py install to the specified place using "--root ${DESTDIR} --prefix ${CMAKE_INSTALL_PREFIX}" as arguments.

review: Needs Fixing

[Roberto Alsina (ralsina)]

> The built cython module is getting installed it seems:
> /tmp/foo/usr/local/lib/python2.7/dist-packages/u1db/tests/c_backend_wrapper.so
>
> And the installed u1db-client and u1db-server scripts seem to not have the
> executable bit set.
>
> I suppose this is because you're doing the python install into temp/ and then
> copying everything out. It should probably only install the C bits and the
> install-python target should have setup.py install to the specified place
> using "--root ${DESTDIR} --prefix ${CMAKE_INSTALL_PREFIX}" as arguments.

Fixed in revno 354

[dobey (dobey)]

We should pull the version in cmake, by doing python setup.py --version I think, to avoid duplicating the version in multiple places.

Also, I get this error when trying to build the shlib version:

[dobey@lunatari:cmake3]: cmake -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX:PATH=/usr .
CMake Error at src/CMakeLists.txt:26 (INSTALL):
  install TARGETS given no LIBRARY DESTINATION for shared library target
  "u1db".

-- Configuring incomplete, errors occurred!

review: Needs Fixing

[Roberto Alsina (ralsina)]

> We should pull the version in cmake, by doing python setup.py --version I
> think, to avoid duplicating the version in multiple places.

Fixed in revno 355

> Also, I get this error when trying to build the shlib version:
>
> [dobey@lunatari:cmake3]: cmake -DBUILD_SHARED_LIBS=1
> -DCMAKE_INSTALL_PREFIX:PATH=/usr .
> CMake Error at src/CMakeLists.txt:26 (INSTALL):
> install TARGETS given no LIBRARY DESTINATION for shared library target
> "u1db".
>
>
> -- Configuring incomplete, errors occurred!

And fixed in revno 356

[dobey (dobey)]

I still don't like it, but all these points are at least somewhat workable now.

review: Approve

[Eric Casteleijn (thisfred)]

cmake . && make check works

touching any .c file and then running make check again still does not rebuild the c_backend_wrapper though...

review: Needs Fixing

[Roberto Alsina (ralsina)]

> cmake . && make check works
>
> touching any .c file and then running make check again still does not rebuild
> the c_backend_wrapper though...

"fixed" in revno 357

[Eric Casteleijn (thisfred)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Ubuntu One Auto Pilot (otto-pilot)]

No proposals found for merge of https://code.launchpad.net/~ralsina/u1db/cmake2 into https://code.launchpad.net/~ubuntuone-hackers/u1db/trunk.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-06-28 11:10:06 +0000
+++ CMakeLists.txt	2012-07-03 17:38:14 +0000
@@ -4,6 +4,15 @@
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 include_directories(${CMAKE_SOURCE_DIR}/include)
 
+execute_process(COMMAND python setup.py --version
+                OUTPUT_VARIABLE PROJECT_VERSION)
+
+set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
+add_custom_target(dist
+    COMMAND bzr export --root=${ARCHIVE_NAME}
+        ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
 find_package(Cython REQUIRED)
 
 find_package(CURL REQUIRED)
@@ -37,12 +46,12 @@
 )
 
 add_custom_target(build-inplace
-    COMMAND python setup.py build_ext -i -I "${CMAKE_SOURCE_DIR}/include"
+    COMMAND python setup.py clean build_ext -i -f
     DEPENDS ReplicatePythonSourceTree u1db
 )
 
 add_custom_target(build-debug
-    COMMAND python-dbg setup.py build_ext -i -I "${CMAKE_SOURCE_DIR}/include"
+    COMMAND python-dbg setup.py build_ext -i
     DEPENDS ReplicatePythonSourceTree u1db
 )
 
@@ -65,4 +74,23 @@
     COMMAND cd ${CMAKE_SOURCE_DIR}/html-docs; make html
 )
 
+SET(CPACK_GENERATOR "TGZ")
+SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Noone")
+INCLUDE(CPack)
+
+add_custom_target(install-python ALL
+    COMMAND python setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=${CMAKE_CURRENT_BINARY_DIR}/temp
+    DEPENDS ReplicatePythonSourceTree
+)
+
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/temp/${CMAKE_INSTALL_PREFIX}/
+    DESTINATION "."
+    PATTERN "*.pyc" EXCLUDE
+    PATTERN "tests" EXCLUDE
+    PATTERN "u1db-client"
+    PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+    PATTERN "u1db-server"
+    PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
+)
+
 add_subdirectory(src)
\ No newline at end of file

=== modified file 'setup.py'
--- setup.py	2012-06-28 11:10:06 +0000
+++ setup.py	2012-07-03 17:38:14 +0000
@@ -20,6 +20,10 @@
 
 
 def config():
+    try:
+        from setuptools import setup, Extension, find_packages
+    except ImportError:
+        from distutils.core import setup, Extension, find_packages
     import u1db
     ext = []
     kwargs = {
@@ -31,8 +35,8 @@
         "author": "Ubuntu One team",
         "author_email": "[e-mail]",
         "download_url": "https://launchpad.net/u1db/+download",
-        "packages": ["u1db", "u1db.backends", "u1db.remote",
-                     "u1db.commandline", "u1db.compat"],
+        "packages": find_packages(exclude=["u1db.tests",
+            "u1db.tests.commandline", "u1todo"]),
         "package_data": {'': ["*.sql"]},
         "scripts": ['u1db-client', 'u1db-serve'],
         "ext_modules": ext,
@@ -60,12 +64,6 @@
 synchronize them with other stores.
 """
     }
-
-    try:
-        from setuptools import setup, Extension
-    except ImportError:
-        from distutils.core import setup, Extension
-
     try:
         from Cython.Distutils import build_ext
     except ImportError, e:
@@ -91,8 +89,6 @@
             libraries=['u1db', 'sqlite3', 'oauth'] + extra_libs,
             define_macros=[] + extra_defines,
             ))
-
-
     setup(**kwargs)
 
 if __name__ == "__main__":

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-06-27 16:27:19 +0000
+++ src/CMakeLists.txt	2012-07-03 17:38:14 +0000
@@ -22,3 +22,13 @@
     PROPERTIES SOVERSION 1
     COMPILE_FLAGS -fPIC
 )
+
+INSTALL (
+    TARGETS u1db
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib
+)
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/u1db DESTINATION include
+    FILES_MATCHING PATTERN "*.h"
+)