Skip to content

C
core
Kaydet (Commit) fe95c9aa authored tarafından Herbert Dürr's avatar Herbert Dürr
Dosyalara gözat
Seçenekler

#i119168# update granted extensions to match their ALv2 license

üst 272907ca
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 69 deletions
sdext/source/minimizer/description.xml
Dosyayı görüntüle @ fe95c9aa
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
<identifier value="UPDATED_IDENTIFIER"/> <identifier value="UPDATED_IDENTIFIER"/>
<dependencies> <dependencies>
<OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/> <OpenOffice.org-minimal-version value="2.3" dep:name="Apache OpenOffice"/>
</dependencies> </dependencies>
<registration> <registration>
<simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > <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"/> <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
</simple-license> </simple-license>
</registration> </registration>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<platform value="UPDATED_SUPPORTED_PLATFORM"/> <platform value="UPDATED_SUPPORTED_PLATFORM"/>
<publisher> <publisher>
<name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher> </publisher>
<display-name> <display-name>
......
sdext/source/pdfimport/config/description.xml
Dosyayı görüntüle @ fe95c9aa
...@@ -27,12 +27,12 @@ ...@@ -27,12 +27,12 @@
<identifier value="UPDATED_IDENTIFIER" /> <identifier value="UPDATED_IDENTIFIER" />
<dependencies> <dependencies>
<OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/> <OpenOffice.org-minimal-version value="3.0" dep:name="Apache OpenOffice"/>
</dependencies> </dependencies>
<registration> <registration>
<simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > <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"/> <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
</simple-license> </simple-license>
</registration> </registration>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<platform value="UPDATED_SUPPORTED_PLATFORM" /> <platform value="UPDATED_SUPPORTED_PLATFORM" />
<publisher> <publisher>
<name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher> </publisher>
<display-name> <display-name>
......
sdext/source/pdfimport/makefile.mk
Dosyayı görüntüle @ fe95c9aa
...@@ -147,5 +147,6 @@ $(COMPONENT_HELP) : help$/$$(@:f) ...@@ -147,5 +147,6 @@ $(COMPONENT_HELP) : help$/$$(@:f)
$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@
.ENDIF # L10N_framework .ENDIF # L10N_framework
sdext/source/presenter/description.xml
Dosyayı görüntüle @ fe95c9aa
...@@ -28,12 +28,12 @@ ...@@ -28,12 +28,12 @@
<identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" /> <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
<dependencies> <dependencies>
<OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/> <OpenOffice.org-minimal-version value="3.3" dep:name="Apache OpenOffice"/>
</dependencies> </dependencies>
<registration> <registration>
<simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" > <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"/> <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
</simple-license> </simple-license>
</registration> </registration>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<platform value="UPDATED_PLATFORM" /> <platform value="UPDATED_PLATFORM" />
<publisher> <publisher>
<name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher> </publisher>
<display-name> <display-name>
......
sdext/source/presenter/makefile.mk
Dosyayı görüntüle @ fe95c9aa
...@@ -122,11 +122,7 @@ ZIP1LIST= * ...@@ -122,11 +122,7 @@ ZIP1LIST= *
DESCRIPTION:=$(ZIP1DIR)$/description.xml DESCRIPTION:=$(ZIP1DIR)$/description.xml
.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/license_$i)
.ELSE
PACKLICS:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registry$/LICENSE_$i)
.ENDIF
.IF "$(WITH_LANG)"=="" .IF "$(WITH_LANG)"==""
FIND_XCU=registry/data FIND_XCU=registry/data
...@@ -362,16 +358,13 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f) ...@@ -362,16 +358,13 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
.ENDIF .ENDIF
.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT" $(DESCRIPTION) : description.xml
$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@ $(GNUCOPY) $< $@
.ELSE
$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e) $(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@ $(GNUCOPY) $< $@
.ENDIF
$(ZIP1DIR)/%.xcu : %.xcu $(ZIP1DIR)/%.xcu : %.xcu
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
...@@ -381,21 +374,6 @@ $(ZIP1DIR)$/%.xcs : %.xcs ...@@ -381,21 +374,6 @@ $(ZIP1DIR)$/%.xcs : %.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(GNUCOPY) $< $@ $(GNUCOPY) $< $@
# Temporary file that is used to replace some placeholders in description.xml.
DESCRIPTION_TMP:=$(ZIP1DIR)$/description.xml.tmp
.INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
PHONYDESC=.PHONY
.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
@-$(MKDIRHIER) $(@:d)
$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $(DESCRIPTION_TMP)
@echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
$(TYPE) $(DESCRIPTION_TMP) | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
@@-$(RM) $(DESCRIPTION_TMP)
.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO" .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
.ELSE .ELSE
ivo: ivo:
......
solenv/inc/extension_post.mk
Dosyayı görüntüle @ fe95c9aa
...@@ -154,14 +154,11 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC) ...@@ -154,14 +154,11 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPTION_SRC)
@@-$(RM) $@.3.$(EXTNAME) @@-$(RM) $@.3.$(EXTNAME)
.ENDIF # "$(DESCRIPTION)"!="" .ENDIF # "$(DESCRIPTION)"!=""
# default OOo license text!!!
# default license text for Apache OpenOffice extensions is the Apache Licence 2
# may not fit... # may not fit...
.IF "$(CUSTOM_LICENSE)"=="" .IF "$(CUSTOM_LICENSE)"==""
.IF "$(GUI)" == "WNT" PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE_ALv2
PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
.ELSE # "$(GUI)" == "WNT"
PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
.ENDIF # "$(GUI)" == "WNT"
.ELSE # "$(CUSTOM_LICENSE)" == "" .ELSE # "$(CUSTOM_LICENSE)" == ""
PACKLICDEPS=$(CUSTOM_LICENSE) PACKLICDEPS=$(CUSTOM_LICENSE)
.ENDIF # "$(CUSTOM_LICENSE)" == "" .ENDIF # "$(CUSTOM_LICENSE)" == ""
......
swext/mediawiki/src/description.xml
Dosyayı görüntüle @ fe95c9aa
...@@ -27,13 +27,13 @@ ...@@ -27,13 +27,13 @@
</display-name> </display-name>
<registration> <registration>
<simple-license accept-by="admin" default-license-id="lic-en-US"> <simple-license accept-by="admin" default-license-id="lic-en-US">
<license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/> <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
</simple-license> </simple-license>
</registration> </registration>
<dependencies> <dependencies>
<OpenOffice.org-minimal-version value="3.0" d:name="OpenOffice.org 3.0 or StarOffice 9"/> <OpenOffice.org-minimal-version value="3.0" d:name="Apache OpenOffice"/>
</dependencies> </dependencies>
<publisher> <publisher>
<name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name> <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
</publisher> </publisher>
</description> </description>
swext/mediawiki/src/makefile.mk
Dosyayı görüntüle @ fe95c9aa
...@@ -19,8 +19,6 @@ ...@@ -19,8 +19,6 @@
# #
#************************************************************** #**************************************************************
PRJ=..$/.. PRJ=..$/..
PRJNAME=swext PRJNAME=swext
TARGET=mediawiki TARGET=mediawiki
...@@ -33,34 +31,19 @@ ENABLE_EXCEPTIONS=TRUE ...@@ -33,34 +31,19 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk .INCLUDE : settings.mk
DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
PACKLICS:=$(MISC)$/$(TARGET)$/license$/LICENSE
# .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= common_build_zip=
.INCLUDE : target.mk .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: $(PACKLICS) $(DESCRIPTION)
.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk $(DESCRIPTION) : description.xml
.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)" @@-$(MKDIRHIER) $(@:d)
PHONYDESC=.PHONY $(COPY) $< $@
.ENDIF # "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
$(DESCRIPTION) $(PHONYDESC) : $$(@:f) $(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml license/LICENSE_xxx $@ $(COPY) $< $@
@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment