summaryrefslogtreecommitdiff
path: root/odk/examples/cpp/complextoolbarcontrols/Makefile
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-07-24 16:35:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-07-24 16:36:55 +0200
commit189bb791d248273758bd2b42e0ec216937fa22d9 (patch)
treec5919fdc786c1dee4e822e64c1341cbe8303704a /odk/examples/cpp/complextoolbarcontrols/Makefile
parent7137605eefb6b4efe80c89c4468e33591b1e474f (diff)
fdo#66691: Revert fix for i#121577 Allow setting toolbar name in Addons.xcu
...which incompatibly changed Addons.xcs and breaks extensions (and LibreLogo, which adds to Addons.xcu even though it is not an extension). See the mail thread starting at <http://lists.freedesktop.org/archives/libreoffice/2013-July/054612.html> "[Libreoffice-commits] core.git: #i121577# Allow setting toolbar name in Addons.xcu" for details. This reverts commit 85f072ef33ef47b5e3e0bcd51acb5c4179cde2c2 "Resolves: #i121577# Allow setting toolbar name in Addons.xcu" plus follow-up af572d9fbb744c9691abe465815d7927a9d11510 "Related: #i121577# Allow setting toolbar name in Addons.xcu," f13f9b5cc5267a7a5606b1a89db91b6d7aef5f9c "various .xcus are gone now," and 37d9921797a3ad3be8257fbfee11326549fcd987 "odk/examples/python/toolpanel/CalcWindowState.xcu is still in use," plus those parts of f97ca6f65182efc6542c53ac5e973b3ff398a5d1 "Resolves: #i116455# Make toolbar style settings persistent" that apparently belong to the fix for i#121577 rather than i#116455. Change-Id: Ib744566f3d8da7d9008d7dad8bec60f1bf32e743
Diffstat (limited to 'odk/examples/cpp/complextoolbarcontrols/Makefile')
-rw-r--r--odk/examples/cpp/complextoolbarcontrols/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/Makefile b/odk/examples/cpp/complextoolbarcontrols/Makefile
index 0cc9f516d57c..a8f1a18386e1 100644
--- a/odk/examples/cpp/complextoolbarcontrols/Makefile
+++ b/odk/examples/cpp/complextoolbarcontrols/Makefile
@@ -104,6 +104,10 @@ $(OUT_COMP_GEN)/%/manifest.xml :
@echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
@echo $(SQM) $(SQM)manifest:full-path="$(QM)Addons.xcu$(QM)"/$(CSEP) >> $@
@echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
+ @echo $(SQM) $(SQM)manifest:full-path="$(QM)WriterWindowState.xcu$(QM)"/$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:meda-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
+ @echo $(SQM) $(SQM)manifest:full-path="$(QM)CalcWindowState.xcu$(QM)"/$(CSEP) >> $@
+ @echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.configuration-data$(QM)" >> $@
@echo $(SQM) $(SQM)manifest:full-path="$(QM)ProtocolHandler.xcu$(QM)"/$(CSEP) >> $@
@echo $(SQM) $(SQM)$(OSEP)manifest:file-entry manifest:media-type="$(QM)application/vnd.sun.star.uno-components;platform=$(UNOPKG_PLATFORM)$(QM)">> $@
@echo $(SQM) $(SQM)manifest:full-path="$(QM)$(COMP_NAME).components$(QM)"/$(CSEP)>> $@
@@ -127,13 +131,13 @@ $(COMP_COMPONENTS) :
@echo $(OSEP)/components$(CSEP) >> $@
# rule for component package file
-$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
+$(COMP_PACKAGE) : $(SHAREDLIB_OUT)/$(COMP_IMPL_NAME) Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu $(COMP_UNOPKG_MANIFEST) $(COMP_COMPONENTS)
-$(MKDIR) $(subst /,$(PS),$(@D)) && $(DEL) $(subst \\,\,$(subst /,$(PS),$@))
-$(MKDIR) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
$(COPY) $(subst /,$(PS),$<) $(subst /,$(PS),$(OUT_COMP_GEN)/$(UNOPKG_PLATFORM))
cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(COMP_NAME).components
cd $(subst /,$(PS),$(OUT_COMP_GEN)) && $(SDK_ZIP) -u ../../bin/$(@F) $(UNOPKG_PLATFORM)/$(<F)
- $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu logo_small.png logo_big.png
+ $(SDK_ZIP) -u $@ Addons.xcu ProtocolHandler.xcu WriterWindowState.xcu CalcWindowState.xcu logo_small.png logo_big.png
cd $(subst /,$(PS),$(OUT_COMP_GEN)/$(subst .$(UNOOXT_EXT),,$(@F))) && $(SDK_ZIP) -u ../../../bin/$(@F) META-INF/manifest.xml
$(COMP_REGISTERFLAG) : $(COMP_PACKAGE)