2 commits - src/csharp src/java src/kolabformat.i
Christian Mollekopf
mollekopf at kolabsys.com
Mon May 19 09:48:33 CEST 2014
src/csharp/CMakeLists.txt | 9 ++++++---
src/java/CMakeLists.txt | 12 +++++++++---
src/kolabformat.i | 5 +++++
3 files changed, 20 insertions(+), 6 deletions(-)
New commits:
commit eb457503f0fbabdf40538db19b8597409602d790
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Mon May 19 09:47:12 2014 +0200
Added bindings for freebusy and completed csharp and java bindings.
diff --git a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
index 70e5a10..35b1d93 100644
--- a/src/csharp/CMakeLists.txt
+++ b/src/csharp/CMakeLists.txt
@@ -33,6 +33,8 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/Email.cs
${CMAKE_CURRENT_BINARY_DIR}/Event.cs
${CMAKE_CURRENT_BINARY_DIR}/File.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/Freebusy.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/FreebusyPeriod.cs
${CMAKE_CURRENT_BINARY_DIR}/Geo.cs
${CMAKE_CURRENT_BINARY_DIR}/Journal.cs
${CMAKE_CURRENT_BINARY_DIR}/Key.cs
@@ -40,6 +42,7 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/NameComponents.cs
${CMAKE_CURRENT_BINARY_DIR}/Note.cs
${CMAKE_CURRENT_BINARY_DIR}/PartStatus.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/Period.cs
${CMAKE_CURRENT_BINARY_DIR}/RecurrenceRule.cs
${CMAKE_CURRENT_BINARY_DIR}/Related.cs
${CMAKE_CURRENT_BINARY_DIR}/Relation.cs
@@ -48,8 +51,6 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/Snippet.cs
${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs
${CMAKE_CURRENT_BINARY_DIR}/Status.cs
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.cs
${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs
${CMAKE_CURRENT_BINARY_DIR}/Todo.cs
${CMAKE_CURRENT_BINARY_DIR}/Url.cs
@@ -65,13 +66,16 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/vectordaypos.cs
${CMAKE_CURRENT_BINARY_DIR}/vectoremail.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorevent.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorfreebusyperiod.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorgeo.cs
${CMAKE_CURRENT_BINARY_DIR}/vectori.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorkey.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorperiod.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.cs
${CMAKE_CURRENT_BINARY_DIR}/vectors.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.cs
${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.cs
+ ${CMAKE_CURRENT_BINARY_DIR}/vectortodo.cs
${CMAKE_CURRENT_BINARY_DIR}/vectorurl.cs
${CMAKE_CURRENT_BINARY_DIR}/Weekday.cs
)
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index 91c2356..3c0f01b 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -23,6 +23,9 @@ set(KOLAB_SWIG_JAVA_FILES
${CMAKE_CURRENT_BINARY_DIR}/Duration.java
${CMAKE_CURRENT_BINARY_DIR}/ErrorSeverity.java
${CMAKE_CURRENT_BINARY_DIR}/Event.java
+ ${CMAKE_CURRENT_BINARY_DIR}/File.java
+ ${CMAKE_CURRENT_BINARY_DIR}/Freebusy.java
+ ${CMAKE_CURRENT_BINARY_DIR}/FreebusyPeriod.java
${CMAKE_CURRENT_BINARY_DIR}/Geo.java
${CMAKE_CURRENT_BINARY_DIR}/Journal.java
${CMAKE_CURRENT_BINARY_DIR}/Key.java
@@ -32,6 +35,7 @@ set(KOLAB_SWIG_JAVA_FILES
${CMAKE_CURRENT_BINARY_DIR}/NameComponents.java
${CMAKE_CURRENT_BINARY_DIR}/Note.java
${CMAKE_CURRENT_BINARY_DIR}/PartStatus.java
+ ${CMAKE_CURRENT_BINARY_DIR}/Period.java
${CMAKE_CURRENT_BINARY_DIR}/RecurrenceRule.java
${CMAKE_CURRENT_BINARY_DIR}/Relation.java
${CMAKE_CURRENT_BINARY_DIR}/Related.java
@@ -40,9 +44,6 @@ set(KOLAB_SWIG_JAVA_FILES
${CMAKE_CURRENT_BINARY_DIR}/Status.java
${CMAKE_CURRENT_BINARY_DIR}/Snippet.java
${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.java
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.java
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Snippet_t.java
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.java
${CMAKE_CURRENT_BINARY_DIR}/Telephone.java
${CMAKE_CURRENT_BINARY_DIR}/Todo.java
${CMAKE_CURRENT_BINARY_DIR}/Url.java
@@ -56,13 +57,18 @@ set(KOLAB_SWIG_JAVA_FILES
${CMAKE_CURRENT_BINARY_DIR}/vectorcs.java
${CMAKE_CURRENT_BINARY_DIR}/vectordatetime.java
${CMAKE_CURRENT_BINARY_DIR}/vectordaypos.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectoremail.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorevent.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorfreebusyperiod.java
${CMAKE_CURRENT_BINARY_DIR}/vectorgeo.java
${CMAKE_CURRENT_BINARY_DIR}/vectori.java
${CMAKE_CURRENT_BINARY_DIR}/vectorkey.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectorperiod.java
${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.java
${CMAKE_CURRENT_BINARY_DIR}/vectors.java
${CMAKE_CURRENT_BINARY_DIR}/vectorsnippet.java
${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.java
+ ${CMAKE_CURRENT_BINARY_DIR}/vectortodo.java
${CMAKE_CURRENT_BINARY_DIR}/vectorurl.java
${CMAKE_CURRENT_BINARY_DIR}/Weekday.java
)
diff --git a/src/kolabformat.i b/src/kolabformat.i
index eda4c84..da41b08 100644
--- a/src/kolabformat.i
+++ b/src/kolabformat.i
@@ -15,6 +15,7 @@
#include "containers/kolabnote.h"
#include "containers/kolabconfiguration.h"
#include "containers/kolabfile.h"
+ #include "containers/kolabfreebusy.h"
%}
%include "std_string.i"
@@ -39,12 +40,15 @@ namespace std {
%template(vectorevent) vector<Kolab::Event>;
%template(vectorrelated) vector<Kolab::Related>;
%template(vectortelephone) vector<Kolab::Telephone>;
+ %template(vectortodo) vector<Kolab::Todo>;
%template(vectoremail) vector<Kolab::Email>;
%template(vectordatetime) vector<Kolab::cDateTime>;
%template(vectorurl) vector<Kolab::Url>;
%template(vectorkey) vector<Kolab::Key>;
%template(vectorcategorycolor) vector<Kolab::CategoryColor>;
%template(vectorsnippet) vector<Kolab::Snippet>;
+ %template(vectorfreebusyperiod) vector<Kolab::FreebusyPeriod>;
+ %template(vectorperiod) vector<Kolab::Period>;
};
%rename(readKolabFile) Kolab::readFile;
@@ -60,3 +64,4 @@ namespace std {
%include "containers/kolabnote.h"
%include "containers/kolabconfiguration.h"
%include "containers/kolabfile.h"
+%include "containers/kolabfreebusy.h"
commit 0b6986dd0a95839eebddee4593df13a5fa022f72
Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
Date: Mon May 19 09:31:55 2014 +0200
Fixed csharp bindings.
BUG: 3062
diff --git a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
index c808831..70e5a10 100644
--- a/src/csharp/CMakeLists.txt
+++ b/src/csharp/CMakeLists.txt
@@ -49,7 +49,6 @@ set(KOLAB_SWIG_CSHARP_FILES
${CMAKE_CURRENT_BINARY_DIR}/SnippetsCollection.cs
${CMAKE_CURRENT_BINARY_DIR}/Status.cs
${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs
- ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Snippet_t.cs
${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.cs
${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs
${CMAKE_CURRENT_BINARY_DIR}/Todo.cs
More information about the commits
mailing list