incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1309358 - in /incubator/ooo/trunk/main: readlicense_oo/prj/d.lst sdext/source/minimizer/description.xml sdext/source/pdfimport/config/description.xml solenv/inc/extension_post.mk solenv/inc/extension_pre.mk
Date Wed, 04 Apr 2012 12:39:01 GMT
Author: hdu
Date: Wed Apr  4 12:39:01 2012
New Revision: 1309358

URL: http://svn.apache.org/viewvc?rev=1309358&view=rev
Log:
#i119168# use mechanism in extension_pre.mk for more extension licenses

Modified:
    incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
    incubator/ooo/trunk/main/sdext/source/minimizer/description.xml
    incubator/ooo/trunk/main/sdext/source/pdfimport/config/description.xml
    incubator/ooo/trunk/main/solenv/inc/extension_post.mk
    incubator/ooo/trunk/main/solenv/inc/extension_pre.mk

Modified: incubator/ooo/trunk/main/readlicense_oo/prj/d.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/readlicense_oo/prj/d.lst?rev=1309358&r1=1309357&r2=1309358&view=diff
==============================================================================
--- incubator/ooo/trunk/main/readlicense_oo/prj/d.lst (original)
+++ incubator/ooo/trunk/main/readlicense_oo/prj/d.lst Wed Apr  4 12:39:01 2012
@@ -24,5 +24,5 @@ dos: echo ==============================
 ..\%__SRC%\misc\SUM_NOTICE %_DEST%\bin%_EXT%\osl\NOTICE.txt
 ..\%__SRC%\misc\SUM_LICENSE %_DEST%\bin%_EXT%\osl\LICENSE.txt
 
-# alse delivering a pure ALv2 license file
+# also delivering a pure ALv2 license file
 ..\..\LICENSE_ALv2 %_DEST%\bin%_EXT%\osl

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=1309358&r1=1309357&r2=1309358&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sdext/source/minimizer/description.xml (original)
+++ incubator/ooo/trunk/main/sdext/source/minimizer/description.xml Wed Apr  4 12:39:01 2012
@@ -33,7 +33,7 @@
 
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true"
>
-            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 

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=1309358&r1=1309357&r2=1309358&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 12:39:01
2012
@@ -32,7 +32,7 @@
 
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true"
>
-        <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+        <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
         </simple-license>
     </registration>
 

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=1309358&r1=1309357&r2=1309358&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/extension_post.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/extension_post.mk Wed Apr  4 12:39:01 2012
@@ -155,8 +155,7 @@ $(DESCRIPTION) $(PHONYDESC) : $(DESCRIPT
 
 .ENDIF			# "$(DESCRIPTION)"!=""
 
-# default license text for Apache OpenOffice extensions is the Apache Licence 2
-# may not fit...
+# default license text for Apache OpenOffice extensions is ALv2
 .IF "$(CUSTOM_LICENSE)"==""
 PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE_ALv2
 .ELSE			# "$(CUSTOM_LICENSE)" == ""

Modified: incubator/ooo/trunk/main/solenv/inc/extension_pre.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/extension_pre.mk?rev=1309358&r1=1309357&r2=1309358&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/inc/extension_pre.mk (original)
+++ incubator/ooo/trunk/main/solenv/inc/extension_pre.mk Wed Apr  4 12:39:01 2012
@@ -34,13 +34,8 @@ DESCRIPTION_SRC*:=description.xml
 COMPONENT_MANIFEST*:=$(EXTENSIONDIR)/META-INF/manifest.xml
 MANIFEST_SRC*:=manifest.xml
 
-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/license_$i.txt)
-COMPONENT_LIC_TEMPL*:=registration/license_xxx.txt
-.ELSE
-PACKLICS*:=$(foreach,i,$(alllangiso) $(EXTENSIONDIR)/registration/LICENSE_$i)
-COMPONENT_LIC_TEMPL*:=registration/LICENSE_xxx
-.ENDIF
+PACKLICS*:=$(EXTENSIONDIR)/registration/LICENSE
+COMPONENT_LIC_TEMPL*:=registration/LICENSE
 
 #TODO:  check ZIP9TARGET for previous use!
 common_build_zip=



Mime
View raw message