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

[Roberto Alsina]

Builds a real libu1db and then links the cythn extension to use it.

Builds a real libu1db and then links the cythn extension to use it.

To test, just run make

[lp:~ralsina/u1db/cmake]

335. By Roberto Alsina on 2012-06-19

fix generated file path

336. By Roberto Alsina on 2012-06-19

make sqlite3 required

[dobey (dobey)]

Looks like it's not using pkg-config. Also there seems to be some case differences, using OAuth_FOO in one places and OAUTH_FOO in another.

Also, is there a reasonable way to have a versioned shared library? Like libu1db-1.0.so.1.0.0 on Linux, and I suppose u1db-1.0.dll on Windows?

review: Needs Fixing

[lp:~ralsina/u1db/cmake]

337. By Roberto Alsina on 2012-06-19

use -fPIC

338. By Roberto Alsina on 2012-06-19

use pkg-config

339. By Roberto Alsina on 2012-06-19

build static and shared libraries, add soname to shared one

[Eric Casteleijn (thisfred)]

Looks good to me and builds here. Would like Rodney's approval though since I am not well versed in the ways of make/cmake.

review: Approve

[John A Meinel (jameinel)]

Make sure it builds in a clean directory. It looks like you removed
building u1db_schema in the Makefile, but I dont see the step in the
CMakefiles. I could have just missed it.

John
=:->
On Jun 19, 2012 10:56 PM, "Eric Casteleijn" <email address hidden>
wrote:

> Review: Approve
>
> Looks good to me and builds here. Would like Rodney's approval though
> since I am not well versed in the ways of make/cmake.
> --
> https://code.launchpad.net/~ralsina/u1db/cmake/+merge/111076
> Your team Ubuntu One hackers is subscribed to branch lp:u1db.
>

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 6/20/2012 9:07 AM, John A Meinel wrote:
> Make sure it builds in a clean directory. It looks like you
> removed building u1db_schema in the Makefile, but I dont see the
> step in the CMakefiles. I could have just missed it.

(I did just miss it, on second review I see it.)

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk/hhvcACgkQJdeBCYSNAAPY8ACffcJX0t8F//B/YUchycOHDSUK
jC0An3tpAnCpH6t2jC1GGa489wfuAXDd
=0ycz
-----END PGP SIGNATURE-----

[dobey (dobey)]

I get this in a clean checkout:

gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -Werror -fPIC -Iinclude -I/usr/include/python2.7 -c u1db/tests/c_backend_wrapper.c -o build/temp.linux-i686-2.7/u1db/tests/c_backend_wrapper.o
gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -Werror build/temp.linux-i686-2.7/u1db/tests/c_backend_wrapper.o -Lsrc -lu1db -lsqlite3 -loauth -lcurl -ljson -o /home/dobey/Projects/canonical/u1db/cmake/u1db/tests/c_backend_wrapper.so
/usr/bin/ld: cannot find -lu1db
collect2: ld returned 1 exit status
error: command 'gcc' failed with exit status 1
make: *** [build-inplace] Error 1

This appears to be a result of having the library names be libu1db_shared.so and libu1db_static.a, because CMake is apparently unable to build both with the same lib name, in the same tree (http://www.cmake.org/pipermail/cmake/2006-February/008153.html).

review: Needs Fixing

[Roberto Alsina (ralsina)]

Oops, my bad, didn't test on a clean checkout. It's an easy fix, will have it early tomorrow.

[lp:~ralsina/u1db/cmake]

340. By Roberto Alsina on 2012-06-21

make shared/dynamic libraries an option

[dobey (dobey)]

I'm not really sure if I should vote Approve here or not. The build works and tests pass now, but there is no obvious way to get a clean tree back, and cmake doesn't seem to deal well when certain things change. There's also no way to actually install (or uninstall) the lib yet. But I don't want to hold it back either, if we're going to have to use cmake regardless.

review: Approve

=== modified file 'Makefile'
--- Makefile	2012-05-15 16:45:47 +0000
+++ Makefile	2012-06-21 10:41:19 +0000
@@ -4,14 +4,11 @@
 check: build-inplace
 	python -m testtools.run discover
 
-build-inplace: src/u1db_schema.c
+build-inplace: build-cmake
 	export CFLAGS='-Werror';\
 	python setup.py build_ext -i
 
-src/u1db_schema.c: u1db/backends/dbschema.sql sql_to_c.py
-	python sql_to_c.py u1db/backends/dbschema.sql u1db__schema src/u1db_schema.c
-
-build-debug: src/u1db_schema.c
+build-debug: build-cmake
 	export CFLAGS='-Werror';\
 	python-dbg setup.py build_ext -i
 
@@ -30,3 +27,7 @@
 
 html-docs:
 	cd html-docs; make html
+
+build-cmake:
+	export CFLAGS='-fPIC';\
+	cd src; cmake . ; make

=== added directory 'cmake'
=== added directory 'cmake/Modules'
=== added file 'cmake/Modules/FindJSON.cmake'
--- cmake/Modules/FindJSON.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindJSON.cmake	2012-06-21 10:41:19 +0000
@@ -0,0 +1,32 @@
+# - Try to find JSON
+# Once done, this will define
+#
+#  JSON_FOUND - system has JSON
+#  JSON_INCLUDE_DIRS - the JSON include directories
+#  JSON_LIBRARIES - link these to use JSON
+
+find_package(PkgConfig)
+pkg_check_modules(PC_JSON json)
+
+FIND_PATH(JSON_INCLUDE_DIR json.h
+  HINTS
+  ${PC_JSON_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  /opt/local/include
+  PATH_SUFFIXES json
+)
+
+FIND_LIBRARY(JSON_LIBRARY
+  NAMES ${JSON_NAMES} libjson.so libjson.dylib
+  HINTS ${PC_JSON_LIBRARY_DIRS}
+  /usr/lib /usr/local/lib /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JSON DEFAULT_MSG JSON_LIBRARY JSON_INCLUDE_DIR)
+
+IF(JSON_FOUND)
+  SET(JSON_LIBRARIES ${JSON_LIBRARY})
+  SET(JSON_INCLUDE_DIRS ${JSON_INCLUDE_DIR})
+ENDIF(JSON_FOUND)

=== added file 'cmake/Modules/FindOAUTH.cmake'
--- cmake/Modules/FindOAUTH.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindOAUTH.cmake	2012-06-21 10:41:19 +0000
@@ -0,0 +1,32 @@
+# - Try to find OAuth
+# Once done, this will define
+#
+#  OAuth_FOUND - system has Glib
+#  OAuth_INCLUDE_DIRS - the Glib include directories
+#  OAuth_LIBRARIES - link these to use Glib
+
+find_package(PkgConfig)
+pkg_check_modules(PC_OAUTH oauth)
+
+FIND_PATH(OAuth_INCLUDE_DIR oauth.h
+  HINTS
+  ${PC_OAUTH_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  /opt/local/include
+  PATH_SUFFIXES oauth
+)
+
+FIND_LIBRARY(OAuth_LIBRARY
+  NAMES ${OAuth_NAMES} liboauth.so liboauth.dylib
+  HINTS ${PC_OAUTH_LIBRARY_DIRS}
+  /usr/lib /usr/local/lib /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OAuth DEFAULT_MSG OAuth_LIBRARY OAuth_INCLUDE_DIR)
+
+IF(OAuth_FOUND)
+  SET(OAuth_LIBRARIES ${OAuth_LIBRARY})
+  SET(OAuth_INCLUDE_DIRS ${OAuth_INCLUDE_DIR})
+ENDIF(OAuth_FOUND)

=== added file 'cmake/Modules/FindSqlite3.cmake'
--- cmake/Modules/FindSqlite3.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindSqlite3.cmake	2012-06-21 10:41:19 +0000
@@ -0,0 +1,31 @@
+# - Try to find Sqlite3
+# Once done, this will define
+#
+#  Sqlite3_FOUND - system has Sqlite3
+#  Sqlite3_INCLUDE_DIRS - the Sqlite3 include directories
+#  Sqlite3_LIBRARIES - link these to use Sqlite3
+
+find_package(PkgConfig)
+pkg_check_modules(PC_SQLITE3 sqlite3)
+
+FIND_PATH(Sqlite3_INCLUDE_DIR sqlite3.h
+  HINTS
+  ${PC_SQLITE3_INCLUDE_DIRS}
+  /usr/include
+  /usr/local/include
+  /opt/local/include
+)
+
+FIND_LIBRARY(Sqlite3_LIBRARY
+  NAMES ${Sqlite3_NAMES} libsqlite3.so libsqlite3.dylib
+  HINTS ${PC_SQLITE3_LIBRARY_DIRS}
+  /usr/lib /usr/local/lib /opt/local/lib
+)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Sqlite3 DEFAULT_MSG Sqlite3_LIBRARY Sqlite3_INCLUDE_DIR)
+
+IF(Sqlite3_FOUND)
+  SET(Sqlite3_LIBRARIES ${Sqlite3_LIBRARY})
+  SET(Sqlite3_INCLUDE_DIRS ${Sqlite3_INCLUDE_DIR})
+ENDIF(Sqlite3_FOUND)

=== modified file 'setup.py'
--- setup.py	2012-05-03 11:43:23 +0000
+++ setup.py	2012-06-21 10:41:19 +0000
@@ -84,18 +84,10 @@
         extra_libs.append('json')
         ext.append(Extension(
             "u1db.tests.c_backend_wrapper",
-            ["u1db/tests/c_backend_wrapper.pyx",
-             "src/mkstemp_compat.c",
-             "src/u1db.c",
-             "src/u1db_http_sync_target.c",
-             "src/u1db_query.c",
-             "src/u1db_schema.c",
-             "src/u1db_sync_target.c",
-             "src/u1db_uuid.c",
-             "src/u1db_vectorclock.c",
-             ],
+            ["u1db/tests/c_backend_wrapper.pyx"],
             include_dirs=["include"],
-            libraries=['sqlite3', 'oauth'] + extra_libs,
+            library_dirs=["src"],
+            libraries=['u1db', 'sqlite3', 'oauth'] + extra_libs,
             define_macros=[] + extra_defines,
             ))
 

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2012-06-21 10:41:19 +0000
@@ -0,0 +1,45 @@
+cmake_minimum_required (VERSION 2.6)
+project (u1db)
+
+# Allow the developer to select if Dynamic or Static libraries are built
+OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" OFF)
+
+#Set the LIB_TYPE variable to STATIC
+SET (LIB_TYPE STATIC)
+IF (BUILD_SHARED_LIBS)
+  # User wants to build Dynamic Libraries, so change the LIB_TYPE variable to CMake keyword 'SHARED'
+  SET (LIB_TYPE SHARED)
+ENDIF (BUILD_SHARED_LIBS)
+
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../cmake/Modules/")
+include_directories(${CMAKE_SOURCE_DIR}/../include)
+
+find_package(CURL REQUIRED)
+if (CURL_FOUND)
+  include_directories(${CURL_INCLUDE_DIRS})
+endif (CURL_FOUND)
+
+find_package(OAUTH REQUIRED)
+if (OAUTH_FOUND)
+  include_directories(${OAUTH_INCLUDE_DIRS})
+endif (OAUTH_FOUND)
+
+find_package(JSON REQUIRED)
+if (JSON_FOUND)
+  include_directories(${JSON_INCLUDE_DIRS})
+endif (JSON_FOUND)
+
+find_package(Sqlite3 REQUIRED)
+if (Sqlite3_FOUND)
+  include_directories(${Sqlite3_INCLUDE_DIRS})
+endif (Sqlite3_FOUND)
+
+add_custom_command (
+  OUTPUT ${CMAKE_SOURCE_DIR}/u1db_schema.c
+  COMMAND python ${CMAKE_SOURCE_DIR}/../sql_to_c.py ${CMAKE_SOURCE_DIR}/../u1db/backends/dbschema.sql u1db__schema ${CMAKE_SOURCE_DIR}/u1db_schema.c
+  DEPENDS ${CMAKE_SOURCE_DIR}/../u1db/backends/dbschema.sql ${CMAKE_SOURCE_DIR}/../sql_to_c.py
+  )
+add_library (u1db ${LIB_TYPE} mkstemp_compat.c u1db.c u1db_http_sync_target.c u1db_query.c  u1db_sync_target.c  u1db_uuid.c  u1db_vectorclock.c u1db_schema.c)
+
+SET_TARGET_PROPERTIES(u1db PROPERTIES SOVERSION 1)