Module_ooo.mk | 1 Repository.mk | 2 codemaker/GoogleTest_cppumaker.mk | 2 postprocess/packcomponents/makefile.mk | 3 - scaddins/AllLangResTarget_analysis.mk | 44 ++++++++++++++++++++ scaddins/AllLangResTarget_date.mk | 42 +++++++++++++++++++ scaddins/Library_analysis.mk | 70 +++++++++++++++++++++++++++++++++ scaddins/Library_date.mk | 64 ++++++++++++++++++++++++++++++ scaddins/Makefile | 32 +++++++++++++++ scaddins/Module_scaddins.mk | 34 ++++++++++++++++ scaddins/prj/build.lst | 4 - scaddins/prj/d.lst | 11 ----- scaddins/prj/makefile.mk | 44 ++++++++++++++++++++ scaddins/source/analysis/analysis.cxx | 4 - scaddins/source/datefunc/datefunc.cxx | 4 - solenv/gbuild/Executable.mk | 2 solenv/gbuild/GoogleTest.mk | 2 solenv/gbuild/Library.mk | 4 + solenv/gbuild/LinkTarget.mk | 29 +++++++------ solenv/gbuild/StaticLibrary.mk | 2 solenv/gbuild/TargetLocations.mk | 1 21 files changed, 363 insertions(+), 38 deletions(-)
New commits: commit a7cfad66a718993e3a94bfacc0a4ce7ad08f9aa5 Author: Damjan Jovanovic <dam...@apache.org> AuthorDate: Mon Sep 3 06:12:40 2018 +0000 Commit: Damjan Jovanovic <dam...@apache.org> CommitDate: Mon Sep 3 06:12:40 2018 +0000 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 diff --git a/Module_ooo.mk b/Module_ooo.mk index ca7635d58893..d2b40d35658e 100644 --- a/Module_ooo.mk +++ b/Module_ooo.mk @@ -76,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ sane \ sax \ sc \ + scaddins \ sccomp \ sd \ sfx2 \ diff --git a/Repository.mk b/Repository.mk index 4d9dcf8489e6..c5318b09b54b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ adabas \ adabasui \ agg \ + analysis \ animcore \ avmedia \ avmediagst \ @@ -86,6 +87,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ cppcanvas \ ctl \ cui \ + date \ dba \ dbaxml \ dbmm \ diff --git a/codemaker/GoogleTest_cppumaker.mk b/codemaker/GoogleTest_cppumaker.mk index 3765ad4c7362..e61ab79f9123 100644 --- a/codemaker/GoogleTest_cppumaker.mk +++ b/codemaker/GoogleTest_cppumaker.mk @@ -32,7 +32,7 @@ $(eval $(call gb_GoogleTest_set_include,cppumaker_test,\ -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 \ )) diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 4c0044c95c58..5b9efd1c7484 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -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 \ diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk new file mode 100644 index 000000000000..1e1e220b9f9e --- /dev/null +++ b/scaddins/AllLangResTarget_analysis.mk @@ -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 \ +)) diff --git a/scaddins/AllLangResTarget_date.mk b/scaddins/AllLangResTarget_date.mk new file mode 100644 index 000000000000..cfae1cf5b157 --- /dev/null +++ b/scaddins/AllLangResTarget_date.mk @@ -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 \ +)) diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk new file mode 100644 index 000000000000..bbc74095e115 --- /dev/null +++ b/scaddins/Library_analysis.mk @@ -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: + diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk new file mode 100644 index 000000000000..d564aa93e948 --- /dev/null +++ b/scaddins/Library_date.mk @@ -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: + diff --git a/scaddins/Makefile b/scaddins/Makefile new file mode 100644 index 000000000000..c1d144cbd4c9 --- /dev/null +++ b/scaddins/Makefile @@ -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: diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk new file mode 100644 index 000000000000..7a892aa6e40d --- /dev/null +++ b/scaddins/Module_scaddins.mk @@ -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: diff --git a/scaddins/prj/build.lst b/scaddins/prj/build.lst index c3b483cf462c..070349dfa6b4 100644 --- a/scaddins/prj/build.lst +++ b/scaddins/prj/build.lst @@ -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 diff --git a/scaddins/prj/d.lst b/scaddins/prj/d.lst index c1463ef39cbc..e69de29bb2d1 100644 --- a/scaddins/prj/d.lst +++ b/scaddins/prj/d.lst @@ -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 diff --git a/scaddins/prj/makefile.mk b/scaddins/prj/makefile.mk new file mode 100644 index 000000000000..c62c6a657d16 --- /dev/null +++ b/scaddins/prj/makefile.mk @@ -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 diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 0300583446ff..d87ccd29d422 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -51,12 +51,12 @@ using namespace ::com::sun::star; 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; diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index dbdd693d1c6b..6f6be3336b05 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -234,13 +234,13 @@ uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance( 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; diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index e4bc18411d1d..4b1a34946d84 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -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 diff --git a/solenv/gbuild/GoogleTest.mk b/solenv/gbuild/GoogleTest.mk index c93c311c57e4..36815b5401a1 100644 --- a/solenv/gbuild/GoogleTest.mk +++ b/solenv/gbuild/GoogleTest.mk @@ -69,7 +69,7 @@ $$(eval $$(call gb_Module_register_target,$(call gb_GoogleTest_get_target,$(1)), 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 diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index f10dc030a284..3e04d9038135 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -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))\ )) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 1d2f8af12e86..d71b4881e9ad 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -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 diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index c0aa7b180f05..d6e5dfc1778f 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -71,7 +71,7 @@ $(call gb_Deliver_add_deliverable,$(call gb_StaticLibrary_get_target,$(1)),$(cal 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 diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 8c7677d7e8a4..bbe471feb963 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -74,6 +74,7 @@ gb_UnoApiOutTarget_get_target = $(OUTDIR)/bin/$(1).rdb 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) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits