diff options
| author | Andras Timar <atimar@suse.com> | 2011-10-20 15:07:50 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-10-20 15:07:50 +0200 |
| commit | bce48fb94b1ff2f87fac7185ff5a9904bcf83484 (patch) | |
| tree | d075b71a675ce9286819318e7518485af845c5e9 /sdext | |
| parent | ada314807900a6b9205bacc1b149ab58720ffa7b (diff) | |
Revert "localize description.xml of presenter-screen extension"
This reverts commit 89f7e17692d019a68d251d39bcc592a4ee8ba0dc.
Diffstat (limited to 'sdext')
| -rw-r--r-- | sdext/source/presenter/description.xml | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | sdext/source/presenter/help/component.txt (renamed from sdext/source/presenter/description.txt) | 0 | ||||
| -rw-r--r-- | sdext/source/presenter/makefile.mk | 18 |
3 files changed, 8 insertions, 12 deletions
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index 14a8a18696b6..bf9ce7260751 100644 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -28,7 +28,7 @@ </icon> <extension-description> - <src xlink:href="description.txt" lang="en-US" /> + <src xlink:href="help/component.txt" lang="en-US" /> </extension-description> </description> diff --git a/sdext/source/presenter/description.txt b/sdext/source/presenter/help/component.txt index 26a10c622fe9..26a10c622fe9 100644..100755 --- a/sdext/source/presenter/description.txt +++ b/sdext/source/presenter/help/component.txt diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index df6c6339e9a1..1afbb1e68093 100644 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -247,12 +247,9 @@ COMPONENT_LIBRARY= \ PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l) COMPONENT_HELP= \ + $(ZIP1DIR)$/help/component.txt \ $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) -COMPONENT_DESCRIPTION= \ - $(foreach,l,$(alllangiso:s/en-US//) $(ZIP1DIR)$/$l-description.txt) \ - $(ZIP1DIR)$/description.txt - ZIP1DEPS= \ $(DESCRIPTION) \ $(COMPONENT_MANIFEST) \ @@ -260,8 +257,7 @@ ZIP1DEPS= \ $(COMPONENT_BITMAPS) \ $(COMPONENT_IMAGES) \ $(COMPONENT_LIBRARY) \ - $(COMPONENT_HELP) \ - $(COMPONENT_DESCRIPTION) + $(COMPONENT_HELP) LINKNAME:=help XHPLINKSRC:=$(ZIP1DIR)/help @@ -288,6 +284,10 @@ $(COMPONENT_MANIFEST) : $$(@:f) @-$(MKDIRHIER) $(@:d) +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@ +$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f) + @@-$(MKDIRHIER) $(@:d) + $(COPY) $< $@ + $(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp @echo creating $@ @-$(MKDIRHIER) $(@:d) @@ -368,11 +368,7 @@ PHONYDESC=.PHONY $(DESCRIPTION) $(PHONYDESC) : $$(@:f) @-$(MKDIRHIER) $(@:d) @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk - $(GNUCOPY) description.txt $(ZIP1DIR)/description.txt - $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all - $(TYPE) $@ | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@.new - mv $@.new $@ - + $(TYPE) description.xml | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@ ALLTAR: $(MISC)/../bin/presenter-screen.oxt # hotfix to missing localizations |