Kaydet (Commit) 12d193df authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat

libcmis: updated to 0.2.0

Change-Id: I I I Ieb36a287824e347e3ccc57c2c0abc6defbae5f47
üst d1eb25ba
......@@ -270,6 +270,28 @@ endef
endif # SYSTEM_HUNSPELL
ifeq ($(SYSTEM_BOOST),YES)
# No need of libboostdatetime at all
define gb_LinkTarget__use_boostdatetime
endef
else # !SYSTEM_BOOST
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
boostdatetime \
))
define gb_LinkTarget__use_boostdatetime
$(call gb_LinkTarget_use_static_libraries,$(1),\
boostdatetime \
)
endef
endif # SYSTEM_BOOST
ifeq ($(SYSTEM_LIBCMIS),YES)
define gb_LinkTarget__use_cmis
......
--- misc/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2011-09-30 20:35:37.000000000 +0200
+++ misc/build/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2012-03-13 21:46:03.985188599 +0100
@@ -39,6 +39,8 @@
class CmisObject
{
public:
+ virtual ~CmisObject() {}
+
virtual std::string getId( ) = 0;
virtual std::string getName( ) = 0;
--- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 +0200
+++ misc/build/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:54:58.290853952 +0200
@@ -1 +1,39 @@
-dummy
+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
+
+PRJ=..$/..$/..$/..$/..$/..
+
+PRJNAME=libcmis
+TARGET=cmislib
+ENABLE_EXCEPTIONS=TRUE
+VISIBILITY_HIDDEN=TRUE
+LIBTARGET=NO
+
+.INCLUDE : settings.mk
+
+.IF "$(GUI)$(COM)"=="WNTMSC"
+CFLAGS+=-GR
+.ENDIF
+.IF "$(COM)"=="GCC"
+CFLAGSCXX+=-frtti
+.ENDIF
+
+.IF "$(SYSTEM_LIBXML)"=="YES"
+CFLAGS+=$(LIBXML_CFLAGS)
+.ENDIF
+.IF "$(SYSTEM_CURL)"=="YES"
+CFLAGS+=$(CURL_CFLAGS)
+.ENDIF
+
+SLOFILES= \
+ $(SLO)$/session-factory.obj \
+ $(SLO)$/atom-document.obj \
+ $(SLO)$/atom-folder.obj \
+ $(SLO)$/atom-object.obj \
+ $(SLO)$/atom-session.obj \
+ $(SLO)$/atom-utils.obj
+
+LIB1ARCHIV=$(LB)$/libcmislib.a
+LIB1TARGET=$(SLB)$/$(TARGET).lib
+LIB1OBJFILES= $(SLOFILES)
+
+.INCLUDE : target.mk
--- misc/libcmis-0.1.0/src/libcmis/session-factory.cxx 2012-01-10 15:28:52.458706430 +0000
+++ misc/build/libcmis-0.1.0/src/libcmis/session-factory.cxx 2012-01-10 15:29:57.856419249 +0000
@@ -60,4 +60,8 @@
return repos;
}
+
+ Session::~Session()
+ {
+ }
}
--- misc/libcmis-0.1.0/src/libcmis/session.hxx 2012-01-10 15:28:52.458706430 +0000
+++ misc/build/libcmis-0.1.0/src/libcmis/session.hxx 2012-01-10 15:29:19.071996444 +0000
@@ -44,6 +44,8 @@
/** Get a CMIS object from its ID.
*/
virtual CmisObjectPtr getObject( std::string id ) = 0;
+
+ virtual ~Session();
};
}
......@@ -41,14 +41,14 @@ TARGET=cmis
@echo "Using system libcmis..."
.ENDIF
TARFILE_NAME=libcmis-0.1.0
TARFILE_MD5=7c2549f6b0a8bb604e6c4c729ffdcfe6
ADDITIONAL_FILES=src$/libcmis$/makefile.mk
PATCH_FILES=$(TARFILE_NAME).patch
#https://sourceforge.net/p/libcmis/tickets/1/
PATCH_FILES+=libcmis-0001-virtualdtor.patch
PATCH_FILES+=libcmis-0.1.0-non-virtual-dtor.patch
TARFILE_NAME=libcmis-0.2.0
TARFILE_MD5=36c168b03593dfa386fba23a0c32d11b
.IF "$(debug)" != ""
CFLAGS+=-g
.ELSE
CFLAGS+=-O
.ENDIF
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/libcmis
......
......@@ -48,6 +48,7 @@ $(eval $(call gb_Library_use_externals,ucpcmis1,\
cmis \
curl \
libxml2 \
boostdatetime \
))
$(eval $(call gb_Library_add_exception_objects,ucpcmis1,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment