diff options
| author | Rene Engelhard <rene@debian.org> | 2010-09-15 14:06:36 +0200 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2010-09-15 14:06:36 +0200 |
| commit | 92d67985baf4d6f834190f2ed8d8c09bf56a8a57 (patch) | |
| tree | 4fc55af9189b39250552c676c0cb0b8d0c5b86b3 /swext | |
| parent | 4ce7dc44f25400b35e1c4f397d18d16bf628fc55 (diff) | |
remove useless license prompt for extensions
Diffstat (limited to 'swext')
| -rw-r--r-- | swext/mediawiki/build.xml | 2 | ||||
| -rw-r--r-- | swext/mediawiki/src/description.xml | 5 | ||||
| -rw-r--r-- | swext/mediawiki/src/makefile.mk | 18 |
3 files changed, 1 insertions, 24 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index ff96fe578ca6..5e65177ad976 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -148,7 +148,6 @@ <zipfileset dir="${solar.bin}/xslt/export/xsltml" casesensitive="yes" prefix="filter/math"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> - <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/> </zip> </target> @@ -171,7 +170,6 @@ <zipfileset dir="${out}/misc/${target}/help" includes="**/*.xhp,component.txt" casesensitive="yes" prefix="help"/> <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/> <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/> - <zipfileset dir="${out}/misc/${target}/license" includes="LICENSE*" casesensitive="yes" prefix="license"/> <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/> </zip> </target> diff --git a/swext/mediawiki/src/description.xml b/swext/mediawiki/src/description.xml index 369efc141274..7f533d97d320 100644 --- a/swext/mediawiki/src/description.xml +++ b/swext/mediawiki/src/description.xml @@ -5,11 +5,6 @@ <display-name> <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name> </display-name> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US"> - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <dependencies> <OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/> </dependencies> diff --git a/swext/mediawiki/src/makefile.mk b/swext/mediawiki/src/makefile.mk index ab656fe01733..8d920ab20976 100644 --- a/swext/mediawiki/src/makefile.mk +++ b/swext/mediawiki/src/makefile.mk @@ -38,27 +38,11 @@ ENABLE_EXCEPTIONS=TRUE DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml -# .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -# PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/license_$i) -# .ELSE -PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/LICENSE_$i) -# .ENDIF - common_build_zip= .INCLUDE : target.mk -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ELSE -$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) - @@-$(MKDIRHIER) $(@:d) - $(GNUCOPY) $< $@ -.ENDIF - -ALLTAR: $(PACKLICS) $(DESCRIPTION) +ALLTAR: $(DESCRIPTION) .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" |