sdext/Module_sdext.mk | 2 - sdext/Zip_minimizer.mk | 35 ----------------------- sdext/Zip_presenter.mk | 34 ---------------------- solenv/inc/extension_helplink.mk | 58 -------------------------------------- swext/Module_swext.mk | 1 swext/Zip_mediawiki_develop.mk | 59 --------------------------------------- 6 files changed, 189 deletions(-)
New commits: commit ec5fb295b0fcbb334707bc6e33c9a77bae34737b Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Aug 31 18:31:24 2012 +0200 The *_develop.zip files appear to be unused Change-Id: I1bb3d359b087421f4acf67955549514fc3c6a236 diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk index 6280984..7bba9d9 100644 --- a/sdext/Module_sdext.mk +++ b/sdext/Module_sdext.mk @@ -33,7 +33,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ Extension_minimizer \ Library_minimizer \ Rdb_minimizer \ - Zip_minimizer \ )) endif @@ -61,7 +60,6 @@ $(eval $(call gb_Module_add_targets,sdext,\ Extension_presenter \ Library_presenter \ Rdb_presenter \ - Zip_presenter \ )) endif diff --git a/sdext/Zip_minimizer.mk b/sdext/Zip_minimizer.mk deleted file mode 100644 index c19446b..0000000 --- a/sdext/Zip_minimizer.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtar...@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Zip_Zip,minimizer/presentation_minimizer_develop,$(SRCDIR)/sdext/source/minimizer/registry/data)) - -$(eval $(call gb_Zip_add_files,minimizer/presentation_minimizer_develop,\ - org/openoffice/Office/Addons.xcu \ - org/openoffice/Office/extension/SunPresentationMinimizer.xcu \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/sdext/Zip_presenter.mk b/sdext/Zip_presenter.mk deleted file mode 100644 index 114095c..0000000 --- a/sdext/Zip_presenter.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtar...@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_Zip_Zip,presenter/presenter-screen_develop,$(SRCDIR)/sdext/source/presenter/help)) - -$(eval $(call gb_Zip_add_files,presenter/presenter-screen_develop,\ - en-US/com.sun.PresenterScreen/presenter.xhp \ -)) - -# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/swext/Module_swext.mk b/swext/Module_swext.mk index 00229f8..f2f6da3 100644 --- a/swext/Module_swext.mk +++ b/swext/Module_swext.mk @@ -33,7 +33,6 @@ ifeq ($(ENABLE_MEDIAWIKI),YES) $(eval $(call gb_Module_add_targets,swext,\ Jar_mediawiki \ Configuration_mediawiki \ - Zip_mediawiki_develop \ Extension_wiki-publisher \ )) endif diff --git a/swext/Zip_mediawiki_develop.mk b/swext/Zip_mediawiki_develop.mk deleted file mode 100644 index f74d885..0000000 --- a/swext/Zip_mediawiki_develop.mk +++ /dev/null @@ -1,59 +0,0 @@ -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# The Initial Developer of the Original Code is -# Peter Foley <pefol...@verizon.net> -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. -# -# Major Contributor(s): -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. -# - -$(eval $(call gb_Zip_Zip,mediawiki_develop,$(WORKDIR)/Zip/mediawiki_develop)) - -$(eval $(call gb_Zip_add_file,mediawiki_develop,Addons.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,OptionsDialog.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,Paths.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,ProtocolHandler.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,Types.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcs,$(SRCDIR)/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(SRCDIR)/swext/mediawiki/src/description.xml)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(SRCDIR)/swext/mediawiki/src/manifest.xml)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,components.rdb,$(SRCDIR)/swext/mediawiki/src/components.rdb)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(SRCDIR)/swext/mediawiki/dialogs/EditSetting.xdl)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(SRCDIR)/swext/mediawiki/dialogs/Settings.xdl)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(SRCDIR)/swext/mediawiki/dialogs/Module1.xba)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,description-en-US.txt,$(SRCDIR)/swext/mediawiki/src/description-en-US.txt)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html)) -$(eval $(call gb_Zip_add_file,mediawiki_develop,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott)) - commit 83c474c6997345d37c9187d6bf63a9f268951332 Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Aug 31 18:29:47 2012 +0200 extension_helplink.mk is no longer used Change-Id: I54e7753f7123ed447253901d2251730371bef7b0 diff --git a/solenv/inc/extension_helplink.mk b/solenv/inc/extension_helplink.mk deleted file mode 100644 index 11b6f1f..0000000 --- a/solenv/inc/extension_helplink.mk +++ /dev/null @@ -1,58 +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. -# -#************************************************************************* - -#aux_alllangiso*:=$(foreach,i,$(alllangiso) $(foreach,j,$(aux_langdirs) $(eq,$i,$j $i $(NULL)))) -aux_alllangiso*:=$(alllangiso) - -######################################################### - - -HELPLINKALLTARGETS=$(foreach,i,$(aux_alllangiso) $(MISC)/$(TARGET)_$(LINKNAME)_$i.done) -HELPLINKALLADDEDDEPS=$(foreach,i,$(aux_alllangiso) $(subst,LANGUAGE,$i $(LINKADDEDDPES))) - -ALLTAR : $(HELPLINKALLTARGETS) - -XSL_DIR*:=$(SOLARBINDIR) -XHPLINKSRC*:=$(XHPDEST) -STY_SWITCH:= -sty $(XSL_DIR)/embed.xsl - -.IF "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" -$(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/{$(aux_alllangiso)}/$i) : $(HELP_OUT)/$(TARGET).done -LINKDEPS+=$(HELP_OUT)/xhp_changed.flag -.ENDIF # "$(XHPFILES)"!="" && "$(HELP_OUT)"!="" - -$(HELPLINKALLTARGETS) : $(foreach,i,$(LINKLINKFILES) $(XHPLINKSRC)/$$(@:b:s/_/./:e:s/.//)/$i) $(subst,LANGUAGE,$$(@:b:s/_/./:e:s/.//) $(LINKDEPS)) - @echo Building help index for $(@:b:s/_/./:e:s/.//) - $(COMMAND_ECHO)$(HELPLINKER) -mod $(LINKNAME) -extlangsrc $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} $(STY_SWITCH) -extlangdest $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} -idxcaption $(XSL_DIR)/idxcaption.xsl -idxcontent $(XSL_DIR)/idxcontent.xsl $(LINKLINKFILES) - $(COMMAND_ECHO)cd $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && zip -u -r $(LINKNAME).jar $(PACKAGE)/* $(CHECKZIPRESULT) -# cleanup index dir - -$(RM) $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))}/$(LINKNAME).idxl/* - $(HELPINDEXER) -lang $(@:b:s/_/./:e:s/.//) -mod $(LINKNAME) -dir $(XHPLINKSRC)/{$(subst,$(TARGET)_$(LINKNAME)_, $(@:b))} && $(TOUCH) $@ - -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content/*.* - -$(RMDIR) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/content - -$(RM) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption/*.* - -$(RMDIR) $(XHPLINKSRC)/$(@:b:s/_/./:e:s/.//)/caption _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits