Branch 'c++/master' - c++/lib
Christian Mollekopf
mollekopf at kolabsys.com
Fri Dec 30 16:26:58 CET 2011
c++/lib/CMakeLists.txt | 68 +++---------------------------------------
c++/lib/php/CMakeLists.txt | 30 ++++++++++++++++++
c++/lib/php/test.php | 31 +++++++++++++++++++
c++/lib/python/CMakeLists.txt | 32 +++++++++++++++++++
c++/lib/python/test.py | 16 +++++++++
c++/lib/test.php | 31 -------------------
c++/lib/test.py | 16 ---------
7 files changed, 114 insertions(+), 110 deletions(-)
New commits:
commit a9b0928832678edc2db073e6062ff6716ac5086d
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date: Fri Dec 30 16:26:51 2011 +0100
moved php/python bindings to two separate directories
diff --git a/c++/lib/CMakeLists.txt b/c++/lib/CMakeLists.txt
index fe6fbcd..e715b36 100644
--- a/c++/lib/CMakeLists.txt
+++ b/c++/lib/CMakeLists.txt
@@ -58,69 +58,11 @@ endif()
#-----------------------SWIG--------------------
-if (NOT SWIG_FOUND)
+if (SWIG_FOUND)
+ set(KOLAB_CONTAINER_HEADERS ../kolabcontainers.h ../kolabevent.h ../kolabtodo.h)
+ add_subdirectory(python)
+ add_subdirectory(php)
+else()
message(WARNING "Could not build SWIG bindings, because SWIG is missing.")
- return()
endif()
-set(KOLAB_CONTAINER_HEADERS kolabcontainers.h kolabevent.h kolabtodo.h)
-
-#Generate Python wrapper
-set(KOLAB_SWIG_PYTHON_SOURCE_FILE python_kolabformat_wrapper.cpp)
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PYTHON_SOURCE_FILE}
- COMMAND ${SWIG} -v -c++ -python -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PYTHON_SOURCE_FILE} kolabformat.i
- COMMENT "Generating python bindings"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS kolabformat.i ${KOLAB_CONTAINER_HEADERS}
- VERBATIM
- )
-
-SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PYTHON_SOURCE_FILE} PROPERTIES GENERATED 1)
-ADD_CUSTOM_TARGET(generate_python_bindings ALL DEPENDS ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
-
-#Generate PHP wrapper
-set(KOLAB_SWIG_PHP_SOURCE_FILE php_kolabformat_wrapper.cpp)
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE}
- COMMAND ${SWIG} -v -c++ -php -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} kolabformat.i
- COMMENT "Generating php bindings"
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- DEPENDS kolabformat.i ${KOLAB_CONTAINER_HEADERS}
- VERBATIM
- )
-SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES GENERATED 1)
-ADD_CUSTOM_TARGET(generate_php_bindings ALL DEPENDS ${KOLAB_SWIG_PHP_SOURCE_FILE})
-
-
-#Compile Python Bindings
-find_package(PythonLibs)
-include_directories(${PYTHON_INCLUDE_DIRS})
-
-# python_add_module(kolabformat ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
-
-add_library(pythonbindings SHARED ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
-target_link_libraries(pythonbindings kolabxml ${PYTHON_LIBRARY})
-SET_TARGET_PROPERTIES(pythonbindings PROPERTIES OUTPUT_NAME "_kolabformat")
-SET_TARGET_PROPERTIES(pythonbindings PROPERTIES PREFIX "")
-
-install(TARGETS pythonbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pythonbindings)
-
-install( FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.py
- test.py
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pythonbindings)
-
-#Compile PHP Bindings
-# Since there is no php library we can't compile with -Wl,--no-undefined
-find_package(PHP4)
-include_directories(${PHP4_INCLUDE_PATH})
-add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
-target_link_libraries(phpbindings kolabxml ${PHP_LIBRARIES})
-SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat")
-SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "")
-
-install(TARGETS phpbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/phpbindings)
-
-install( FILES
- ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
- test.php
- DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/phpbindings)
diff --git a/c++/lib/php/CMakeLists.txt b/c++/lib/php/CMakeLists.txt
new file mode 100644
index 0000000..f5bbc6c
--- /dev/null
+++ b/c++/lib/php/CMakeLists.txt
@@ -0,0 +1,30 @@
+#Generate PHP wrapper
+include_directories(../)
+
+set(KOLAB_SWIG_PHP_SOURCE_FILE php_kolabformat_wrapper.cpp)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE}
+ COMMAND ${SWIG} -v -c++ -php -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PHP_SOURCE_FILE} ../kolabformat.i
+ COMMENT "Generating php bindings"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ../kolabformat.i ${KOLAB_CONTAINER_HEADERS}
+ VERBATIM
+ )
+SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES GENERATED 1)
+ADD_CUSTOM_TARGET(generate_php_bindings ALL DEPENDS ${KOLAB_SWIG_PHP_SOURCE_FILE})
+
+
+#Compile PHP Bindings
+# Since there is no php library we can't compile with -Wl,--no-undefined
+find_package(PHP4)
+include_directories(${PHP4_INCLUDE_PATH})
+add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE})
+target_link_libraries(phpbindings kolabxml ${PHP_LIBRARIES})
+SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat")
+SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "")
+
+install(TARGETS phpbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/phpbindings)
+
+install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php
+ test.php
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/phpbindings)
\ No newline at end of file
diff --git a/c++/lib/php/test.php b/c++/lib/php/test.php
new file mode 100644
index 0000000..f3f514e
--- /dev/null
+++ b/c++/lib/php/test.php
@@ -0,0 +1,31 @@
+//run using "php -d enable_dl=On -d extension=./kolabformat.so test.php"
+
+<?php
+include("kolabformat.php");
+
+$e = new Event();
+$d = new c_DateTime(2009,10,12);
+print $e->exceptionDates()->size();
+$e->addExceptionDate($d);
+print $e->exceptionDates()->size();
+
+$r = new RecurrenceRule();
+$r->setFrequency(RecurrenceRule::Minutely);
+
+$bysec = new vectori();
+$bysec->push(1);
+$bysec->push(3);
+
+$r->setBySecond($bysec);
+$e->setRecurrenceRule($r);
+
+$string = writeEvent($e);
+print $string;
+$e1 = readEvent($string, false);
+$string = writeEvent($e1);
+print $string;
+?>
+
+
+
+
diff --git a/c++/lib/python/CMakeLists.txt b/c++/lib/python/CMakeLists.txt
new file mode 100644
index 0000000..0521acb
--- /dev/null
+++ b/c++/lib/python/CMakeLists.txt
@@ -0,0 +1,32 @@
+#Generate Python wrapper
+include_directories(../)
+
+set(KOLAB_SWIG_PYTHON_SOURCE_FILE python_kolabformat_wrapper.cpp)
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PYTHON_SOURCE_FILE}
+ COMMAND ${SWIG} -v -c++ -python -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_PYTHON_SOURCE_FILE} ../kolabformat.i
+ COMMENT "Generating python bindings"
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+ DEPENDS ../kolabformat.i ${KOLAB_CONTAINER_HEADERS}
+ VERBATIM
+ )
+
+SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PYTHON_SOURCE_FILE} PROPERTIES GENERATED 1)
+ADD_CUSTOM_TARGET(generate_python_bindings ALL DEPENDS ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+
+#Compile Python Bindings
+find_package(PythonLibs)
+include_directories(${PYTHON_INCLUDE_DIRS})
+
+# python_add_module(kolabformat ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+
+add_library(pythonbindings SHARED ${KOLAB_SWIG_PYTHON_SOURCE_FILE})
+target_link_libraries(pythonbindings kolabxml ${PYTHON_LIBRARY})
+SET_TARGET_PROPERTIES(pythonbindings PROPERTIES OUTPUT_NAME "_kolabformat")
+SET_TARGET_PROPERTIES(pythonbindings PROPERTIES PREFIX "")
+
+install(TARGETS pythonbindings LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pythonbindings)
+
+install( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.py
+ test.py
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/pythonbindings)
\ No newline at end of file
diff --git a/c++/lib/python/test.py b/c++/lib/python/test.py
new file mode 100644
index 0000000..5bc9799
--- /dev/null
+++ b/c++/lib/python/test.py
@@ -0,0 +1,16 @@
+import kolabformat
+e = kolabformat.Event()
+
+ex = e.exceptionDates()
+ex.size()
+ex.push_back(kolabformat.DateTime(1,1,1))
+ex.size()
+e.exceptionDates().size()
+e.setExceptionDates(ex)
+e.exceptionDates().size()
+
+string = kolabformat.writeEvent(e);
+print string;
+e1 = kolabformat.readEvent(string, False);
+string = kolabformat.writeEvent(e1);
+print string;
\ No newline at end of file
diff --git a/c++/lib/test.php b/c++/lib/test.php
deleted file mode 100644
index f3f514e..0000000
--- a/c++/lib/test.php
+++ /dev/null
@@ -1,31 +0,0 @@
-//run using "php -d enable_dl=On -d extension=./kolabformat.so test.php"
-
-<?php
-include("kolabformat.php");
-
-$e = new Event();
-$d = new c_DateTime(2009,10,12);
-print $e->exceptionDates()->size();
-$e->addExceptionDate($d);
-print $e->exceptionDates()->size();
-
-$r = new RecurrenceRule();
-$r->setFrequency(RecurrenceRule::Minutely);
-
-$bysec = new vectori();
-$bysec->push(1);
-$bysec->push(3);
-
-$r->setBySecond($bysec);
-$e->setRecurrenceRule($r);
-
-$string = writeEvent($e);
-print $string;
-$e1 = readEvent($string, false);
-$string = writeEvent($e1);
-print $string;
-?>
-
-
-
-
diff --git a/c++/lib/test.py b/c++/lib/test.py
deleted file mode 100644
index 5bc9799..0000000
--- a/c++/lib/test.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import kolabformat
-e = kolabformat.Event()
-
-ex = e.exceptionDates()
-ex.size()
-ex.push_back(kolabformat.DateTime(1,1,1))
-ex.size()
-e.exceptionDates().size()
-e.setExceptionDates(ex)
-e.exceptionDates().size()
-
-string = kolabformat.writeEvent(e);
-print string;
-e1 = kolabformat.readEvent(string, False);
-string = kolabformat.writeEvent(e1);
-print string;
\ No newline at end of file
More information about the commits
mailing list