sb131: #i114962# test uno-components;platform= feature in passive.oxt (and adapt active.oxt similarly, for consistency)

6 files changed, 41 insertions, 24 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"
diff --git a/desktop/test/deployment/passive/description.xml b/desktop/test/deployment/passive/description.xml
index 26972733fa15..468dfa065fb1 100644
--- a/desktop/test/deployment/passive/description.xml
+++ b/desktop/test/deployment/passive/description.xml
@@ -30,7 +30,6 @@
   <d:identifier
       value="org.openoffice/framework/desktop/test/deployment/passive"/>
   <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/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk
index 0f24faf56554..019e5dcab837 100644
--- a/desktop/test/deployment/passive/makefile.mk
+++ b/desktop/test/deployment/passive/makefile.mk
@@ -35,7 +35,8 @@ PACKAGE = com/sun/star/comp/test/deployment/passive_java
 JAVAFILES = Dispatch.java Provider.java Services.java
 JARFILES = juh.jar ridl.jar unoil.jar
 
-my_components = passive_native passive_java passive_python
+my_platform_components = passive_native
+my_generic_components = passive_java passive_python
 
 .INCLUDE: settings.mk
 
@@ -55,34 +56,50 @@ DEF1NAME = $(SHL1TARGET)
 ALLTAR : $(MISC)/passive.oxt
 
 $(MISC)/passive.oxt : manifest.xml description.xml Addons.xcu \
-        ProtocolHandler.xcu $(MISC)/$(TARGET)/uno.components $(SHL1TARGETN) \
+        ProtocolHandler.xcu $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
         $(MISC)/$(TARGET)/passive_java.jar passive_python.py
     $(RM) $@
     $(RM) -r $(MISC)/$(TARGET)/passive.oxt-zip
     $(MKDIR) $(MISC)/$(TARGET)/passive.oxt-zip
     $(MKDIRHIER) $(MISC)/$(TARGET)/passive.oxt-zip/META-INF
-    $(COPY) manifest.xml $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/
-    $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < description.xml \
-        > $(MISC)/$(TARGET)/passive.oxt-zip/description.xml
-    $(COPY) Addons.xcu ProtocolHandler.xcu $(MISC)/$(TARGET)/uno.components \
-        $(SHL1TARGETN) $(MISC)/$(TARGET)/passive_java.jar passive_python.py \
+    $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \
+        > $(MISC)/$(TARGET)/passive.oxt-zip/META-INF/manifest.xml
+    $(COPY) description.xml Addons.xcu ProtocolHandler.xcu \
+        $(MISC)/$(TARGET)/platform.components \
+        $(MISC)/$(TARGET)/generic.components $(SHL1TARGETN) \
+        $(MISC)/$(TARGET)/passive_java.jar passive_python.py \
         $(MISC)/$(TARGET)/passive.oxt-zip/
     cd $(MISC)/$(TARGET)/passive.oxt-zip && zip ../../passive.oxt \
         META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \
-        uno.components $(SHL1TARGETN:f) passive_java.jar passive_python.py
+        platform.components generic.components $(SHL1TARGETN:f) \
+        passive_java.jar passive_python.py
 
-$(MISC)/$(TARGET)/uno.components : $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/$(TARGET)/uno.components.input \
-        $(my_components:^"$(MISC)/$(TARGET)/":+".component")
+$(MISC)/$(TARGET)/platform.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/platform.components.input \
+        $(my_platform_components:^"$(MISC)/$(TARGET)/":+".component")
     $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
         $(SOLARENV)/bin/packcomponents.xslt \
-        $(MISC)/$(TARGET)/uno.components.input
+        $(MISC)/$(TARGET)/platform.components.input
 
-$(MISC)/$(TARGET)/uno.components.input :
+$(MISC)/$(TARGET)/platform.components.input :
     $(MKDIRHIER) $(@:d)
-    echo \
-        '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
-        > $@
+    echo '<list>' \
+        '$(my_platform_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
+
+$(MISC)/$(TARGET)/generic.components : $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input \
+        $(my_generic_components:^"$(MISC)/$(TARGET)/":+".component")
+    $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/$(TARGET)/ -o $@ \
+        $(SOLARENV)/bin/packcomponents.xslt \
+        $(MISC)/$(TARGET)/generic.components.input
+
+$(MISC)/$(TARGET)/generic.components.input :
+    $(MKDIRHIER) $(@:d)
+    echo '<list>' \
+        '$(my_generic_components:^"<filename>":+".component</filename>")' \
+        '</list>' > $@
 
 $(MISC)/$(TARGET)/passive_native.component : \
         $(SOLARENV)/bin/createcomponent.xslt passive_native.component
diff --git a/desktop/test/deployment/passive/manifest.xml b/desktop/test/deployment/passive/manifest.xml
index c686c6c14e97..5b8ac8419bb9 100644
--- a/desktop/test/deployment/passive/manifest.xml
+++ b/desktop/test/deployment/passive/manifest.xml
@@ -32,6 +32,9 @@
   <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-components;platform=@PLATFORM@"
+      m:full-path="platform.components"/>
+  <m:file-entry
       m:media-type="application/vnd.sun.star.uno-components"
-      m:full-path="uno.components"/>
+      m:full-path="generic.components"/>
 </m:manifest>