4 commits - autogen.sh src/csharp src/java

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Tue Aug 14 16:10:04 CEST 2012


 autogen.sh                |   18 ++++++++++-
 src/csharp/CMakeLists.txt |   68 +++++++++++++++++++++++++++++++++++++++-----
 src/java/CMakeLists.txt   |   70 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 144 insertions(+), 12 deletions(-)

New commits:
commit 11a82f2ab78a11a801155433eec43ff39b401db4
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 14 15:09:46 2012 +0100

    Use the version listed in CMakelists.txt

diff --git a/autogen.sh b/autogen.sh
index e7b3bbb..74415ab 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -39,6 +39,16 @@ if [ ${dobuild} -eq 0 -a ${doprep} -eq 0 -a ${dotest} -eq 0 -a ${doinstall} -eq
     doinstall=1
 fi
 
+version_major=`grep -E "^set \(Libkolabxml_VERSION_MAJOR [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set \(Libkolabxml_VERSION_MAJOR ([0-9]+)\)/\1/g'`
+version_minor=`grep -E "^set \(Libkolabxml_VERSION_MINOR [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set \(Libkolabxml_VERSION_MINOR ([0-9]+)\)/\1/g'`
+version_teeny=`grep -E "^set \(Libkolabxml_VERSION_TEENY [0-9]+\)" CMakeLists.txt | sed -r -e 's/^set \(Libkolabxml_VERSION_TEENY ([0-9]+)\)/\1/g'`
+
+if [ -z "${version_teeny}" ]; then
+    version="${version_major}.${version_minor}"
+else
+    version="${version_major}.${version_minor}.${version_teeny}"
+fi
+
 # Rebuilds the entire foo in one go. One shot, one kill.
 rm -rf build/
 mkdir -p build
@@ -88,7 +98,9 @@ fi
 
 cd ..
 
-git archive --prefix=libkolabxml-0.8/ HEAD | gzip -c > libkolabxml-0.8.tar.gz
+rm -rf libkolabxml-${version}.tar.gz
+git archive --prefix=libkolabxml-${version}/ HEAD | gzip -c > libkolabxml-${version}.tar.gz
 
-cp libkolabxml-0.8.tar.gz `rpm --eval='%{_sourcedir}'`
+rm -rf `rpm --eval='%{_sourcedir}'`/libkolabxml-${version}.tar.gz
+cp libkolabxml-${version}.tar.gz `rpm --eval='%{_sourcedir}'`
 


commit 9c81b10bfafddd0c3c329731da89887c2538aabf
Merge: d46e862 b547658
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 14 14:58:22 2012 +0100

    Merge branch 'master' of ssh://git.kolabsys.com/git/libkolabxml



commit d46e862656689255e7a2c8e598ac20177f91a60b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 14 14:52:29 2012 +0100

    Add back csharp bindings

diff --git a/autogen.sh b/autogen.sh
index 89f9299..e7b3bbb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -49,6 +49,7 @@ if [ ${doprep} -eq 1 ]; then
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DINCLUDE_INSTALL_DIR=/usr/include \
         -DLIB_INSTALL_DIR=/usr/lib64 \
+        -DCSHARP_BINDINGS=ON \
         -DJAVA_BINDINGS=ON \
         -DPHP_BINDINGS=ON \
         -DPYTHON_BINDINGS=ON \
diff --git a/src/csharp/CMakeLists.txt b/src/csharp/CMakeLists.txt
index 0fa9c0d..34a11b5 100644
--- a/src/csharp/CMakeLists.txt
+++ b/src/csharp/CMakeLists.txt
@@ -10,10 +10,66 @@ if (NOT GMCS)
 endif()
 
 set(KOLAB_SWIG_CSHARP_SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/csharp_kolabformat_wrapper.cpp) #it seems we never use this file? it works at least as a dependecy.
+set(KOLAB_SWIG_CSHARP_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/Address.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Affiliation.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Alarm.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Attachment.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Attendee.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/CategoryColor.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/cDateTime.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Classification.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Configuration.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Contact.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/ContactReference.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Crypto.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/CustomProperty.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Cutype.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/DayPos.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Dictionary.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/DistList.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Duration.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/ErrorSeverity.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Event.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Geo.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Journal.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Key.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/kolabformatPINVOKE.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/NameComponents.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Note.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/PartStatus.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/RecurrenceRule.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Related.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Relative.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Role.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Status.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Todo.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Url.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoraddress.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoraffiliation.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoralarm.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorattachment.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorattendee.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcategorycolor.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcontactref.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcs.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectordatetime.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectordaypos.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorgeo.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectori.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorkey.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectors.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorurl.cs
+        ${CMAKE_CURRENT_BINARY_DIR}/Weekday.cs
+    )
 set(KOLAB_SWIG_CSHARP_DLL_FILE ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.dll)
 set(KOLAB_SWIG_CSHARP_TEST_FILE ${CMAKE_CURRENT_BINARY_DIR}/test.exe)
 
-add_custom_command(OUTPUT ${KOLAB_SWIG_CSHARP_SOURCE_FILE}
+add_custom_command(OUTPUT ${KOLAB_SWIG_CSHARP_SOURCE_FILE} ${KOLAB_SWIG_CSHARP_FILES}
         COMMAND ${SWIG} -v -c++ -csharp -o ${KOLAB_SWIG_CSHARP_SOURCE_FILE}  ../kolabformat.i
         COMMENT "Generating C# bindings"
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -22,19 +78,15 @@ add_custom_command(OUTPUT ${KOLAB_SWIG_CSHARP_SOURCE_FILE}
     )
 
 SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_CSHARP_SOURCE_FILE} PROPERTIES GENERATED 1)
+SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_CSHARP_FILES} PROPERTIES GENERATED 1)
 
 configure_file(test.cs ${CMAKE_CURRENT_BINARY_DIR} COPYONLY)
 
