Port main/remotebridges to gbuild.

Patch by: me

Module_ooo.mk

@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     padmin \
     package \
     reportdesign \
+    remotebridges \
     sax \
     sd \
     sfx2 \

Repository.mk

@@ -172,6 +172,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     vbaswobj \
     msforms \
     vclcanvas \
+    uuresolver \
     writerfilter_debug \
 ))
 

postprocess/packcomponents/makefile.mk

@@ -46,7 +46,6 @@ my_components = \
     proxyfac \
     reflection \
     stocservices \
-    uuresolver \
     abp \
     analysis \
     avmedia \
@@ -93,6 +92,7 @@ my_components = \
     component/reportdesign/util/rpt \
     component/reportdesign/util/rptui \
     component/vbahelper/util/msforms \
+    component/remotebridges/source/unourl_resolver/uuresolver \
     component/sax/source/expatwrap/expwrap \
     component/sax/source/fastparser/fastsax \
     component/sd/util/sd \

remotebridges/source/unourl_resolver/makefile.mk → remotebridges/Library_uuresolver.mk

@@ -20,49 +20,29 @@
 #**************************************************************
 
 
-PRJ=..$/..
 
-PRJNAME=remotebridges
-TARGET = uuresolver.uno
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST = uuresolver
+$(eval $(call gb_Library_Library,uuresolver))
 
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
 
-.INCLUDE :  settings.mk
-.IF "$(L10N_framework)"==""
-DLLPRE =
+$(eval $(call gb_Library_set_include,uuresolver,\
+        $$(INCLUDE) \
+))
 
-# ------------------------------------------------------------------
+$(eval $(call gb_Library_add_api,uuresolver,\
+	udkapi \
+))
 
-SLOFILES= \
-        $(SLO)$/unourl_resolver.obj
+$(eval $(call gb_Library_add_linked_libs,uuresolver,\
+	cppuhelper \
+	cppu \
+	sal \
+	$(gb_STDLIBS) \
+))
 
-SHL1TARGET=	$(TARGET)
-SHL1VERSIONMAP = $(SOLARENV)/src/unloadablecomponent.map
 
-SHL1STDLIBS= \
-        $(SALLIB)		\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)
+$(eval $(call gb_Library_add_exception_objects,uuresolver,\
+	remotebridges/source/unourl_resolver/unourl_resolver \
+))
 
-SHL1DEPN=
-SHL1IMPLIB=	i$(TARGET)
-SHL1LIBS=	$(SLB)$/$(TARGET).lib
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=  URELIB
-
-DEF1NAME=	$(SHL1TARGET)
-.ENDIF 		# L10N_framework
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-ALLTAR : $(MISC)/uuresolver.component
-
-$(MISC)/uuresolver.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        uuresolver.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_URE_NATIVE)$(SHL1TARGETN:f)' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt uuresolver.component
+# vim: set noet sw=4 ts=4:

remotebridges/Makefile

+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:

remotebridges/Module_remotebridges.mk

+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,remotebridges))
+
+$(eval $(call gb_Module_add_targets,remotebridges,\
+	Library_uuresolver \
+))
+
+# vim: set noet sw=4 ts=4:

remotebridges/source/unourl_resolver/unourl_resolver.cxx

@@ -223,19 +223,19 @@ static struct ImplementationEntry g_entries[] =
 
 extern "C"
 {
-sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
 {
     return g_moduleCount.canUnload( &g_moduleCount , pTime );
 }
 
 //==================================================================================================
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
     const sal_Char ** ppEnvTypeName, uno_Environment ** )
 {
     *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
 }
 //==================================================================================================
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );

ure/source/makefile.mk

@@ -47,7 +47,7 @@ my_components = \
     component/io/source/stm/streams \
     component/io/source/TextInputStream/textinstream \
     component/io/source/TextOutputStream/textoutstream \
-    uuresolver
+    component/remotebridges/unourl_resolver/uuresolver
 
 .INCLUDE: settings.mk
 .INCLUDE: target.mk