Kaydet (Commit) 3b53c579 authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Fix Windows build and enable CMIS inconditionally

Since the provider should now build everywhere,
enable it inconditionally to catch minor problems
üst 9bb18700
...@@ -7030,12 +7030,6 @@ if test "$enable_cairo_canvas" = "yes" ; then ...@@ -7030,12 +7030,6 @@ if test "$enable_cairo_canvas" = "yes" ; then
fi fi
AC_SUBST(ENABLE_CAIRO_CANVAS) AC_SUBST(ENABLE_CAIRO_CANVAS)
ENABLE_CMIS="FALSE"
if test "x$with_cmis" != "xno" ; then
ENABLE_CMIS="TRUE"
fi
AC_SUBST(ENABLE_CMIS)
dnl =================================================================== dnl ===================================================================
dnl Check whether the GStreamer libraries are available. dnl Check whether the GStreamer libraries are available.
dnl =================================================================== dnl ===================================================================
......
...@@ -27,11 +27,9 @@ ...@@ -27,11 +27,9 @@
$(eval $(call gb_Module_Module,libcmis)) $(eval $(call gb_Module_Module,libcmis))
ifeq ($(ENABLE_CMIS),TRUE)
$(eval $(call gb_Module_add_targets,libcmis,\ $(eval $(call gb_Module_add_targets,libcmis,\
ExternalLib_libcmis \ ExternalLib_libcmis \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -168,6 +168,7 @@ my_components = \ ...@@ -168,6 +168,7 @@ my_components = \
ucphier1 \ ucphier1 \
ucppkg1 \ ucppkg1 \
ucptdoc1 \ ucptdoc1 \
ucpcmis1 \
.IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"
my_components += \ my_components += \
...@@ -221,10 +222,6 @@ my_components += gconfbe1 ...@@ -221,10 +222,6 @@ my_components += gconfbe1
my_components += ucpgio my_components += ucpgio
.END .END
.IF "$(ENABLE_CMIS)" == "TRUE"
my_components += ucpcmis
.END
.IF "$(ENABLE_GNOMEVFS)" != "" .IF "$(ENABLE_GNOMEVFS)" != ""
my_components += ucpgvfs my_components += ucpgvfs
.END .END
......
...@@ -1333,9 +1333,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno) ...@@ -1333,9 +1333,7 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpexpand1, ucpexpand1.uno)
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1) SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpodma1, ucpodma1)
#endif #endif
#if ENABLE_CMIS
SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno) SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpcmis, ucpcmis1.uno)
#endif
File gid_File_Lib_Lnth File gid_File_Lib_Lnth
TXT_FILE_BODY; TXT_FILE_BODY;
......
...@@ -327,9 +327,7 @@ Module gid_Module_Root_Files_5 ...@@ -327,9 +327,7 @@ Module gid_Module_Root_Files_5
#if ! defined SYSTEM_LIBGSF #if ! defined SYSTEM_LIBGSF
gid_File_Lib_Libgsf, gid_File_Lib_Libgsf,
#endif #endif
#if ENABLE_CMIS
gid_File_Lib_Cmis, gid_File_Lib_Cmis,
#endif
gid_File_Lib_Dict_Ja, gid_File_Lib_Dict_Ja,
gid_File_Lib_Dict_Zh, gid_File_Lib_Dict_Zh,
gid_File_Lib_Collator_Data, gid_File_Lib_Collator_Data,
......
...@@ -1496,7 +1496,6 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" ); ...@@ -1496,7 +1496,6 @@ ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" ); ToFile( "SPLIT_APP_MODULES", "@SPLIT_APP_MODULES@","e" );
ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" ); ToFile( "SPLIT_OPT_FEATURES","@SPLIT_OPT_FEATURES@","e" );
ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" ); ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@", "e" );
ToFile( "ENABLE_CMIS", "@ENABLE_CMIS@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" ); ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" ); ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" ); ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
......
#*************************************************************************
# #
# Version: MPL 1.1 / GPLv3+ / LGPLv3+ # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# The contents of this file are subject to the Mozilla Public License Version # Copyright 2000, 2010 Oracle and/or its affiliates.
# 1.1 (the "License"); you may not use this file except in compliance with
# the License or as specified alternatively below. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
# #
# Software distributed under the License is distributed on an "AS IS" basis, # OpenOffice.org - a multi-platform office productivity suite
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
# #
# Major Contributor(s): # This file is part of OpenOffice.org.
# [ Copyright (C) 2011 SUSE <cbosdonnat@suse.com> (initial developer) ]
# #
# All Rights Reserved. # 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.
# #
# For minor contributions see the git repository. # 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).
# #
# Alternatively, the contents of this file may be used under the terms of # You should have received a copy of the GNU Lesser General Public License
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or # version 3 along with OpenOffice.org. If not, see
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), # <http://www.openoffice.org/license.html>
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # for a copy of the LGPLv3 License.
# instead of those above.
# #
#*************************************************************************
PRJ=..$/..$/.. PRJ = ..$/..$/..
PRJNAME=ucb PRJNAME = ucb
# Version UCPCMIS_MAJOR = 1
UCPCMIS_MAJOR=1 TARGET = ucpcmis$(UCPCMIS_MAJOR).uno
TARGET=ucpcmis ENABLE_EXCEPTIONS = TRUE
ENABLE_EXCEPTIONS=TRUE NO_BSYMBOLIC = TRUE
USE_DEFFILE=TRUE
NO_BSYMBOLIC=TRUE
.INCLUDE: settings.mk .INCLUDE : settings.mk
.IF "$(L10N_framework)"=="" DLLPRE =
.IF "$(ENABLE_CMIS)"=="TRUE" .IF "$(L10N_framework)"==""
.IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC" .IF "$(GUI)"=="UNX" || "$(GUI)$(COM)"=="WNTGCC"
...@@ -53,18 +51,12 @@ CMISLIB=$(LIBPRE) cmislib.lib ...@@ -53,18 +51,12 @@ CMISLIB=$(LIBPRE) cmislib.lib
.ENDIF .ENDIF
# no "lib" prefix SLOFILES= \
DLLPRE = $(SLO)$/cmis_provider.obj\
SLOFILES=$(SLO)$/cmis_provider.obj\
$(SLO)$/cmis_content.obj \ $(SLO)$/cmis_content.obj \
$(SLO)$/cmis_url.obj $(SLO)$/cmis_url.obj
SHL1TARGET=$(TARGET)$(UCPCMIS_MAJOR).uno SHL1STDLIBS = \
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1IMPLIB=i$(TARGET)
SHL1STDLIBS=\
$(CPPUHELPERLIB) \ $(CPPUHELPERLIB) \
$(CPPULIB) \ $(CPPULIB) \
$(SALLIB) \ $(SALLIB) \
...@@ -75,14 +67,19 @@ SHL1STDLIBS=\ ...@@ -75,14 +67,19 @@ SHL1STDLIBS=\
$(CURLLIB) \ $(CURLLIB) \
$(LIBXML2LIB) $(LIBXML2LIB)
SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1VERSIONMAP = $(SOLARENV)/src/component.map
SHL1TARGET = $(TARGET)
.ENDIF # "$(ENABLE_CMIS)"=="TRUE" SHL1DEPN =
.ENDIF # L10N_framework SHL1IMPLIB = i$(TARGET)
SHL1LIBS = $(SLB)$/$(TARGET).lib
SHL1DEF = $(MISC)$/$(SHL1TARGET).def
DEF1NAME = $(SHL1TARGET)
.INCLUDE: target.mk .ENDIF # L10N_framework
.IF "$(ENABLE_CMIS)"=="TRUE" .INCLUDE : target.mk
ALLTAR : $(MISC)/ucpcmis.component ALLTAR : $(MISC)/ucpcmis.component
...@@ -91,5 +88,3 @@ $(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ ...@@ -91,5 +88,3 @@ $(MISC)/ucpcmis.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
$(XSLTPROC) --nonet --stringparam uri \ $(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt ucpcmis.component $(SOLARENV)/bin/createcomponent.xslt ucpcmis.component
.ENDIF # "$(ENABLE_CMIS)"=="TRUE"
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