-FILE(GLOB CSHARP_GENERATED_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/*.cs")
-LIST( REMOVE_ITEM CSHARP_GENERATED_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/kolabformat.cs") #this one must be first so we remove and readd later
-SET_SOURCE_FILES_PROPERTIES(${CSHARP_GENERATED_SOURCE_FILES} PROPERTIES GENERATED 1)
-LIST( REMOVE_ITEM CSHARP_GENERATED_SOURCE_FILES "${CMAKE_CURRENT_BINARY_DIR}/test.cs") #not a generated file
-
 add_custom_command(OUTPUT ${KOLAB_SWIG_CSHARP_DLL_FILE}
-        COMMAND ${GMCS} -target:library "${CMAKE_CURRENT_BINARY_DIR}/kolabformat.cs" ${CSHARP_GENERATED_SOURCE_FILES}
+        COMMAND ${GMCS} -target:library "${CMAKE_CURRENT_BINARY_DIR}/kolabformat.cs" ${KOLAB_SWIG_CSHARP_FILES}
         COMMENT "Compiling C# library"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DEPENDS kolabxml ${KOLAB_SWIG_CSHARP_SOURCE_FILE} ${CSHARP_GENERATED_SOURCE_FILES}
+        DEPENDS kolabxml ${KOLAB_SWIG_CSHARP_SOURCE_FILE} ${KOLAB_SWIG_CSHARP_FILES}
         VERBATIM
     )
 


commit 201f1436afcf62edb3891ad956b652a241e9acac
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Aug 14 14:31:23 2012 +0100

    Generate Java bindings and include them with installation

diff --git a/autogen.sh b/autogen.sh
index 6d02de4..89f9299 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -49,6 +49,7 @@ if [ ${doprep} -eq 1 ]; then
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DINCLUDE_INSTALL_DIR=/usr/include \
         -DLIB_INSTALL_DIR=/usr/lib64 \
+        -DJAVA_BINDINGS=ON \
         -DPHP_BINDINGS=ON \
         -DPYTHON_BINDINGS=ON \
         ..
diff --git a/src/java/CMakeLists.txt b/src/java/CMakeLists.txt
index 0435748..cdc63f5 100644
--- a/src/java/CMakeLists.txt
+++ b/src/java/CMakeLists.txt
@@ -2,16 +2,82 @@
 include_directories(../)
 
 set(KOLAB_SWIG_JAVA_SOURCE_FILE java_kolabformat_wrapper.cpp)
-add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_JAVA_SOURCE_FILE}
+set(KOLAB_SWIG_JAVA_FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/Address.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Affiliation.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Alarm.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Attachment.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Attendee.java
+        ${CMAKE_CURRENT_BINARY_DIR}/CategoryColor.java
+        ${CMAKE_CURRENT_BINARY_DIR}/cDateTime.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Classification.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Configuration.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Contact.java
+        ${CMAKE_CURRENT_BINARY_DIR}/ContactReference.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Crypto.java
+        ${CMAKE_CURRENT_BINARY_DIR}/CustomProperty.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Cutype.java
+        ${CMAKE_CURRENT_BINARY_DIR}/DayPos.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Dictionary.java
+        ${CMAKE_CURRENT_BINARY_DIR}/DistList.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Duration.java
+        ${CMAKE_CURRENT_BINARY_DIR}/ErrorSeverity.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Event.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Geo.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Journal.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Key.java
+        ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.java
+        ${CMAKE_CURRENT_BINARY_DIR}/kolabformatJNI.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Makefile
+        ${CMAKE_CURRENT_BINARY_DIR}/NameComponents.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Note.java
+        ${CMAKE_CURRENT_BINARY_DIR}/PartStatus.java
+        ${CMAKE_CURRENT_BINARY_DIR}/RecurrenceRule.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Related.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Relative.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Role.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Status.java
+        ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Telephone.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Todo.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Url.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoraddress.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoraffiliation.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectoralarm.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorattachment.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorattendee.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcategorycolor.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcontactref.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorcs.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectordatetime.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectordaypos.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorgeo.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectori.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorkey.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorrelated.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectors.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectortelephone.java
+        ${CMAKE_CURRENT_BINARY_DIR}/vectorurl.java
+        ${CMAKE_CURRENT_BINARY_DIR}/Weekday.java
+    )
+
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_JAVA_SOURCE_FILE} ${KOLAB_SWIG_JAVA_FILES}
     COMMAND ${SWIG} -v -c++ -java -o ${CMAKE_CURRENT_BINARY_DIR}/${KOLAB_SWIG_JAVA_SOURCE_FILE}  ../kolabformat.i
     COMMENT "Generating Java bindings"
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ../kolabformat.i kolabxml
     VERBATIM
     )
+
 SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_JAVA_SOURCE_FILE} PROPERTIES GENERATED 1)
+
 ADD_CUSTOM_TARGET(generate_JAVA_bindings ALL DEPENDS ${KOLAB_SWIG_JAVA_SOURCE_FILE})
 
 # Compile JAVA Bindings
 
-# set(JAVA_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/javabindings" CACHE STRING "Install directory for java bindings.")
+set(JAVA_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/javabindings" CACHE STRING "Install directory for java bindings.")
+
+install( FILES
+        ${KOLAB_SWIG_JAVA_FILES}
+        DESTINATION ${JAVA_INSTALL_DIR}
+    )





More information about the commits mailing list