diff options
| -rwxr-xr-x | mysqlc/source/description.xml | 5 | ||||
| -rwxr-xr-x | reportbuilder/util/description.xml | 5 | ||||
| -rwxr-xr-x | sdext/source/minimizer/description.xml | 6 | ||||
| -rwxr-xr-x | sdext/source/pdfimport/config/description.xml | 6 | ||||
| -rwxr-xr-x | sdext/source/presenter/description.xml | 6 | ||||
| -rwxr-xr-x | sdext/source/presenter/makefile.mk | 17 | ||||
| -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 |
9 files changed, 1 insertions, 69 deletions
diff --git a/mysqlc/source/description.xml b/mysqlc/source/description.xml index bc7563d39177..458ee6efb4d1 100755 --- a/mysqlc/source/description.xml +++ b/mysqlc/source/description.xml @@ -5,11 +5,6 @@ <identifier value="UPDATED_IDENTIFIER"/> <version value="#VERSION#" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <display-name> <name lang="en-US">#TITLE#</name> </display-name> diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml index c274526edc06..06c9adc0aa66 100755 --- a/reportbuilder/util/description.xml +++ b/reportbuilder/util/description.xml @@ -6,11 +6,6 @@ <name lang="en-US">Oracle Report Builder</name> <!-- <name lang="en-US">Oracle(TM) Report Builder</name> --> </display-name> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> <version value="#VERSION#"/> <identifier value="com.sun.reportdesigner"/> <dependencies> diff --git a/sdext/source/minimizer/description.xml b/sdext/source/minimizer/description.xml index 64a67a05b343..455c92a8a392 100755 --- a/sdext/source/minimizer/description.xml +++ b/sdext/source/minimizer/description.xml @@ -11,12 +11,6 @@ <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.0.2"/> <platform value="UPDATED_SUPPORTED_PLATFORM"/> diff --git a/sdext/source/pdfimport/config/description.xml b/sdext/source/pdfimport/config/description.xml index b22b81587fc7..0b4031a5a63f 100755 --- a/sdext/source/pdfimport/config/description.xml +++ b/sdext/source/pdfimport/config/description.xml @@ -10,12 +10,6 @@ <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.0.3" /> <platform value="UPDATED_SUPPORTED_PLATFORM" /> diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml index ede52f0bf1bb..cbe292c04152 100755 --- a/sdext/source/presenter/description.xml +++ b/sdext/source/presenter/description.xml @@ -11,12 +11,6 @@ <OpenOffice.org-minimal-version value="3.2" dep:name="OpenOffice.org 3.2"/> </dependencies> - <registration> - <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > - <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> - </simple-license> - </registration> - <version value="1.1.0" /> <platform value="UPDATED_PLATFORM" /> diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk index 08a3470fc24d..17bc1ed2cf59 100755 --- a/sdext/source/presenter/makefile.mk +++ b/sdext/source/presenter/makefile.mk @@ -115,12 +115,6 @@ ZIP1LIST= * DESCRIPTION:=$(ZIP1DIR)$/description.xml -.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i) -.ELSE -PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i) -.ENDIF - .IF "$(WITH_LANG)"=="" FIND_XCU=registry/data .ELSE # "$(WITH_LANG)"=="" @@ -254,7 +248,6 @@ COMPONENT_HELP= \ # $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp) ZIP1DEPS= \ - $(PACKLICS) \ $(DESCRIPTION) \ $(COMPONENT_MANIFEST) \ $(COMPONENT_FILES) \ @@ -343,16 +336,6 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) .ENDIF -.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 - $(ZIP1DIR)/%.xcu : %.xcu @@-$(MKDIRHIER) $(@:d) 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)" |