Author: damjan
Date: Mon Sep 3 06:12:40 2018
New Revision: 1839908
URL: http://svn.apache.org/viewvc?rev=1839908&view=rev
Log:
Allow specifying the .rdb file, and which UNO types to generate headers
from, in the gbuild *_set_private_api function. Fix codemaker's
makefile to use this.
Port main/scaddins to gbuild.
Patch by: me
Added:
openoffice/trunk/main/scaddins/AllLangResTarget_analysis.mk
openoffice/trunk/main/scaddins/AllLangResTarget_date.mk
openoffice/trunk/main/scaddins/Library_analysis.mk
openoffice/trunk/main/scaddins/Library_date.mk
openoffice/trunk/main/scaddins/Makefile (with props)
openoffice/trunk/main/scaddins/Module_scaddins.mk
openoffice/trunk/main/scaddins/prj/makefile.mk
Modified:
openoffice/trunk/main/Module_ooo.mk
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/scaddins/prj/build.lst
openoffice/trunk/main/scaddins/prj/d.lst
openoffice/trunk/main/scaddins/source/analysis/analysis.cxx
openoffice/trunk/main/scaddins/source/datefunc/datefunc.cxx
openoffice/trunk/main/solenv/gbuild/Executable.mk
openoffice/trunk/main/solenv/gbuild/GoogleTest.mk
openoffice/trunk/main/solenv/gbuild/Library.mk
openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk
openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
Modified: openoffice/trunk/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Mon Sep 3 06:12:40 2018
@@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,o
sane \
sax \
sc \
+ scaddins \
sccomp \
sd \
sfx2 \
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Mon Sep 3 06:12:40 2018
@@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_librari
adabas \
adabasui \
agg \
+ analysis \
animcore \
avmedia \
avmediagst \
@@ -86,6 +87,7 @@ $(eval $(call gb_Helper_register_librari
cppcanvas \
ctl \
cui \
+ date \
dba \
dbaxml \
dbmm \
Modified: openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk (original)
+++ openoffice/trunk/main/codemaker/GoogleTest_cppumaker.mk Mon Sep 3 06:12:40
2018
@@ -32,7 +32,7 @@ $(eval $(call gb_GoogleTest_set_include,
-I$(SRCDIR)/codemaker/inc/pch \
))
-$(eval $(call gb_GoogleTest_set_private_api,cppumaker_test,\
+$(eval $(call
gb_GoogleTest_set_private_api,cppumaker_test,$(OUTDIR)/bin/udkapi.rdb,\
$(SRCDIR)/codemaker/test/cppumaker/types.idl \
))
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Mon Sep 3
06:12:40 2018
@@ -46,7 +46,6 @@ my_components = \
reflection \
stocservices \
abp \
- analysis \
basprov \
bib \
calc \
@@ -104,6 +103,8 @@ my_components = \
component/sc/util/sc \
component/sc/util/scd \
component/sc/util/vbaobj \
+ component/scaddins/source/analysis/analysis \
+ component/scaddins/source/datefunc/date \
component/sd/util/sd \
component/sd/util/sdd \
component/sfx2/util/sfx \
Added: openoffice/trunk/main/scaddins/AllLangResTarget_analysis.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/AllLangResTarget_analysis.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/AllLangResTarget_analysis.mk (added)
+++ openoffice/trunk/main/scaddins/AllLangResTarget_analysis.mk Mon Sep 3
06:12:40 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,analysis))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,analysis,scaddins))
+
+$(eval $(call gb_AllLangResTarget_add_srs,analysis,\
+ analysis/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,analysis/res))
+
+$(eval $(call gb_SrsTarget_set_include,analysis/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/scaddins/source/analysis \
+))
+
+$(eval $(call gb_SrsTarget_add_files,analysis/res,\
+ scaddins/source/analysis/analysis.src \
+ scaddins/source/analysis/analysis_deffuncnames.src \
+ scaddins/source/analysis/analysis_funcnames.src \
+))
Added: openoffice/trunk/main/scaddins/AllLangResTarget_date.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/AllLangResTarget_date.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/AllLangResTarget_date.mk (added)
+++ openoffice/trunk/main/scaddins/AllLangResTarget_date.mk Mon Sep 3 06:12:40
2018
@@ -0,0 +1,42 @@
+#**************************************************************
+#
+# 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_AllLangResTarget_AllLangResTarget,date))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,date,scaddins))
+
+$(eval $(call gb_AllLangResTarget_add_srs,date,\
+ date/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,date/res))
+
+$(eval $(call gb_SrsTarget_set_include,date/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/scaddins/source/datefunc \
+))
+
+$(eval $(call gb_SrsTarget_add_files,date/res,\
+ scaddins/source/datefunc/datefunc.src \
+))
Added: openoffice/trunk/main/scaddins/Library_analysis.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/Library_analysis.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/Library_analysis.mk (added)
+++ openoffice/trunk/main/scaddins/Library_analysis.mk Mon Sep 3 06:12:40 2018
@@ -0,0 +1,70 @@
+#**************************************************************
+#
+# 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,analysis))
+
+$(eval $(call
gb_Library_set_componentfile,analysis,scaddins/source/analysis/analysis))
+
+$(eval $(call gb_Library_set_private_api,analysis,$(OUTDIR)/bin/types.rdb,\
+ $(SRCDIR)/scaddins/source/analysis/analysisadd.idl,\
+ com.sun.star.sheet.addin.XAnalysis \
+ com.sun.star.lang.XComponent \
+ com.sun.star.lang.XMultiServiceFactory \
+ com.sun.star.lang.XSingleComponentFactory \
+ com.sun.star.lang.XSingleServiceFactory \
+ com.sun.star.uno.TypeClass \
+ com.sun.star.uno.XInterface \
+ com.sun.star.registry.XImplementationRegistration \
+ com.sun.star.sheet.LocalizedName \
+ com.sun.star.sheet.XAddIn \
+ com.sun.star.sheet.XCompatibilityNames \
+ com.sun.star.lang.XServiceName \
+ com.sun.star.lang.XServiceInfo \
+ com.sun.star.lang.XTypeProvider \
+ com.sun.star.uno.XWeak \
+ com.sun.star.uno.XAggregation \
+ com.sun.star.uno.XComponentContext \
+ com.sun.star.util.Date \
+ com.sun.star.util.XNumberFormatter \
+ com.sun.star.util.XNumberFormatTypes \
+ com.sun.star.sheet.NoConvergenceException \
+))
+
+$(eval $(call gb_Library_add_linked_libs,analysis,\
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,analysis,\
+ scaddins/source/analysis/analysis \
+ scaddins/source/analysis/financial \
+ scaddins/source/analysis/analysishelper \
+ scaddins/source/analysis/bessel \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/scaddins/Library_date.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/Library_date.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/Library_date.mk (added)
+++ openoffice/trunk/main/scaddins/Library_date.mk Mon Sep 3 06:12:40 2018
@@ -0,0 +1,64 @@
+#**************************************************************
+#
+# 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,date))
+
+$(eval $(call gb_Library_set_componentfile,date,scaddins/source/datefunc/date))
+
+$(eval $(call gb_Library_set_private_api,date,$(OUTDIR)/bin/types.rdb,\
+ $(SRCDIR)/scaddins/source/datefunc/dateadd.idl,\
+ com.sun.star.sheet.addin.XDateFunctions \
+ com.sun.star.sheet.addin.XMiscFunctions \
+ com.sun.star.lang.XComponent \
+ com.sun.star.lang.XMultiServiceFactory \
+ com.sun.star.lang.XSingleComponentFactory \
+ com.sun.star.lang.XSingleServiceFactory \
+ com.sun.star.uno.TypeClass \
+ com.sun.star.uno.XInterface \
+ com.sun.star.registry.XImplementationRegistration \
+ com.sun.star.sheet.XAddIn \
+ com.sun.star.sheet.XCompatibilityNames \
+ com.sun.star.lang.XServiceName \
+ com.sun.star.lang.XServiceInfo \
+ com.sun.star.lang.XTypeProvider \
+ com.sun.star.uno.XWeak \
+ com.sun.star.uno.XAggregation \
+ com.sun.star.uno.XComponentContext \
+ com.sun.star.util.Date \
+))
+
+$(eval $(call gb_Library_add_linked_libs,date,\
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ tl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,date,\
+ scaddins/source/datefunc/datefunc \
+))
+
+# vim: set noet sw=4 ts=4:
+
Added: openoffice/trunk/main/scaddins/Makefile
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/Makefile?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/Makefile (added)
+++ openoffice/trunk/main/scaddins/Makefile Mon Sep 3 06:12:40 2018
@@ -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/scaddins/Makefile
------------------------------------------------------------------------------
svn:eol-style = native
Added: openoffice/trunk/main/scaddins/Module_scaddins.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/Module_scaddins.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/Module_scaddins.mk (added)
+++ openoffice/trunk/main/scaddins/Module_scaddins.mk Mon Sep 3 06:12:40 2018
@@ -0,0 +1,34 @@
+#**************************************************************
+#
+# 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,scaddins))
+
+$(eval $(call gb_Module_add_targets,scaddins,\
+ AllLangResTarget_analysis \
+ AllLangResTarget_date \
+ Library_analysis \
+ Library_date \
+))
+
+
+# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/scaddins/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/prj/build.lst?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/scaddins/prj/build.lst (original)
+++ openoffice/trunk/main/scaddins/prj/build.lst Mon Sep 3 06:12:40 2018
@@ -1,4 +1,2 @@
ca scaddins : LIBXSLT:libxslt L10N:l10n vcl NULL
-ca scaddins
usr1 - all sc_mkout NULL
-ca scaddins\source\datefunc nmake -
all sc_dfunc NULL
-ca scaddins\source\analysis nmake -
all sc_analysis NULL
+ca scaddins\prj
nmake - all sc_prj NULL
Modified: openoffice/trunk/main/scaddins/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/prj/d.lst?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/scaddins/prj/d.lst (original)
+++ openoffice/trunk/main/scaddins/prj/d.lst Mon Sep 3 06:12:40 2018
@@ -1,11 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\misc\analysis.component %_DEST%\xml%_EXT%\analysis.component
-..\%__SRC%\misc\date.component %_DEST%\xml%_EXT%\date.component
Added: openoffice/trunk/main/scaddins/prj/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/prj/makefile.mk?rev=1839908&view=auto
==============================================================================
--- openoffice/trunk/main/scaddins/prj/makefile.mk (added)
+++ openoffice/trunk/main/scaddins/prj/makefile.mk Mon Sep 3 06:12:40 2018
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS)
$(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
Modified: openoffice/trunk/main/scaddins/source/analysis/analysis.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/source/analysis/analysis.cxx?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/scaddins/source/analysis/analysis.cxx (original)
+++ openoffice/trunk/main/scaddins/source/analysis/analysis.cxx Mon Sep 3
06:12:40 2018
@@ -51,12 +51,12 @@ using namespace ::com::s
extern "C" {
-void SAL_CALL component_getImplementationEnvironment( const sal_Char**
ppEnvTypeName, uno_Environment** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvTypeName, uno_Environment** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, void*
pServiceManager, void* /*pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
pImplName, void* pServiceManager, void* /*pRegistryKey*/ )
{
void*
pRet = 0;
Modified: openoffice/trunk/main/scaddins/source/datefunc/datefunc.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scaddins/source/datefunc/datefunc.cxx?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/scaddins/source/datefunc/datefunc.cxx (original)
+++ openoffice/trunk/main/scaddins/source/datefunc/datefunc.cxx Mon Sep 3
06:12:40 2018
@@ -234,13 +234,13 @@ uno::Reference< uno::XInterface > SAL_CA
extern "C" {
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*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*/ )
{
void* pRet = 0;
Modified: openoffice/trunk/main/solenv/gbuild/Executable.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Executable.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Executable.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Executable.mk Mon Sep 3 06:12:40 2018
@@ -60,7 +60,7 @@ endef
define gb_Executable_forward_to_Linktarget
-gb_Executable_$(1) = $$(call
gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3))
+gb_Executable_$(1) = $$(call
gb_LinkTarget_$(1),Executable/$$(1)$$(gb_Executable_EXT),$$(2),$$(3),$$(4))
endef
Modified: openoffice/trunk/main/solenv/gbuild/GoogleTest.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/GoogleTest.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/GoogleTest.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/GoogleTest.mk Mon Sep 3 06:12:40 2018
@@ -69,7 +69,7 @@ $$(eval $$(call gb_Module_register_targe
endef
define gb_GoogleTest__forward_to_Linktarget
-gb_GoogleTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_GoogleTest__get_linktargetname,$$(1)),$$(2),$$(3))
+gb_GoogleTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_GoogleTest__get_linktargetname,$$(1)),$$(2),$$(3),$$(4))
endef
Modified: openoffice/trunk/main/solenv/gbuild/Library.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/Library.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/Library.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/Library.mk Mon Sep 3 06:12:40 2018
@@ -93,7 +93,7 @@ gb_Library__get_layer_componentprefix =
define gb_Library__forward_to_Linktarget
-gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_Library__get_linktargetname,$$(1)),$$(2),$$(3))
+gb_Library_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_Library__get_linktargetname,$$(1)),$$(2),$$(3),$$(4))
endef
@@ -140,6 +140,8 @@ $(eval $(foreach method,\
add_sdi_headers \
add_precompiled_header \
set_versionmap \
+ set_private_api \
+ set_private_extract_of_public_api \
,\
$(call gb_Library__forward_to_Linktarget,$(method))\
))
Modified: openoffice/trunk/main/solenv/gbuild/LinkTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/LinkTarget.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/LinkTarget.mk Mon Sep 3 06:12:40 2018
@@ -542,22 +542,23 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call
gb_UnoPrivateApiTarget_get_target,$(1)/inc)
endif
-$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
+$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2) $(3)
$(call gb_Output_announce,$@,$(true),PVTIDL,2)
-$$(call gb_Helper_abbreviate_dirs,\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/urd) &&
\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/rdb) &&
\
mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) &&
\
$$(gb_UnoApiTarget_IDLCCOMMAND) -I$$(OUTDIR)/idl -O $$(call
gb_UnoPrivateApiTarget_get_target,$(1)/urd) \
- -verbose -cid -we $(2) && \
+ -verbose -cid -we $(3) && \
$$(gb_UnoApiTarget_REGMERGECOMMAND) $$(call
gb_UnoPrivateApiTarget_get_target,$(1)/rdb/registry.rdb) /UCR \
- $(patsubst %.idl,%.urd,$$(call
gb_UnoPrivateApiTarget_get_target,$(1)/urd)/$(notdir $(2))) && \
+ $(patsubst %.idl,%.urd,$$(call
gb_UnoPrivateApiTarget_get_target,$(1)/urd)/$(notdir $(3))) && \
$(gb_UnoApiTarget_CPPUMAKERCOMMAND) \
-O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \
+ $(foreach unotype,$(4),-T$(unotype)) \
-BUCR \
-C \
$$(call
gb_UnoPrivateApiTarget_get_target,$(1)/rdb/registry.rdb) \
- $$(OUTDIR)/bin/udkapi.rdb && \
+ $(2) && \
touch $(call
gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag))
$(call gb_LinkTarget_get_clean_target,$(1)) :
@@ -567,33 +568,33 @@ endef
# FIXME: multiple??
define gb_LinkTarget_set_private_api
-$(foreach api,$(2),$(call gb_LinkTarget_add_private_api,$(1),$(api)))
+$(foreach api,$(3),$(call gb_LinkTarget_add_private_api,$(1),$(2),$(api),$(4)))
endef
define gb_LinkTarget_set_private_extract_of_public_api
$(call gb_LinkTarget_get_external_headers_target,$(1)) :| \
- $(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag)
+ $(call gb_UnoPrivateApiExtractTarget_get_target,$(1)/idl.cppumaker.flag)
$(call gb_LinkTarget_get_headers_target,$(1)) \
-$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call
gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(call
gb_UnoPrivateApiExtractTarget_get_target,$(1)/inc)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call
gb_UnoPrivateApiTarget_get_target,$(1)/inc)
+$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(call
gb_UnoPrivateApiExtractTarget_get_target,$(1)/inc)
endif
-$(call gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
+$(call gb_UnoPrivateApiExtractTarget_get_target,$(1)/idl.cppumaker.flag): $(2)
$(call gb_Output_announce,$@,$(true),PVTUNOTYPES,2)
-$$(call gb_Helper_abbreviate_dirs_native,\
- mkdir -p $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) &&
\
+ mkdir -p $$(call
gb_UnoPrivateApiExtractTarget_get_target,$(1)/inc) && \
$(gb_UnoApiTarget_CPPUMAKERCOMMAND) \
- -O $$(call gb_UnoPrivateApiTarget_get_target,$(1)/inc) \
+ -O $$(call
gb_UnoPrivateApiExtractTarget_get_target,$(1)/inc) \
$(foreach unotype,$(3),-T$(unotype)) \
-BUCR \
-C \
- $$(OUTDIR)/bin/udkapi.rdb && \
- touch $(call
gb_UnoPrivateApiTarget_get_target,$(1)/idl.cppumaker.flag))
+ $(2) && \
+ touch $(call
gb_UnoPrivateApiExtractTarget_get_target,$(1)/idl.cppumaker.flag))
$(call gb_LinkTarget_get_clean_target,$(1)) :
- rm -rf $(call gb_UnoPrivateApiTarget_get_target,$(1))
+ rm -rf $(call gb_UnoPrivateApiExtractTarget_get_target,$(1))
endef
Modified: openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/StaticLibrary.mk Mon Sep 3 06:12:40
2018
@@ -71,7 +71,7 @@ $(call gb_Deliver_add_deliverable,$(call
endef
define gb_StaticLibrary_forward_to_Linktarget
-gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_StaticLibrary__get_linktargetname,$$(1)),$$(2),$$(3))
+gb_StaticLibrary_$(1) = $$(call gb_LinkTarget_$(1),$$(call
gb_StaticLibrary__get_linktargetname,$$(1)),$$(2),$$(3),$$(4))
endef
Modified: openoffice/trunk/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/TargetLocations.mk?rev=1839908&r1=1839907&r2=1839908&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/TargetLocations.mk Mon Sep 3 06:12:40
2018
@@ -74,6 +74,7 @@ gb_UnoApiOutTarget_get_target = $(OUTDIR
gb_UnoApiPartTarget_get_target = $(WORKDIR)/UnoApiPartTarget/$(1)
gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_UnoPrivateApiTarget_get_target = $(WORKDIR)/UnoPrivateApi/$(1)
+gb_UnoPrivateApiExtractTarget_get_target = $(WORKDIR)/UnoPrivateApiExtract/$(1)
gb_Module_get_check_target = $(WORKDIR)/Module/check/$(1)
gb_Module_get_subsequentcheck_target = $(WORKDIR)/Module/subsequentcheck/$(1)
gb_Module_get_target = $(WORKDIR)/Module/$(1)
