3 commits - libkolabxml/lib libkolabxml/README-Mac.txt

[Thomas Brüderli]

 libkolabxml/README-Mac.txt    |   17 +++++++++++++++++
 libkolabxml/lib/kolabformat.i |    1 +
 libkolabxml/lib/php/test.php  |    4 +++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 6fa5b37f7daec3a4c642d0fd4fd62bfa63a9f8fc
Merge: c460474 b3fd751
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 28 12:09:10 2012 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/libkolabxml



commit c460474565c465adc911b6dfa1a560b3f091b629
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 28 12:08:49 2012 +0200

    Add instructions for building on Mac OS X

diff --git a/libkolabxml/README-Mac.txt b/libkolabxml/README-Mac.txt
new file mode 100644
index 0000000..b848457
--- /dev/null
+++ b/libkolabxml/README-Mac.txt
@@ -0,0 +1,17 @@
+# The following commands are used to bild libkolabxml on Mac OS X (Lion)
+# with most of the required libraries installed via macports:
+# > sudo port install cmake boost xercesc3
+#
+# The cxx/xsd library has to be downlaoded from http://www.codesynthesis.com/products/xsd/download.xhtml
+# and manually copied into /usr/bin and /usr/include/xsd/
+
+rm -rf build/
+mkdir -p build
+cd build
+cmake -DKOLAB_PHP_INSTALL_DIR:PATH=/usr/lib/php/extensions/no-debug-non-zts-20090626 -DCMAKE_INCLUDE_PATH:PATH=/opt/local/include -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
+make
+sudo make install
+
+# This will install kolabformat.dylib and kolabform.php to the KOLAB_PHP_INSTALL_DIR
+# You probably have to symlink kolabformat.dylib to kolabformat.so and move
+# kolabform.php to a location which is in the include_path of your PHP installation.


commit 972c1ad9df88ebb85860bf3e048918c5e4ff8913
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Mar 28 12:06:13 2012 +0200

    Added template for vector<Kolab::Geo> and adapt php tests accordingly

diff --git a/libkolabxml/lib/kolabformat.i b/libkolabxml/lib/kolabformat.i
index 30726f3..12db5b1 100644
--- a/libkolabxml/lib/kolabformat.i
+++ b/libkolabxml/lib/kolabformat.i
@@ -28,6 +28,7 @@ namespace std {
     %template(vectorattachment) vector<Kolab::Attachment>;
     %template(vectorattendee) vector<Kolab::Attendee>;
     %template(vectorcontactref) vector<Kolab::ContactReference>;
+    %template(vectorgeo) vector<Kolab::Geo>;
     %template(vectorrelated) vector<Kolab::Related>;
     %template(vectortelephone) vector<Kolab::Telephone>;
     %template(vectordatetime) vector<Kolab::cDateTime>;
diff --git a/libkolabxml/lib/php/test.php b/libkolabxml/lib/php/test.php
index 48c3304..75f7d9f 100755
--- a/libkolabxml/lib/php/test.php
+++ b/libkolabxml/lib/php/test.php
@@ -102,7 +102,9 @@ $c->setTitles(array2vector("MyProfession"));
 
 $pic = "R0lGODlhEgASAIAAAMDAwAAAACH5BAEAAAAALAAAAAASABIAQAIPhI+py+0Po5y02ouz3pwXADs=";
 $c->setPhoto(base64_decode($pic), 'image/gif');
-$c->setGPSpos(array2vector("geo:46.952585,7.43766"));
+$geo = new vectorgeo;
+$geo->push(new Geo(46.952585, 7.43766));
+$c->setGPSpos($geo);
 
 $bd = new cDateTime(1980,8,1);
 $c->setBDay($bd);