Branch 'libkolab-0.4' - 5 commits - autogen.sh CMakeLists.txt shared.i tests/CMakeLists.txt
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Apr 11 11:41:07 CEST 2013
CMakeLists.txt | 2 +-
autogen.sh | 14 +++++++++++++-
shared.i | 5 +++--
tests/CMakeLists.txt | 7 +++++++
4 files changed, 24 insertions(+), 4 deletions(-)
New commits:
commit fb0bbeb5e0ec94e77d8917898ecb355d2170a1bc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Apr 11 10:40:10 2013 +0100
Now that Fedora 18 ships with a more than recent enough KDE* stack, fallback to building libkolab without libcalendaring
diff --git a/autogen.sh b/autogen.sh
index cd8ea88..f0af421 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -64,7 +64,19 @@ if [ ${doprep} -eq 1 ]; then
-DPHP_INSTALL_DIR=/usr/lib64/php/modules \
-DPYTHON_BINDINGS=ON \
-DCMAKE_BUILD_TYPE=Release \
- ..
+ .. || \
+ cmake \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=/usr/lib64 \
+ -DINCLUDE_INSTALL_DIR=/usr/include \
+ -DUSE_LIBCALENDARING=OFF \
+ -DPHP_BINDINGS=ON \
+ -DPHP_INSTALL_DIR=/usr/lib64/php/modules \
+ -DPYTHON_BINDINGS=ON \
+ -DCMAKE_BUILD_TYPE=Release \
+ .. || \
+ exit 1
fi
if [ ${dobuild} -eq 1 ]; then
commit 78149884f62a79f47aaf488360ab3e43112edc66
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Apr 11 09:47:38 2013 +0100
Bump teeny to release 0.4.3
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae03027..944d346 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
set(Libkolab_VERSION_MAJOR 0)
set(Libkolab_VERSION_MINOR 4)
# Enable the full x.y.z version only for release versions
-set(Libkolab_VERSION_PATCH 1)
+set(Libkolab_VERSION_PATCH 2)
set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
#set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR} )
set(Libkolab_VERSION_STRING ${CMAKE_PROJECT_NAME}-${Libkolab_VERSION})
commit 865ab099657136461969185691cdc8727a0c507c
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Wed Apr 10 14:47:26 2013 +0200
Find kolabformat.php
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index aa7afd4..bd8dc1b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -24,7 +24,7 @@ addTest(timezonetest)
addTest(xmlobjecttest)
if(PHP_BINDINGS)
- find_path(PHP_KOLABFORMAT_PATH NAMES kolabformat.php PATHS /usr/local/lib/php/modules /usr/lib/php/modules)
+ find_path(PHP_KOLABFORMAT_PATH NAMES kolabformat.php PATHS /usr/local/lib/php/modules /usr/lib/php/modules PATH_SUFFIXES lib/php/modules lib64/php/modules)
message("php kolabformat include path for testing ${PHP_KOLABFORMAT_PATH}")
add_test(phptest php -d enable_dl=On -d include_path='.:/usr/share/pear:${CMAKE_BINARY_DIR}:${CMAKE_BINARY_DIR}/calendaring/php:${PHP_KOLABFORMAT_PATH}' -d extension=${CMAKE_BINARY_DIR}/lib/kolabcalendaring.so -d extension=${CMAKE_BINARY_DIR}/lib/kolabshared.so -d extension=${PHP_KOLABFORMAT_PATH}/kolabformat.so ${CMAKE_SOURCE_DIR}/calendaring/php/test.php --verbose)
endif()
commit bb26514bd29305a3bec8c31c5af1a84c04428868
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Thu Feb 21 10:18:52 2013 +0100
enabled php tests for libkolab
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6f71a0c..aa7afd4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -22,3 +22,10 @@ addTest(freebusytest)
addTest(kolabobjecttest)
addTest(timezonetest)
addTest(xmlobjecttest)
+
+if(PHP_BINDINGS)
+ find_path(PHP_KOLABFORMAT_PATH NAMES kolabformat.php PATHS /usr/local/lib/php/modules /usr/lib/php/modules)
+ message("php kolabformat include path for testing ${PHP_KOLABFORMAT_PATH}")
+ add_test(phptest php -d enable_dl=On -d include_path='.:/usr/share/pear:${CMAKE_BINARY_DIR}:${CMAKE_BINARY_DIR}/calendaring/php:${PHP_KOLABFORMAT_PATH}' -d extension=${CMAKE_BINARY_DIR}/lib/kolabcalendaring.so -d extension=${CMAKE_BINARY_DIR}/lib/kolabshared.so -d extension=${PHP_KOLABFORMAT_PATH}/kolabformat.so ${CMAKE_SOURCE_DIR}/calendaring/php/test.php --verbose)
+endif()
+
commit 75f08021d1c25f120a8e91fc96931e404d79e8b1
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Wed Apr 10 14:46:56 2013 +0200
vector definitions moved to libkolabxml
diff --git a/shared.i b/shared.i
index f75820f..1941daa 100644
--- a/shared.i
+++ b/shared.i
@@ -7,6 +7,7 @@
%include "std_vector.i"
%import(module="kolabformat") <kolabevent.h>
namespace std {
- %template(vectorevent) vector<Kolab::Event>;
- %template(vectorevent2) vector< vector<Kolab::Event> >;
+/* vectorevent moved to libkolabxml, vectorevent2 breaks the pythonbindings without vectorevent in here (compile error) */
+/* %template(vectorevent) vector<Kolab::Event>; */
+/* %template(vectorevent2) vector< vector<Kolab::Event> >; */
};
More information about the commits
mailing list