[Libreoffice-commits] .: 2 commits - libcmis/libcmis-0.1.0.patch libcmis/makefile.mk libcmis/prj scp2/source solenv/inc ucb/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Wed Oct 5 02:33:01 PDT 2011
libcmis/libcmis-0.1.0.patch | 35 +++++++++++++++++++++
libcmis/makefile.mk | 58 +++++++++++++++++++++++++++++++++++
libcmis/prj/build.lst | 5 +--
libcmis/prj/d.lst | 7 ++++
scp2/source/ooo/file_library_ooo.scp | 22 -------------
solenv/inc/libs.mk | 5 ---
ucb/source/ucp/cmis/makefile.mk | 18 ++++++++++
7 files changed, 120 insertions(+), 30 deletions(-)
New commits:
commit 5b42577cafc9562e3e5d32a6bb7e1f9fb9793bd5
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Oct 5 11:31:06 2011 +0200
Don't package libcmis that we link statically
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 03e2f93..b8eaa20 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -186,28 +186,6 @@ End
#endif
-#if ENABLE_CMIS
-File gid_File_Lib_Cmis
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = SCP2_OOO_BIN_DIR;
- #ifdef UNX
- #ifdef MACOSX
- Name = STRING(CONCAT2(libcmis-0.2.0,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(libcmis-0.2,UNXSUFFIX,.0));
- #endif
- #else
- #ifdef _gcc3
- Name = "libcmis-0.2.dll";
- #else
- Name = "libcmis.dll";
- #endif
- #endif
-End
-
-#endif
-
#ifndef SYSTEM_DB
File gid_File_Lib_Db
commit 0bd11cfd85cea5fb2dec0c2fc0da49fb522ab7b3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Wed Oct 5 11:28:48 2011 +0200
Use the old way to build libcmis and cmis ucp ATM
diff --git a/libcmis/libcmis-0.1.0.patch b/libcmis/libcmis-0.1.0.patch
new file mode 100644
index 0000000..dc4d2da
--- /dev/null
+++ b/libcmis/libcmis-0.1.0.patch
@@ -0,0 +1,35 @@
+--- 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,31 @@
+-dummy
++EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
++
++PRJ=..$/..$/..$/..$/..$/..
++
++PRJNAME=libcmis
++TARGET=cmislib
++ENABLE_EXCEPTIONS=TRUE
++LIBTARGET=NO
++
++.INCLUDE : settings.mk
++
++.IF "$(GUI)$(COM)"=="WNTMSC"
++CFLAGS+=-GR
++.ENDIF
++.IF "$(COM)"=="GCC"
++CFLAGSCXX+=-frtti
++.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
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
new file mode 100644
index 0000000..50a8324
--- /dev/null
+++ b/libcmis/makefile.mk
@@ -0,0 +1,58 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=cmis
+TARGET=cmis
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE : settings.mk
+
+# --- Files --------------------------------------------------------
+
+.IF "$(SYSTEM_LIBcmis)" == "YES"
+ at all:
+ @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
+
+BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
+BUILD_DIR=src$/libcmis
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/libcmis/prj/build.lst b/libcmis/prj/build.lst
index cbc0827..c2beeeb 100644
--- a/libcmis/prj/build.lst
+++ b/libcmis/prj/build.lst
@@ -1,2 +1,3 @@
-lc libcmis : BOOST:boost soltools NULL
-lc libcmis/prj nmake - all lc_prj NULL
+lc libcmis : BOOST:boost soltools NULL
+lc libcmis usr1 - all lc_mkout NULL
+lc libcmis nmake - all lc_libcmis NULL
diff --git a/libcmis/prj/d.lst b/libcmis/prj/d.lst
index e69de29..2b70213 100644
--- a/libcmis/prj/d.lst
+++ b/libcmis/prj/d.lst
@@ -0,0 +1,7 @@
+
+..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.*
+..\%__SRC%\lib\ilib*.* %_DEST%\lib\ilib*.*
+..\%__SRC%\bin\l*.dll %_DEST%\bin\*.dll
+
+mkdir: %_DEST%\inc\libcmis
+..\%__SRC%\misc\build\libcmis*\src\libcmis\*.hxx %_DEST%\inc\libcmis\*.hxx
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 3d1e09b..91161f1 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -248,11 +248,6 @@ REDLANDLIB=$(REDLAND_LIBS)
.ELSE
REDLANDLIB=-lrdf
.ENDIF
-.IF "$(SYSTEM_LIBCMIS)"=="YES"
-CMISLIB=$(LIBCMIS_LIBS)
-.ELSE
-CMISLIB=-lcmis-0.2
-.ENDIF
# #110743#
# For BinFilters, some libs were added.
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index a416316..5db9e92 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -39,6 +39,20 @@ NO_BSYMBOLIC=TRUE
.IF "$(ENABLE_CMIS)"=="TRUE"
+.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
+
+.IF "$(SYSTEM_LIBCMIS)"=="YES"
+CMISLIB=$(LIBCMIS_LIBS)
+.ELSE
+CMISLIB=-lcmislib
+.ENDIF
+
+.ELSE
+
+CMISLIB=$(LIBPRE) cmislib.lib
+
+.ENDIF
+
# no "lib" prefix
DLLPRE =
@@ -57,7 +71,9 @@ SHL1STDLIBS=\
$(SALHELPERLIB) \
$(UCBHELPERLIB) \
$(TOOLSLIB) \
- $(CMISLIB)
+ $(CMISLIB) \
+ $(CURLLIB) \
+ $(LIBXML2LIB)
SHL1VERSIONMAP=$(SOLARENV)/src/component.map
More information about the Libreoffice-commits
mailing list