incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1309347 - in /incubator/ooo/trunk/main: sdext/source/minimizer/ sdext/source/pdfimport/ sdext/source/pdfimport/config/ sdext/source/presenter/ solenv/inc/ swext/mediawiki/src/
Date Wed, 04 Apr 2012 11:55:16 GMT
Author: hdu
Date: Wed Apr  4 11:55:15 2012
New Revision: 1309347

URL: http://svn.apache.org/viewvc?rev=1309347&view=rev
Log:
#i119168# update granted extensions to match their ALv2 license

Modified:
    incubator/ooo/trunk/main/sdext/source/minimizer/description.xml
    incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml
    incubator/ooo/trunk/main/sdext/source/pdfimport/makefile.mk
    incubator/ooo/trunk/main/sdext/source/presenter/description.xml
    incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
    incubator/ooo/trunk/main/solenv/inc/extension_post.mk
    incubator/ooo/trunk/main/swext/mediawiki/src/description.xml
    incubator/ooo/trunk/main/swext/mediawiki/src/makefile.mk

Modified: incubator/ooo/trunk/main/sdext/source/minimizer/description.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/minimizer/description.xml?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/minimizer/description.xml (original)
+++ incubator/ooo/trunk/main/sdext/source/minimizer/description.xml Wed Apr  4 11:55:15 2012
@@ -28,12 +28,12 @@
     <identifier value="UPDATED_IDENTIFIER"/>
 
     <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>
 
     <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"/>
+            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 
@@ -42,7 +42,7 @@
     <platform value="UPDATED_SUPPORTED_PLATFORM"/>
 
     <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>
 
     <display-name>

Modified: incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml (original)
+++ incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml Wed Apr  4 11:55:15
2012
@@ -27,12 +27,12 @@
     <identifier value="UPDATED_IDENTIFIER" />
 
     <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>
 
     <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"/>
+        <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 
@@ -41,7 +41,7 @@
     <platform value="UPDATED_SUPPORTED_PLATFORM" />
 
     <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>
 
     <display-name>

