extensions: convert ole automation bridge to gbuild

Of course not tested at all (WNT only)

7 files changed, 148 insertions, 136 deletions

diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
new file mode 100644
index 000000000000..0fda05a62854
--- /dev/null
+++ b/extensions/Library_oleautobridge.mk
@@ -0,0 +1,67 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 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,
+# 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):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+$(eval $(call gb_Library_Library,oleautobridge))
+
+$(eval $(call gb_Library_set_componentfile,oleautobridge,extensions/source/ole/oleautobridge))
+
+$(eval $(call gb_Library_add_api,oleautobridge,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,oleautobridge,\
+	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,oleautobridge,\
+	cppuhelper \
+	cppu \
+	sal \
+	advapi32 \
+	$(if $(USE_DEBUG_RUNTIME),atlsd,atls)
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+
+$(eval $(call gb_Library_add_exception_objects,oleautobridge,\
+	extensions/source/ole/jscriptclasses \
+	extensions/source/ole/ole2uno \
+	extensions/source/ole/oledll \
+	extensions/source/ole/oleobjw \
+	extensions/source/ole/olethread \
+	extensions/source/ole/servprov \
+	extensions/source/ole/servreg \
+	extensions/source/ole/unoobjw \
+	extensions/source/ole/unotypewrapper \
+	extensions/source/ole/windata \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
new file mode 100644
index 000000000000..7cb94c7a50c5
--- /dev/null
+++ b/extensions/Library_oleautobridge2.mk
@@ -0,0 +1,70 @@
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 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,
+# 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):
+# [ Copyright (C) 2011 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+
+# TODO: do we really need 2 of these?
+$(eval $(call gb_Library_Library,oleautobridge2))
+
+$(eval $(call gb_Library_add_defs,oleautobridge2,\
+	 -DOWNGUID \
+))
+
+$(eval $(call gb_Library_add_api,oleautobridge2,\
+	udkapi \
+	offapi \
+))
+
+$(eval $(call gb_Library_set_include,oleautobridge2,\
+	$(foreach inc,$(ATL_INCLUDE),-I$(inc)) \
+	$$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,oleautobridge2,\
+	cppuhelper \
+	cppu \
+	sal \
+	advapi32 \
+	$(if $(USE_DEBUG_RUNTIME),atlsd,atls)
+	ole32 \
+	oleaut32 \
+	uuid \
+))
+
+$(eval $(call gb_Library_add_exception_objects,oleautobridge2,\
+	extensions/source/ole/jscriptclasses \
+	extensions/source/ole/ole2uno \
+	extensions/source/ole/oledll \
+	extensions/source/ole/oleobjw \
+	extensions/source/ole/olethread \
+	extensions/source/ole/servprov \
+	extensions/source/ole/servreg \
+	extensions/source/ole/unoobjw \
+	extensions/source/ole/unotypewrapper \
+	extensions/source/ole/windata \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 179170a6a9a6..21a30ab6d044 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -35,6 +35,15 @@ $(eval $(call gb_Module_add_targets,extensions,\
 	Library_updchk \
 ))
 
+ifeq ($(OS),WNT)
+ifeq ($(DISABLE_ATL),)
+$(eval $(call gb_Module_add_targets,extensions,\
+	Library_oleautobridge \
+	Library_oleautobridge2 \
+))
+endif
+endif
+
 $(eval $(call gb_Module_add_check_targets,extensions,\
     CppunitTest_extensions_test_update \
 ))
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index cc629f4f4ef8..44f22e90beb5 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -8,7 +8,6 @@ ex  extensions\source\plugin\inc\plugin\win     get     -   all ex_piwi ex_inc N
 ex  extensions\source\plugin\inc\plugin\unx     get     -   all ex_piux ex_inc NULL
 ex  extensions\source\activex\msidl             nmake   -   w   ex_axmsidl ex_inc NULL
 ex  extensions\source\activex\main              nmake   -   w   ex_axmain ex_axmsidl.w ex_inc NULL
-ex  extensions\source\ole                       nmake   -   w   ex_ole ex_xmlextr ex_inc NULL
 ex  extensions\source\resource                  nmake   -   all ex_resrc ex_inc NULL
 ex  extensions\source\plugin\aqua               nmake   -   u   ex_plaqua ex_plbase NULL
 ex  extensions\source\plugin\base               nmake   -   all ex_plbase ex_inc NULL
diff --git a/extensions/source/ole/makefile.mk b/extensions/source/ole/makefile.mk
deleted file mode 100644
index a9ff68118c58..000000000000
--- a/extensions/source/ole/makefile.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-#*************************************************************************
-#
-# 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=extensions
-TARGET=oleautobridge.uno
-TARGET2=oleautobridge2.uno
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-LIBTARGET=NO
-USE_DEFFILE=YES
-
-USE_DEFFILE=TRUE
-
-INCPRE+= $(foreach,i,$(ATL_INCLUDE) -I$(i))
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-.IF "$(USE_DEBUG_RUNTIME)"!=""
-CDEFS+=-D_DEBUG
-.ENDIF # "$(USE_DEBUG_RUNTIME)"!=""
-
-SLOFILES= \
-            $(SLO)$/servreg.obj		\
-            $(SLO)$/servprov.obj	\
-            $(SLO)$/unoobjw.obj		\
-            $(SLO)$/oleobjw.obj		\
-            $(SLO)$/olethread.obj	\
-            $(SLO)$/oledll.obj		\
-        $(SLO)$/jscriptclasses.obj	\
-        $(SLO)$/ole2uno.obj		\
-        $(SLO)$/windata.obj		\
-        $(SLO)$/unotypewrapper.obj
-
-SECOND_BUILD=OWNGUID
-OWNGUID_SLOFILES=$(SLOFILES)
-OWNGUIDCDEFS+= -DOWNGUID
-
-# the original library
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL1STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL1STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL1LIBS=
-SHL1OBJS=$(SLOFILES)
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE=$(SHL1TARGET).dxp
-
-# the second library
-SHL2TARGET=$(TARGET2)
-SHL2STDLIBS=\
-        $(SALLIB) 	\
-    $(CPPULIB)	\
-    $(CPPUHELPERLIB)	\
-    $(OLE32LIB) 	\
-    $(UUIDLIB) 	\
-    $(ADVAPI32LIB)	\
-    $(OLEAUT32LIB)
-
-.IF "$(COM)"=="MSC"
-.IF "$(USE_DEBUG_RUNTIME)" != ""
-    SHL2STDLIBS+= $(ATL_LIB)$/atlsd.lib
-.ELSE
-    SHL2STDLIBS+= $(ATL_LIB)$/atls.lib
-.ENDIF
-.ENDIF # "$(COM)"=="MSC"
-
-SHL2LIBS=
-SHL2OBJS=$(REAL_OWNGUID_SLOFILES)
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE=$(TARGET).dxp
-
-.ENDIF # "$(GUI)" == "WNT" && "$(DISABLE_ATL)"==""
-
-#----------------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-ALLTAR : $(MISC)/oleautobridge.component
-
-$(MISC)/oleautobridge.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt oleautobridge.component
diff --git a/extensions/source/ole/oleautobridge.uno.dxp b/extensions/source/ole/oleautobridge.uno.dxp
deleted file mode 100644
index 843ff2fc389f..000000000000
--- a/extensions/source/ole/oleautobridge.uno.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory @101
-component_canUnload @103
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 528a66e29337..1b9c02c1bd9f 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -118,7 +118,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     return pRet;
 }
 
-extern "C"  sal_Bool component_canUnload( TimeValue* libUnused)
+extern "C"  sal_Bool SAL_DLLPUBLIC_EXPORT
+component_canUnload( TimeValue* libUnused)
 {
     return globalModuleCount.canUnload( &globalModuleCount, libUnused);
 }