Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/2838 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/38/2838/1 odk: do not pack unused component.map file Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf --- M odk/CustomTarget_settings.mk M odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile M odk/examples/DevelopersGuide/Components/CppComponent/Makefile M odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile M odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile M odk/examples/cpp/complextoolbarcontrols/Makefile D solenv/bin/addsym.awk D solenv/src/component.map D solenv/src/reg-component.map D solenv/src/solaris_noexstk.map D solenv/src/unloadablecomponent.map 12 files changed, 0 insertions(+), 212 deletions(-) diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk index dfe44df..fb798b0 100644 --- a/odk/CustomTarget_settings.mk +++ b/odk/CustomTarget_settings.mk @@ -32,17 +32,4 @@ tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \ -e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' > $@ -ifneq ($(OS),WNT) -odkcommon_ZIPLIST += settings/component.uno.map -$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,component.uno.map)) -$(odk_WORKDIR)/settings/component.uno.map: $(SRCDIR)/solenv/bin/addsym.awk $(SRCDIR)/solenv/src/component.map - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GEN,1) - tr -d "\015" < $(SRCDIR)/solenv/src/component.map | \ - $(if $(filter MACOSX,$(OS)),\ - tail -n +3 | head -3 | sed -e 's/.*component/_component/g' \ - -e 's/;[ ]*//',\ - awk -f $<) > $@ - chmod 664 $@ -endif - # vim: set noet sw=4 ts=4: diff --git a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile index a6bc683..a65f6f6 100644 --- a/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile +++ b/odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile @@ -50,7 +50,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag @@ -71,13 +70,6 @@ -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif - ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -87,7 +79,6 @@ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else -#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ diff --git a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile index 84195a8..34b6834 100644 --- a/odk/examples/DevelopersGuide/Components/CppComponent/Makefile +++ b/odk/examples/DevelopersGuide/Components/CppComponent/Makefile @@ -59,7 +59,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(SAMPLE_GEN_OUT)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(SAMPLE_GEN_OUT)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(SAMPLE_GEN_OUT)/$(COMP_NAME).components COMP_REGISTERFLAG = $(SAMPLE_GEN_OUT)/devguide_$(COMP_NAME)_register_component.flag @@ -104,13 +103,6 @@ -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(SAMPLE_INC_OUT) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif - ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -120,7 +112,6 @@ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else -#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile index 7f77f1f..af9e58b 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/Makefile @@ -51,7 +51,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_MISC)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_MISC)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_MISC)/$(COMP_NAME).components COMP_REGISTERFLAG = $(OUT_COMP_MISC)/devguide_$(COMP_NAME)_register_component.flag @@ -78,13 +77,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) $(STL_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< - -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile index d9f70b2..c63e960 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile @@ -53,7 +53,6 @@ COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map REGISTERFLAG = $(OUT_MISC)/devguide_$(COMP_NAME)_register_component.flag @@ -72,13 +71,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< - -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile index 1a96808..f3e7801 100644 --- a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile +++ b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile @@ -50,7 +50,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -#COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components COMP_REGISTERFLAG = $(OUT_MISC)/devguide_$(COMP_NAME)_register_component.flag @@ -69,13 +68,6 @@ $(OUT_COMP_SLO)/%.$(OBJ_EXT) : %.cxx $(SDKTYPEFLAG) -$(MKDIR) $(subst /,$(PS),$(@D)) $(CC) $(CC_FLAGS) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< - -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile index 76658e2..d10acd5 100644 --- a/odk/examples/cpp/complextoolbarcontrols/Makefile +++ b/odk/examples/cpp/complextoolbarcontrols/Makefile @@ -50,7 +50,6 @@ COMP_PACKAGE = $(OUT_BIN)/$(COMP_NAME).$(UNOOXT_EXT) COMP_PACKAGE_URL = $(subst \\,\,"$(COMP_PACKAGE_DIR)$(PS)$(COMP_NAME).$(UNOOXT_EXT)") COMP_UNOPKG_MANIFEST = $(OUT_COMP_GEN)/$(COMP_NAME)/META-INF/manifest.xml -COMP_MAPFILE = $(OUT_COMP_GEN)/$(COMP_NAME).uno.map COMP_COMPONENTS = $(OUT_COMP_GEN)/$(COMP_NAME).components COMP_REGISTERFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_register_component.flag COMP_TYPEFLAG = $(OUT_MISC)/cpp_$(COMP_NAME)_types.flag @@ -79,13 +78,6 @@ $(CC) $(CC_FLAGS) $(STL_INCLUDES) $(CC_INCLUDES) -I$(OUT_COMP_INC) $(CC_DEFINES) $(CC_OUTPUT_SWITCH)$(subst /,$(PS),$@) $< -#$(COMP_MAPFILE) : $(SLOFILES) -# -$(MKDIR) $(subst /,$(PS),$(@D)) -# cat $(PRJ)/settings/component.uno.map > $(COMP_MAPFILE) -#ifeq "$(OS)" "MACOSX" -# nm -gx $(SLOFILES) | $(ADDSYMBOLS) >> $(COMP_MAPFILE) -#endif - ifeq "$(OS)" "WIN" $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) @@ -95,7 +87,6 @@ $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) msvcprt.lib msvcrt.lib kernel32.lib $(LINK_MANIFEST) else -#$(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) $(COMP_MAPFILE) $(SHAREDLIB_OUT)/%.$(SHAREDLIB_EXT) : $(SLOFILES) -$(MKDIR) $(subst /,$(PS),$(@D)) $(LINK) $(COMP_LINK_FLAGS) $(LINK_LIBS) -o $@ $(SLOFILES) \ diff --git a/solenv/bin/addsym.awk b/solenv/bin/addsym.awk deleted file mode 100644 index 181a077..0000000 --- a/solenv/bin/addsym.awk +++ /dev/null @@ -1,56 +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. -# -#************************************************************************* - -# Add certain symbol patterns to the first global section. -# -# The below code fails with 'perverted' mapfiles (using a strange line layout, -# or containing version UDK_3_0_0 without a global section, ...). - -BEGIN { state = 0 } -END { - if (state == 0) { - print "# Weak RTTI symbols for C++ exceptions:" - print "UDK_3_0_0 {" - print "global:" - print "_ZTI*; _ZTS*;" - print "};" - } - print "# Unique libstdc++ symbols:" - print "GLIBCXX_3.4 {" - print "global:" - print "_ZGVNSt7num_put*; _ZNSt7num_put*;" - print "_ZNSs4_Rep20_S_empty_rep_storageE*;" - print "};" -} -state == 2 { - print "_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions" - state = 3 -} -# #i66636# - ??? -/^[\t ]*UDK_3_0_0[\t ]*\{/ { state = 1 } -/^[\t ]*global[\t ]*:/ && state == 1 { state = 2 } -{ print } diff --git a/solenv/src/component.map b/solenv/src/component.map deleted file mode 100644 index db10831..0000000 --- a/solenv/src/component.map +++ /dev/null @@ -1,23 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# -UDK_3_0_0 { - global: - component_getFactory; - local: - *; -}; diff --git a/solenv/src/reg-component.map b/solenv/src/reg-component.map deleted file mode 100644 index a071966..0000000 --- a/solenv/src/reg-component.map +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# -UDK_3_0_0 { - global: - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/solenv/src/solaris_noexstk.map b/solenv/src/solaris_noexstk.map deleted file mode 100644 index 27fdb9c..0000000 --- a/solenv/src/solaris_noexstk.map +++ /dev/null @@ -1,21 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# -# mapfile for non-executable stack -# see @ /usr/lib/ld/map.noexstk -# -stack = STACK ?RW; diff --git a/solenv/src/unloadablecomponent.map b/solenv/src/unloadablecomponent.map deleted file mode 100644 index 5ea17d0..0000000 --- a/solenv/src/unloadablecomponent.map +++ /dev/null @@ -1,24 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# -UDK_3_0_0 { - global: - component_getFactory; - component_canUnload; - local: - *; -}; -- To view, visit https://gerrit.libreoffice.org/2838 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I768acf83234eec46c0271dad2e5bef3bd3cba3cf Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Matúš Kukan <matus.ku...@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice