Author: damjan
Date: Tue Dec 6 02:02:36 2016
New Revision: 1772820
URL: http://svn.apache.org/viewvc?rev=1772820&view=rev
Log:
Port main/remotebridges to gbuild.
Patch by: me
Added:
openoffice/trunk/main/remotebridges/Library_uuresolver.mk
openoffice/trunk/main/remotebridges/Makefile (with props)
openoffice/trunk/main/remotebridges/Module_remotebridges.mk
Removed:
openoffice/trunk/main/remotebridges/source/unourl_resolver/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/remotebridges/source/unourl_resolver/unourl_resolver.cxx
openoffice/trunk/main/ure/source/makefile.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1772820&r1=1772819&r2=1772820&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Tue Dec 6 02:02:36 2016
@@ -50,6 +50,7 @@ $(eval $(call gb_Module_add_moduledirs,o
padmin \
package \
reportdesign \
+ remotebridges \
sax \
sd \
sfx2 \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1772820&r1=1772819&r2=1772820&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Tue Dec 6 02:02:36 2016
@@ -172,6 +172,7 @@ $(eval $(call gb_Helper_register_librari
vbaswobj \
msforms \
vclcanvas \
+ uuresolver \
writerfilter_debug \
))
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1772820&r1=1772819&r2=1772820&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Tue Dec 6
02:02:36 2016
@@ -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 \
Added: openoffice/trunk/main/remotebridges/Library_uuresolver.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/remotebridges/Library_uuresolver.mk?rev=1772820&view=auto
==============================================================================
--- openoffice/trunk/main/remotebridges/Library_uuresolver.mk (added)
+++ openoffice/trunk/main/remotebridges/Library_uuresolver.mk Tue Dec 6
02:02:36 2016
@@ -0,0 +1,48 @@
+#**************************************************************
+#
+# 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_Library_Library,uuresolver))
+
+$(eval $(call
gb_Library_set_componentfile,uuresolver,remotebridges/source/unourl_resolver/uuresolver))
+
+$(eval $(call gb_Library_set_include,uuresolver,\
+ $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_api,uuresolver,\
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,uuresolver,\
+ cppuhelper \
+ cppu \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,uuresolver,\
+ remotebridges/source/unourl_resolver/unourl_resolver \
+))
+
+# vim: set noet sw=4 ts=4:
Added: openoffice/trunk/main/remotebridges/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/remotebridges/Makefile?rev=1772820&view=auto
==============================================================================
--- openoffice/trunk/main/remotebridges/Makefile (added)
+++ openoffice/trunk/main/remotebridges/Makefile Tue Dec 6 02:02:36 2016
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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:
Propchange: openoffice/trunk/main/remotebridges/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/remotebridges/Module_remotebridges.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/remotebridges/Module_remotebridges.mk?rev=1772820&view=auto
==============================================================================
--- openoffice/trunk/main/remotebridges/Module_remotebridges.mk (added)
+++ openoffice/trunk/main/remotebridges/Module_remotebridges.mk Tue Dec 6
02:02:36 2016
@@ -0,0 +1,30 @@
+#**************************************************************
+#
+# 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:
Modified:
openoffice/trunk/main/remotebridges/source/unourl_resolver/unourl_resolver.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/remotebridges/source/unourl_resolver/unourl_resolver.cxx?rev=1772820&r1=1772819&r2=1772820&view=diff
==============================================================================
---
openoffice/trunk/main/remotebridges/source/unourl_resolver/unourl_resolver.cxx
(original)
+++
openoffice/trunk/main/remotebridges/source/unourl_resolver/unourl_resolver.cxx
Tue Dec 6 02:02:36 2016
@@ -223,19 +223,19 @@ static struct ImplementationEntry g_entr
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 );
Modified: openoffice/trunk/main/ure/source/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/makefile.mk?rev=1772820&r1=1772819&r2=1772820&view=diff
==============================================================================
--- openoffice/trunk/main/ure/source/makefile.mk (original)
+++ openoffice/trunk/main/ure/source/makefile.mk Tue Dec 6 02:02:36 2016
@@ -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
