diff options
| author | sb <sb@openoffice.org> | 2010-04-23 16:19:36 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-04-23 16:19:36 +0200 |
| commit | 0a877b39fdd26f6fcd5706912569b83daf3fb67d (patch) | |
| tree | 571b0aef40b0494463a0439931d716a4f61cbb87 /desktop/test/deployment | |
| parent | 86f5f0bdb3f3bf45d4a2095bdd81d66123b97f62 (diff) | |
sb122: #i110548# backed out new extension dependency deployment-repositories again (introduced in -c 3b28615890d2); not needed after all
Diffstat (limited to 'desktop/test/deployment')
| -rw-r--r-- | desktop/test/deployment/boxt/description.xml | 1 | ||||
| -rw-r--r-- | desktop/test/deployment/boxt/makefile.mk | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/desktop/test/deployment/boxt/description.xml b/desktop/test/deployment/boxt/description.xml index bb574cb3c022..5a67bf3e949f 100644 --- a/desktop/test/deployment/boxt/description.xml +++ b/desktop/test/deployment/boxt/description.xml @@ -35,6 +35,5 @@ value="@VERSION@"/> <d:OpenOffice.org-maximal-version d:name="OpenOffice.org @VERSION@ or older" d:OpenOffice.org-minimal-version="2.3" value="@VERSION@"/> - @DEPENDENCY@ </d:dependencies> </d:description> diff --git a/desktop/test/deployment/boxt/makefile.mk b/desktop/test/deployment/boxt/makefile.mk index 5dbf6f899b68..63f123fcc608 100644 --- a/desktop/test/deployment/boxt/makefile.mk +++ b/desktop/test/deployment/boxt/makefile.mk @@ -39,13 +39,6 @@ ENABLE_EXCEPTIONS = TRUE # for now (see issue 110653): my_version = 3.3 -.IF "$(OS)" == "LINUX" || "$(OS)" == "MACOSX" || "$(OS)" == "SOLARIS" -my_dependency = <d:deployment-repositories \ - d:name="cannot be deployed to repository 'user'" not-supported="user"/> -.ELSE -my_dependency = -.END - DLLPRE = SLOFILES = $(SHL1OBJS) @@ -70,8 +63,7 @@ $(MISC)/boxt.oxt .ERRREMOVE : manifest.xml description.xml Addons.xcu \ $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' < manifest.xml \ > $(MISC)/$(TARGET).zip/META-INF/manifest.xml $(SED) -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' \ - -e 's|@VERSION@|$(my_version)|g' \ - -e 's|@DEPENDENCY@|$(my_dependency)|g' < description.xml \ + -e 's|@VERSION@|$(my_version)|g' < description.xml \ > $(MISC)/$(TARGET).zip/description.xml $(COPY) Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET).zip cd $(MISC)/$(TARGET).zip && zip ../boxt.oxt META-INF/manifest.xml \ |