5 commits - CMakeLists.txt kolabformat/xmlobject.cpp kolabformat/xmlobject.h

Christian Mollekopf mollekopf at kolabsys.com
Wed Feb 20 23:54:01 CET 2013


 CMakeLists.txt            |    8 ++++----
 kolabformat/xmlobject.cpp |   21 +++++++++++++++++++++
 kolabformat/xmlobject.h   |    3 +++
 3 files changed, 28 insertions(+), 4 deletions(-)

New commits:
commit 32731c8ecc337ac6fa3c8952572e095e3948dab8
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Feb 20 21:16:34 2013 +0100

    fixed version number to 0.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 461320e..cae142d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,9 +33,9 @@ endif()
 set(Libkolab_VERSION_MAJOR 0)
 set(Libkolab_VERSION_MINOR 5)
 # Enable the full x.y.z version only for release versions
-set(Libkolab_VERSION_PATCH 1)
-set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
-#set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR} )
+#set(Libkolab_VERSION_PATCH 1)
+#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})
 
 # set up install directories.


commit 4a2e2eb169f0a42e25aeef7695bcf0b7afea2fb6
Merge: 6f0c7d0 2c12cff
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Feb 20 21:15:50 2013 +0100

    Merge branch '0.4'
    
    Conflicts:
    	tests/CMakeLists.txt



commit 2c12cffd3bffcb6abbe7abd5d1473db667617164
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Feb 20 21:11:17 2013 +0100

    We require libkolabxml 0.8.3 for the files api

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c9652b..74b8f25 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ set(CMAKECONFIG_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/Libkolab )
 include(MacroLogFeature)
 
 # Do the building
-find_package(Libkolabxml 0.7 REQUIRED)
+find_package(Libkolabxml 0.8.3 REQUIRED)
 macro_log_feature(Libkolabxml_FOUND "Libkolabxml" "Kolab XML Format 3 serializing library" "http://git.kolab.org/libkolabxml/" TRUE "0.7" "Required for reading/writing Kolab XML Objects")
 
 find_package(Qt4 4.6.0 REQUIRED)


commit e4fed71f3edba1ded1c66cf2ddda6cac7e2d33d5
Merge: 221cae6 db2407f
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Feb 20 20:57:50 2013 +0100

    Merge branch 'files' into 0.4
    
    Conflicts:
    	tests/CMakeLists.txt

diff --cc CMakeLists.txt
index ae03027,b8dcdef..8c9652b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -31,11 -31,11 +31,11 @@@ endif(
  # 0.1.1 (patch release for 0.1.0)
  # 0.2 (0.2 development version towards 0.2.0)
  set(Libkolab_VERSION_MAJOR 0)
- set(Libkolab_VERSION_MINOR 4)
+ set(Libkolab_VERSION_MINOR 5)
  # Enable the full x.y.z version only for release versions
 -#set(Libkolab_VERSION_PATCH 1)
 -#set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR}.${Libkolab_VERSION_PATCH} )
 -set(Libkolab_VERSION ${Libkolab_VERSION_MAJOR}.${Libkolab_VERSION_MINOR} )
 +set(Libkolab_VERSION_PATCH 1)
 +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})
  
  # set up install directories.
diff --cc tests/CMakeLists.txt
index 6f71a0c,284a33b..c7d1f0b
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@@ -21,4 -21,4 +21,5 @@@ addTest(icalendartest
  addTest(freebusytest)
  addTest(kolabobjecttest)
  addTest(timezonetest)
 +addTest(xmlobjecttest)
+ addTest(mimeobjecttest)


commit db2407f888f1ec7bd58764168516359ca3c53b5b
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed Jan 16 12:50:15 2013 +0100

    Files support for xmlobject

diff --git a/kolabformat/xmlobject.cpp b/kolabformat/xmlobject.cpp
index ebeca5f..86d96ce 100644
--- a/kolabformat/xmlobject.cpp
+++ b/kolabformat/xmlobject.cpp
@@ -299,5 +299,26 @@ std::string XMLObject::writeConfiguration(const Configuration &configuration, Ve
     return result;
 }
 
+File XMLObject::readFile(const std::string& s, Version version)
+{
+    if (version == KolabV2) {
+        Critical() << "only v3 implementation available";
+        return File();
+    }
+    return Kolab::readFile(s, false);
+}
+
+std::string XMLObject::writeFile(const File &file, Version version, const std::string& productId)
+{
+    mWrittenUID.clear();
+    if (version != KolabV3) {
+        Critical() << "only v3 implementation available";
+        return std::string();
+    }
+    const std::string result = Kolab::writeFile(file, productId);
+    mWrittenUID = Kolab::getSerializedUID();
+    return result;
+}
+
     
 };
diff --git a/kolabformat/xmlobject.h b/kolabformat/xmlobject.h
index 6012095..5066e8f 100644
--- a/kolabformat/xmlobject.h
+++ b/kolabformat/xmlobject.h
@@ -85,6 +85,9 @@ public:
 
     Kolab::Configuration readConfiguration(const std::string& s, Kolab::Version version);
     std::string writeConfiguration(const Kolab::Configuration &, Kolab::Version version, const std::string& productId = std::string());
+
+    Kolab::File readFile(const std::string& s, Kolab::Version version);
+    std::string writeFile(const Kolab::File &, Kolab::Version version, const std::string& productId = std::string());
     
 private:
     std::vector<std::string> mAttachments;





More information about the commits mailing list