diff options
| author | sb <sb@openoffice.org> | 2010-10-25 16:28:23 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-10-25 16:28:23 +0200 |
| commit | bf0d13c61c57e21589c5589f97ab17a6c151ea03 (patch) | |
| tree | 1e51fde55f298f38888af795b12b179be3c819ed /desktop/test/deployment/active | |
| parent | 1885dddbdd2382f95aef15df15d4cd110f8d7854 (diff) | |
sb131: #i114962# test uno-components;platform= feature in passive.oxt (and adapt active.oxt similarly, for consistency)
Diffstat (limited to 'desktop/test/deployment/active')
| -rw-r--r-- | desktop/test/deployment/active/description.xml | 1 | ||||
| -rw-r--r-- | desktop/test/deployment/active/makefile.mk | 7 | ||||
| -rw-r--r-- | desktop/test/deployment/active/manifest.xml | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/desktop/test/deployment/active/description.xml b/desktop/test/deployment/active/description.xml index f5675533cd05..fd7049e0cc3d 100644 --- a/desktop/test/deployment/active/description.xml +++ b/desktop/test/deployment/active/description.xml @@ -30,7 +30,6 @@ <d:identifier value="org.openoffice/framework/desktop/test/deployment/active"/> <d:version value="1"/> - <d:platform value="@PLATFORM@"/> <d:dependencies> <d:OpenOffice.org-minimal-version d:name="OpenOffice.org 3.4" value="3.4"/> </d:dependencies> diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk index fe31bd66db0e..5511a39c8baf 100644 --- a/desktop/test/deployment/active/makefile.mk +++ b/desktop/test/deployment/active/makefile.mk @@ -59,11 +59,10 @@ $(MISC)/active.oxt : manifest.xml description.xml Addons.xcu \ $(RM) -r $(MISC)/$(TARGET)/active.oxt-zip $(MKDIR) $(MISC)/$(TARGET)/active.oxt-zip $(MKDIRHIER) $(MISC)/$(TARGET)/active.oxt-zip/META-INF - $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' < manifest.xml \ + $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' \ + -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \ > $(MISC)/$(TARGET)/active.oxt-zip/META-INF/manifest.xml - $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < description.xml \ - > $(MISC)/$(TARGET)/active.oxt-zip/description.xml - $(COPY) Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) \ + $(COPY) description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) \ $(MISC)/$(TARGET)/active_java.jar active_python.py \ $(MISC)/$(TARGET)/active.oxt-zip/ cd $(MISC)/$(TARGET)/active.oxt-zip && zip ../../active.oxt \ diff --git a/desktop/test/deployment/active/manifest.xml b/desktop/test/deployment/active/manifest.xml index 1256da145a93..4f076696663b 100644 --- a/desktop/test/deployment/active/manifest.xml +++ b/desktop/test/deployment/active/manifest.xml @@ -32,7 +32,7 @@ <m:file-entry m:media-type="application/vnd.sun.star.configuration-data" m:full-path="ProtocolHandler.xcu"/> <m:file-entry - m:media-type="application/vnd.sun.star.uno-component;type=native" + m:media-type="application/vnd.sun.star.uno-component;type=native;platform=@PLATFORM@" m:full-path="@PATH@"/> <m:file-entry m:media-type="application/vnd.sun.star.uno-component;type=Java" |