Modified: incubator/ooo/trunk/main/sdext/source/pdfimport/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/pdfimport/makefile.mk?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/pdfimport/makefile.mk (original)
+++ incubator/ooo/trunk/main/sdext/source/pdfimport/makefile.mk Wed Apr  4 11:55:15 2012
@@ -134,18 +134,19 @@ EXTENSION_PACKDEPS=$(CONVERTER_FILE) $(C
 
 $(CONVERTER_FILE) : $(BIN)$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
 
 $(COMPONENT_DIALOGS) : dialogs$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
 
 $(COMPONENT_HELP) : help$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
 
 $(COMPONENT_IMAGES) :  $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
+
 .ENDIF # L10N_framework
 

Modified: incubator/ooo/trunk/main/sdext/source/presenter/description.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/presenter/description.xml?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/presenter/description.xml (original)
+++ incubator/ooo/trunk/main/sdext/source/presenter/description.xml Wed Apr  4 11:55:15 2012
@@ -28,12 +28,12 @@
   <identifier value="com.sun.PresenterScreen-UPDATED_PLATFORM" />
 
   <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>
 
   <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"/>
+      <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
     </simple-license>
   </registration>
 
@@ -42,7 +42,7 @@
   <platform value="UPDATED_PLATFORM" />
 
   <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>
 
   <display-name>

Modified: incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk (original)
+++ incubator/ooo/trunk/main/sdext/source/presenter/makefile.mk Wed Apr  4 11:55:15 2012
@@ -122,11 +122,7 @@ 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
+PACKLICS:=$(ZIP1DIR)$/registry$/LICENSE
 
 .IF "$(WITH_LANG)"==""
 FIND_XCU=registry/data
@@ -292,11 +288,11 @@ $(INCCOM)$/PresenterExtensionIdentifier.
 
 $(COMPONENT_MANIFEST) : $$(@:f)
 	@-$(MKDIRHIER) $(@:d)
-    +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
+	+$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
 
 $(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
 
 $(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
 	@echo creating $@
@@ -310,15 +306,15 @@ $(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
 
 $(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
 	@-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
+	+$(COPY) $< $@
 
 $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+	$(COPY) $< $@
 
 $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
 	@-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
+	+$(COPY) $< $@
 .IF "$(OS)$(CPU)"=="WNTI"
  .IF "$(COM)"=="GCC"
     $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
@@ -362,16 +358,13 @@ $(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:
 .ENDIF
 
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
+$(DESCRIPTION) : description.xml
 	@@-$(MKDIRHIER) $(@:d)
 	$(GNUCOPY) $< $@
-.ELSE
-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+
+$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
 	@@-$(MKDIRHIER) $(@:d)
 	$(GNUCOPY) $< $@
-.ENDIF
-
 
 $(ZIP1DIR)/%.xcu : %.xcu
 	@@-$(MKDIRHIER) $(@:d)
@@ -381,21 +374,6 @@ $(ZIP1DIR)$/%.xcs : %.xcs
 	@@-$(MKDIRHIER) $(@:d)
 	$(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"
 .ELSE
 ivo:

Modified: incubator/ooo/trunk/main/solenv/inc/extension_post.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/extension_post.mk?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/extension_post.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/extension_post.mk Wed Apr  4 11:55:15 2012
@@ -55,13 +55,13 @@ COMPONENT_FILES_SRC*=./
 # here in case of "just copied" .xcu files
 $(COMPONENT_FILES) : $$(@:s|$(fixme2)|$(MISC)|:s|$(EXTENSIONDIR)/|$(COMPONENT_FILES_SRC)|)
 	@@-$(MKDIRHIER) $(@:s|$(fixme2)|$(MISC)|:d)
-    $(COMMAND_ECHO)$(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
+	$(COMMAND_ECHO)$(COPY) $< $(@:s|$(fixme2)|$(MISC)|)
 .ENDIF			# "$(COMPONENT_FILES)"!=""
 
 .IF "$(COMPONENT_JARFILES)"!=""
 $(COMPONENT_JARFILES) : $(CLASSDIR)/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
+	$(COMMAND_ECHO)$(COPY) $< $@
 .ENDIF			# "$(COMPONENT_JARFILES)"!=""
 
 .IF "$(COMPONENT_LIBRARIES)"!=""
@@ -69,7 +69,7 @@ PACK_RUNTIME!:=TRUE
 # TODO(Q3): strip the binary?
 $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
 	@@-$(MKDIRHIER) $(@:d)
-    $(COMMAND_ECHO)$(COPY) $< $@
+	$(COMMAND_ECHO)$(COPY) $< $@
 .ENDIF			# "$(COMPONENT_LIBRARIES)"!=""
 
 .IF "$(PACK_RUNTIME)"!=""
@@ -154,14 +154,11 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPT
 	@@-$(RM) $@.3.$(EXTNAME)
 
 .ENDIF			# "$(DESCRIPTION)"!=""
-# default OOo license text!!!
+
+# default license text for Apache OpenOffice extensions is the Apache Licence 2
 # may not fit...
 .IF "$(CUSTOM_LICENSE)"==""
-.IF "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-.ELSE			# "$(GUI)" == "WNT"
-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-.ENDIF			# "$(GUI)" == "WNT"
+PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE_ALv2
 .ELSE			# "$(CUSTOM_LICENSE)" == ""
 PACKLICDEPS=$(CUSTOM_LICENSE)
 .ENDIF			# "$(CUSTOM_LICENSE)" == ""

Modified: incubator/ooo/trunk/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/swext/mediawiki/src/description.xml?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/swext/mediawiki/src/description.xml (original)
+++ incubator/ooo/trunk/main/swext/mediawiki/src/description.xml Wed Apr  4 11:55:15 2012
@@ -27,13 +27,13 @@
     </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"/>
+            <license-text xlink:href="license/LICENSE" 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"/>
+        <OpenOffice.org-minimal-version value="3.0" d:name="Apache OpenOffice"/>
     </dependencies>
     <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>
 </description>

Modified: incubator/ooo/trunk/main/swext/mediawiki/src/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/swext/mediawiki/src/makefile.mk?rev=1309347&r1=1309346&r2=1309347&view=diff
==============================================================================
--- incubator/ooo/trunk/main/swext/mediawiki/src/makefile.mk (original)
+++ incubator/ooo/trunk/main/swext/mediawiki/src/makefile.mk Wed Apr  4 11:55:15 2012
@@ -19,8 +19,6 @@
 #  
 #**************************************************************
 
-
-
 PRJ=..$/..
 PRJNAME=swext
 TARGET=mediawiki
@@ -33,34 +31,19 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE : settings.mk
 
 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
+PACKLICS:=$(MISC)$/$(TARGET)$/license$/LICENSE
 
 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)
 
-.INCLUDE .IGNORE : $(MISC)$/$(TARGET)_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 license/LICENSE_xxx $@
-	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+$(DESCRIPTION) : description.xml
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+ 
+$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE_ALv2
+    @@-$(MKDIRHIER) $(@:d)
+    $(COPY) $< $@
+ 



Mime
View raw message