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

[Roberto Alsina]

Get rid of the top Makefile, go all cmake, fix deps.

Get rid of the top Makefile, go all cmake, fix deps. No install target yet.

To test:

mkdir build && cd build && cmake .. && make check

[Eric Casteleijn (thisfred)]

since make check does nothing, tarmac will fail this, so I think the make target will have to happen on this branch, or we need to make changes to tarmac.

review: Needs Fixing

[Roberto Alsina (ralsina)]

> since make check does nothing, tarmac will fail this, so I think the make
> target will have to happen on this branch, or we need to make changes to
> tarmac.

What do you mean "make check does nothing"?

Make check runs the tests :-)

[Eric Casteleijn (thisfred)]

I meant in the same place that tarmac looks. If the goal is to change tarmac to run the tests differently, then it's ok by me. (I still want Rodney's approval before marking approved though)

review: Approve

[dobey (dobey)]

If doing "cmake . && make check" instead of doing cmake .. in a subdir, the build fails unable to find u1db/u1db.h.

review: Needs Fixing

[Roberto Alsina (ralsina)]

> If doing "cmake . && make check" instead of doing cmake .. in a subdir, the
> build fails unable to find u1db/u1db.h.

Now it should work from anywhere.

[dobey (dobey)]

Well it works from a subdir and from not now it seems, though there's no way to "clean" the tree automatically and get rid of the extra cmake stuff.

review: Approve

[Roberto Alsina (ralsina)]

> Well it works from a subdir and from not now it seems, though there's no way
> to "clean" the tree automatically and get rid of the extra cmake stuff.

The "right" way to use cmake is not to build inside the sources. In that case, "distclean" is just "rm -rf *"

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~ralsina/u1db/cmake2 into lp:u1db failed. Below is the output from the failed tests.

make: *** No rule to make target `check-valgrind'. Stop.

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~ralsina/u1db/cmake2 into lp:u1db failed. Below is the output from the failed tests.

cmake version 2.8.8
Usage

  cmake [options] <path-to-source>
  cmake [options] <path-to-existing-build>

Options
  -C <initial-cache> = Pre-load a script to populate the cache.
  -D <var>:<type>=<value> = Create a cmake cache entry.
  -U <globbing_expr> = Remove matching entries from CMake cache.
  -G <generator-name> = Specify a makefile generator.
  -Wno-dev = Suppress developer warnings.
  -Wdev = Enable developer warnings.
  -E = CMake command mode.
  -i = Run in wizard mode.
  -L[A][H] = List non-advanced cached variables.
  --build <dir> = Build a CMake-generated project binary tree.
  -N = View mode only.
  -P <file> = Process script mode.
  --find-package = Run in pkg-config like mode.
  --graphviz=[file] = Generate graphviz of dependencies.
  --system-information [file] = Dump information about this system.
  --debug-trycompile = Do not delete the try_compile build tree.
                                Only useful on one try_compile at a time.
  --debug-output = Put cmake in a debug mode.
  --trace = Put cmake in trace mode.
  --warn-uninitialized = Warn about uninitialized values.
  --warn-unused-vars = Warn about unused variables.
  --no-warn-unused-cli = Don't warn about command line options.
  --check-system-vars = Find problems with variable usage in system
                                files.
  --help-command cmd [file] = Print help for a single command and exit.
  --help-command-list [file] = List available listfile commands and exit.
  --help-commands [file] = Print help for all commands and exit.
  --help-compatcommands [file]= Print help for compatibility commands.
  --help-module module [file] = Print help for a single module and exit.
  --help-module-list [file] = List available modules and exit.
  --help-modules [file] = Print help for all modules and exit.
  --help-custom-modules [file]= Print help for all custom modules and exit.
  --help-policy cmp [file] = Print help for a single policy and exit.
  --help-policies [file] = Print help for all policies and exit.
  --help-property prop [file] = Print help for a single property and exit.
  --help-property-list [file] = List available properties and exit.
  --help-properties [file] = Print help for all properties and exit.
  --help-variable var [file] = Print help for a single variable and exit.
  --help-variable-list [file] = List documented variables and exit.
  --help-variables [file] = Print help for all variables and exit.
  --copyright [file] = Print the CMake copyright and exit.
  --help,-help,-usage,-h,-H,/?= Print usage information and exit.
  --help-full [file] = Print full help and exit.
  --help-html [file] = Print full help in HTML format.
  --help-man [file] = Print full help as a UNIX man pa...

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2012-06-28 17:11:18 +0000
@@ -0,0 +1,68 @@
+cmake_minimum_required (VERSION 2.6)
+project (u1db)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+include_directories(${CMAKE_SOURCE_DIR}/include)
+
+find_package(Cython REQUIRED)
+
+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_target( ReplicatePythonSourceTree ALL ${CMAKE_COMMAND} -P
+  ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/ReplicatePythonSourceTree.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
+
+add_custom_target(check
+    COMMAND python -m testtools.run discover
+    DEPENDS build-inplace
+)
+
+add_custom_target(build-inplace
+    COMMAND python setup.py build_ext -i -I "${CMAKE_SOURCE_DIR}/include"
+    DEPENDS ReplicatePythonSourceTree u1db
+)
+
+add_custom_target(build-debug
+    COMMAND python-dbg setup.py build_ext -i -I "${CMAKE_SOURCE_DIR}/include"
+    DEPENDS ReplicatePythonSourceTree u1db
+)
+
+add_custom_target(check-valgrind
+    COMMAND valgrind --tool=memcheck --suppressions=${CMAKE_SOURCE_DIR}/custom.supp python-dbg -m testtools.run discover
+    DEPENDS build-debug
+)
+
+add_custom_target(check-valgrind-leaks
+    COMMAND valgrind --tool=memcheck --suppressions=${CMAKE_SOURCE_DIR}/custom.supp --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full python-dbg -m testtools.run discover
+    DEPENDS build-debug
+)
+
+add_custom_target(check-verbose
+    COMMAND python -c \"import unittest, sys\; from testtools import run\; run.TestProgram(argv=sys.argv, testRunner=unittest.TextTestRunner(verbosity=2), stdout=sys.stdout)\" discover
+    DEPENDS build-inplace
+)
+
+add_custom_target(html-docs
+    COMMAND cd ${CMAKE_SOURCE_DIR}/html-docs; make html
+)
+
+add_subdirectory(src)
\ No newline at end of file

=== removed file 'Makefile'
--- Makefile	2012-06-19 18:46:42 +0000
+++ Makefile	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-
-.PHONY: check check-verbose html-docs check-valgrind build-debug
-
-check: build-inplace
-	python -m testtools.run discover
-
-build-inplace: build-cmake
-	export CFLAGS='-Werror';\
-	python setup.py build_ext -i
-
-build-debug: build-cmake
-	export CFLAGS='-Werror';\
-	python-dbg setup.py build_ext -i
-
-check-valgrind: build-debug
-	valgrind --tool=memcheck \
-	--suppressions=custom.supp \
-	python-dbg -m testtools.run discover
-
-check-valgrind-leaks: build-debug
-	valgrind --tool=memcheck --suppressions=custom.supp \
-	--track-origins=yes --num-callers=40 --leak-resolution=high \
-	--leak-check=full python-dbg -m testtools.run discover
-
-check-verbose:
-	python -c "import unittest, sys; from testtools import run; run.TestProgram(argv=sys.argv, testRunner=unittest.TextTestRunner(verbosity=2), stdout=sys.stdout)" discover
-
-html-docs:
-	cd html-docs; make html
-
-build-cmake:
-	export CFLAGS='-fPIC';\
-	cd src; cmake . ; make

=== added file 'cmake/Modules/FindCython.cmake'
--- cmake/Modules/FindCython.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/FindCython.cmake	2012-06-28 17:11:18 +0000
@@ -0,0 +1,29 @@
+# Find the Cython compiler.
+#
+# This code sets the following variables:
+#
+#  CYTHON_EXECUTABLE
+#
+#=============================================================================
+# Copyright 2011 Kitware, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+find_program( CYTHON_EXECUTABLE NAMES cython )
+
+include( FindPackageHandleStandardArgs )
+FIND_PACKAGE_HANDLE_STANDARD_ARGS( Cython REQUIRED_VARS CYTHON_EXECUTABLE )
+
+mark_as_advanced( CYTHON_EXECUTABLE )
+

=== added file 'cmake/Modules/ReplicatePythonSourceTree.cmake'
--- cmake/Modules/ReplicatePythonSourceTree.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Modules/ReplicatePythonSourceTree.cmake	2012-06-28 17:11:18 +0000
@@ -0,0 +1,14 @@
+# Note: when executed in the build dir, then CMAKE_CURRENT_SOURCE_DIR is the
+# build dir.
+file( COPY html-docs DESTINATION "${CMAKE_ARGV3}")
+file( COPY setup.py u1db  DESTINATION "${CMAKE_ARGV3}"
+  FILES_MATCHING
+  PATTERN "*.py"
+  PATTERN "*.pyx"
+  PATTERN "*.pyx"
+  PATTERN "*.sql"
+  PATTERN "*.key"
+  PATTERN "*.cert"
+  PATTERN "*.pem" )
+file( COPY "u1db-serve" "u1db-client" "MANIFEST.in" "README"
+    "COPYING" "COPYING.LESSER" DESTINATION "${CMAKE_ARGV3}")

=== modified file 'setup.py'
--- setup.py	2012-06-19 17:44:50 +0000
+++ setup.py	2012-06-28 17:11:18 +0000
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with u1db.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import sys
 
 
@@ -85,7 +86,7 @@
         ext.append(Extension(
             "u1db.tests.c_backend_wrapper",
             ["u1db/tests/c_backend_wrapper.pyx"],
-            include_dirs=["include"],
+            include_dirs=['include'],
             library_dirs=["src"],
             libraries=['u1db', 'sqlite3', 'oauth'] + extra_libs,
             define_macros=[] + extra_defines,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-06-21 10:39:29 +0000
+++ src/CMakeLists.txt	2012-06-28 17:11:18 +0000
@@ -11,35 +11,14 @@
   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
+  OUTPUT ${CMAKE_SOURCE_DIR}/src/u1db_schema.c
+  COMMAND python ${CMAKE_SOURCE_DIR}/sql_to_c.py ${CMAKE_SOURCE_DIR}/u1db/backends/dbschema.sql u1db__schema ${CMAKE_SOURCE_DIR}/src/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)
+SET_TARGET_PROPERTIES(u1db
+    PROPERTIES SOVERSION 1
+    COMPILE_FLAGS -fPIC
+)