diff options
| author | sb <sb@openoffice.org> | 2010-10-21 15:45:06 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-10-21 15:45:06 +0200 |
| commit | 8bba589bec0a3811fc7f1f60985152ec01ccd084 (patch) | |
| tree | 6afec4b8819293669d230a32da40297933b1428f /desktop/test/deployment/passive | |
| parent | 9d792efeb631f24f8864d2f9541afd25422e85c2 (diff) | |
sb131: #i114962# active.oxt to complement passive.oxt
Diffstat (limited to 'desktop/test/deployment/passive')
| -rw-r--r-- | desktop/test/deployment/passive/MANIFEST.MF (renamed from desktop/test/deployment/passive/manifest.mf) | 0 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/makefile.mk | 6 | ||||
| -rw-r--r-- | desktop/test/deployment/passive/manifest.xml | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/desktop/test/deployment/passive/manifest.mf b/desktop/test/deployment/passive/MANIFEST.MF index 45a04bf263dc..45a04bf263dc 100644 --- a/desktop/test/deployment/passive/manifest.mf +++ b/desktop/test/deployment/passive/MANIFEST.MF diff --git a/desktop/test/deployment/passive/makefile.mk b/desktop/test/deployment/passive/makefile.mk index 2d75d1d253d4..0f24faf56554 100644 --- a/desktop/test/deployment/passive/makefile.mk +++ b/desktop/test/deployment/passive/makefile.mk @@ -105,15 +105,15 @@ $(MISC)/$(TARGET)/passive_python.component : \ '$(COMPONENTPREFIX_EXTENSION)passive_python.py' -o $@ \ $(SOLARENV)/bin/createcomponent.xslt passive_python.component -$(MISC)/$(TARGET)/passive_java.jar : manifest.mf $(JAVATARGET) +$(MISC)/$(TARGET)/passive_java.jar : MANIFEST.MF $(JAVATARGET) $(MKDIRHIER) $(@:d) $(RM) $@ $(RM) -r $(MISC)/$(TARGET)/passive_java.jar-zip $(MKDIR) $(MISC)/$(TARGET)/passive_java.jar-zip $(MKDIRHIER) $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF \ $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE) - $(COPY) manifest.mf $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF/ + $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/passive_java.jar-zip/META-INF/ $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \ $(MISC)/$(TARGET)/passive_java.jar-zip/$(PACKAGE)/ cd $(MISC)/$(TARGET)/passive_java.jar-zip && zip ../passive_java.jar \ - META-INF/manifest.mf $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class) + META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class) diff --git a/desktop/test/deployment/passive/manifest.xml b/desktop/test/deployment/passive/manifest.xml index eb7588e15511..c686c6c14e97 100644 --- a/desktop/test/deployment/passive/manifest.xml +++ b/desktop/test/deployment/passive/manifest.xml @@ -34,7 +34,4 @@ <m:file-entry m:media-type="application/vnd.sun.star.uno-components" m:full-path="uno.components"/> -<!-- <m:file-entry - m:media-type="application/vnd.sun.star.uno-component;type=Python" - m:full-path="passive_python.py"/> --> </m:manifest> |