ooo-build r12895 - in trunk: . patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r12895 - in trunk: . patches/dev300
Date: Mon, 16 Jun 2008 15:09:45 +0000 (UTC)
Author: rengelhard
Date: Mon Jun 16 15:09:45 2008
New Revision: 12895
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12895&view=rev

Log:
2008-06-16  Rene Engelhard  <rene debian org>

        * patches/dev300/apply,
          patches/dev300/solenv-no-extension-license.diff,
          patches/dev300/reportdesigner-no-license.diff,
          patches/dev300/presentation-minimizer-no-license.diff,
          patches/dev300/pdfimport-no-license.diff: update for m19, add new
          patch for solenv. re-enable presenterscreen-no-license.diff which
          does not need a change (yet)


Added:
   trunk/patches/dev300/solenv-no-extension-license.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/presentation-minimizer-no-license.diff
   trunk/patches/dev300/reportdesigner-no-license.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jun 16 15:09:45 2008
@@ -357,10 +357,11 @@
 redirect-extensions.diff
 
 # no bogus license question when registering these extensions
-#FIXME dev300-m19: reportdesigner-no-license.diff
-#FIXME dev300-m19: presentation-minimizer-no-license.diff
-#FIXME dev300-m19: pdfimport-no-license.diff
-#FIXME dev300-m19: presenterscreen-no-license.diff
+solenv-no-extension-license.diff
+reportdesigner-no-license.diff
+presentation-minimizer-no-license.diff
+pdfimport-no-license.diff
+presenterscreen-no-license.diff
 
 # ensure macros are imported ( not as comments ) for calc
 vba-default-enable-calcmacros.diff

Modified: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-no-license.diff	(original)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Mon Jun 16 15:09:45 2008
@@ -1,42 +1,3 @@
-Index: source/pdfimport/makefile.mk
-===================================================================
-RCS file: /cvs/framework/filter/source/pdfimport/makefile.mk,v
-retrieving revision 1.1.4.2
-diff -u -u -r1.1.4.2 makefile.mk
---- filter/source/pdfimport/makefile.mk	23 Jan 2008 15:16:32 -0000	1.1.4.2
-+++ filter/source/pdfimport/makefile.mk	5 Apr 2008 14:26:25 -0000
-@@ -87,12 +87,6 @@
- 
- DESCRIPTION:=$(MISC)$/pdfimport$/description.xml
- 
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/pdfimport$/registration$/license_$i.txt)
--.ELSE
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/pdfimport$/registration$/LICENSE_$i)
--.ENDIF
--
- CONVERTER_FILE= \
-     $(MISC)$/pdfimport$/xpdfimport$(EXECPOST) \
- 
-@@ -115,7 +109,7 @@
- COMPONENT_LIBRARY= \
-     $(MISC)$/pdfimport$/$(SHL1TARGET)$(DLLPOST)
- 
--ZIP1DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(CONVERTER_FILE) $(COMPONENT_LIBRARY) $(COMPONENT_DIALOGS) makefile.mk
-+ZIP1DEPS=		$(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(CONVERTER_FILE) $(COMPONENT_LIBRARY) $(COMPONENT_DIALOGS) makefile.mk
- ZIP1TARGET=		pdfimport
- ZIP1DIR=		$(MISC)$/pdfimport
- ZIP1EXT=		.oxt
-@@ -176,9 +176,6 @@
-     .ENDIF
- .ENDIF         # "$(PACKMS)"!=""
- .ENDIF 
--$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
--	@@-$(MKDIRHIER) $(@:d)
--	$(GNUCOPY) $< $@
- 
- $(MISC)$/pdfimport$/%.xcu : config$/%.xcu
- 	@@-$(MKDIRHIER) $(@:d)
 Index: source/pdfimport/config/description.xml
 ===================================================================
 RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v

Modified: trunk/patches/dev300/presentation-minimizer-no-license.diff
==============================================================================
--- trunk/patches/dev300/presentation-minimizer-no-license.diff	(original)
+++ trunk/patches/dev300/presentation-minimizer-no-license.diff	Mon Jun 16 15:09:45 2008
@@ -15,49 +15,3 @@
 -        </simple-license>
 -    </registration>
  </description>
-Index: source/minimizer/makefile.mk
-===================================================================
-RCS file: /cvs/graphics/sdext/source/minimizer/makefile.mk,v
-retrieving revision 1.6
-diff -u -u -r1.6 makefile.mk
---- sdext/source/minimizer/makefile.mk	1 Nov 2007 14:10:57 -0000	1.6
-+++ sdext/source/minimizer/makefile.mk	16 Nov 2007 15:00:27 -0000
-@@ -48,12 +48,6 @@
- 
- DESCRIPTION:=$(MISC)$/SunPresentationMinimizer$/description.xml
- 
--.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/SunPresentationMinimizer$/registry$/license_$i)
--.ELSE
--PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/SunPresentationMinimizer$/registry$/LICENSE_$i)
--.ENDIF
--
- DLLPRE=
- common_build_zip=
- 
-@@ -117,7 +111,7 @@
- COMPONENT_LIBRARY= \
-     $(MISC)$/SunPresentationMinimizer$/SunPresentationMinimizer.uno$(DLLPOST)
- 
--ZIP1DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(COMPONENT_BITMAPS) $(COMPONENT_HELP) $(COMPONENT_LIBRARY) $(COMPONENT_MERGED_XCU)
-+ZIP1DEPS=		$(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(COMPONENT_BITMAPS) $(COMPONENT_HELP) $(COMPONENT_LIBRARY) $(COMPONENT_MERGED_XCU)
- ZIP1TARGET=		sun-presentation-minimizer
- ZIP1DIR=		$(MISC)$/SunPresentationMinimizer
- ZIP1EXT=		.oxt
-@@ -144,16 +138,6 @@
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- 
--.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
--
- $(MISC)$/SunPresentationMinimizer$/registry$/data$/%.xcu : $(MISC)$/$(EXTNAME)$/merge$/%.xcu
- 	@@-$(MKDIRHIER) $(@:d)
- 	$(GNUCOPY) $< $@

Modified: trunk/patches/dev300/reportdesigner-no-license.diff
==============================================================================
--- trunk/patches/dev300/reportdesigner-no-license.diff	(original)
+++ trunk/patches/dev300/reportdesigner-no-license.diff	Mon Jun 16 15:09:45 2008
@@ -1,75 +1,19 @@
-Index: util/makefile.mk
+Index: util/description.xml
 ===================================================================
-RCS file: /cvs/dba/reportdesign/util/makefile.mk,v
-retrieving revision 1.3.4.1.4.4
-diff -u -u -r1.3.4.1.4.4 makefile.mk
---- reportdesign/util/makefile.mk	27 Aug 2007 08:18:57 -0000	1.3.4.1.4.4
-+++ reportdesign/util/makefile.mk	30 Aug 2007 14:55:14 -0000
-@@ -225,14 +225,6 @@
-                        $(ZIP1DIR)$/readme_en-US.html \
-                        $(ZIP1DIR)$/readme_en-US.txt
-
--.IF "$(GUI)"!="WNT"
--TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/LICENSE_$i)
--LICLINES:=$(foreach,i,$(TXTFILES)  <license-text xlink:href="registration/$(i:f)" lang="$(subst,LICENSE_, $(i:f))" license-id="$(subst,LICENSE_, $(i:f))" />)
--.ELSE   # "$(GUI)"!="WNT"
--TXTFILES:=$(foreach,i,$(alllangiso) $(ZIP1DIR)$/registration$/license_$i.txt)
--LICLINES:=$(foreach,i,$(TXTFILES)  <license-text xlink:href="registration/$(i:f)" lang="$(subst,.txt, $(subst,license_, $(i:f)))" license-id="$(subst,.txt, $(subst,license_, $(i:f)))" />)
--.ENDIF  # "$(GUI)"!="WNT"
--
- REPORTJARFILES := \
-        $(ZIP1DIR)$/flute-1.3-jfree-20061107.jar                                                        \
-        $(ZIP1DIR)$/jcommon-1.0.10.jar                                                                          \
-@@ -251,7 +243,7 @@
- .INCLUDE : target.mk
- 
- .IF "$(ZIP1TARGETN)"!=""
--$(ZIP1TARGETN) :  $(TXTFILES) $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES)
-+$(ZIP1TARGETN) :  $(XMLFILES) $(HTMLFILES) $(REPORTJARFILES)
- .ENDIF          # "$(ZIP1TARGETN)"!="
- 
- $(MISC)$/update_report.flag : $(XCU_FILES)
-@@ -261,17 +253,8 @@
- 	@@-$(MKDIRHIER) $(@:d)
- 	@@-$(RM) $(ZIP1DIR)$/description.xml
- 	$(TYPE) pre.xml > $@
--	$(TYPE) $(mktmp  $(LICLINES)) >> $@
- 	$(TYPE) post.xml >> $@
- 
--$(ZIP1DIR)$/registration$/license_%.txt : $(SOLARBINDIR)$/osl$/license_%.txt
--     @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--
--$(ZIP1DIR)$/registration$/LICENSE_% : $(SOLARBINDIR)$/osl$/LICENSE_%
--     @@-$(MKDIRHIER) $(@:d)
--    $(COPY) $< $@
--
- $(ZIP1DIR)$/%.xml : %.xml
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
-Index: util/post.xml
-===================================================================
-RCS file: /cvs/dba/reportdesign/util/post.xml,v
-retrieving revision 1.2
-diff -u -u -r1.2 post.xml
---- reportdesign/util/post.xml	2 Aug 2007 14:43:01 -0000	1.2
-+++ reportdesign/util/post.xml	30 Aug 2007 14:55:14 -0000
-@@ -1,5 +1,3 @@
--    </simple-license>
--  </registration>
-   <version value="1.0.4"/>
-   <identifier value="com.sun.reportdesigner"/>
-   <dependencies>
-Index: util/pre.xml
-===================================================================
-RCS file: /cvs/dba/reportdesign/util/pre.xml,v
-retrieving revision 1.2.4.1.4.1
-diff -u -u -r1.2.4.1.4.1 pre.xml
---- reportdesign/util/pre.xml	27 Aug 2007 05:33:34 -0000	1.2.4.1.4.1
-+++ reportdesign/util/pre.xml	30 Aug 2007 14:55:14 -0000
-@@ -2,5 +2,3 @@
+RCS file: /cvs/dba/reportdesign/util/description.xml,v
+retrieving revision 1.4
+diff -u -u -r1.4 description.xml
+--- reportdesign/util/description.xml	6 Jun 2008 08:04:51 -0000	1.4
++++ reportdesign/util/description.xml	16 Jun 2008 15:02:24 -0000
+@@ -2,11 +2,6 @@
  <description xmlns="http://openoffice.org/extensions/description/2006";
      xmlns:d="http://openoffice.org/extensions/description/2006"; 
      xmlns:xlink="http://www.w3.org/1999/xlink";>
 -  <registration>
 -    <simple-license accept-by="admin" default-license-id="en-US" >
+-            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+-    </simple-license>
+-  </registration>
+   <version value="1.0.4"/>
+   <identifier value="com.sun.reportdesigner"/>
+   <dependencies>

Added: trunk/patches/dev300/solenv-no-extension-license.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/solenv-no-extension-license.diff	Mon Jun 16 15:09:45 2008
@@ -0,0 +1,55 @@
+Index: extension_post.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/extension_post.mk,v
+retrieving revision 1.2
+diff -u -u -r1.2 extension_post.mk
+--- solenv/inc/extension_post.mk	6 Jun 2008 08:10:54 -0000	1.2
++++ solenv/inc/extension_post.mk	16 Jun 2008 15:01:36 -0000
+@@ -119,21 +119,6 @@
+ 	$(TYPE) $(MISC)$/desc.tmp.$(EXTNAME) | sed s/UPDATED_SUPPORTED_PLATFORM/$(PLATFORMID)/ > $@
+ 	@@-$(RM) $(MISC)$/desc.tmp.$(EXTNAME)
+ 
+-# default OOo license text!!!
+-# 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"
+-.ELSE			# "$(CUSTOM_LICENSE)" == ""
+-PACKLICDEPS=$(CUSTOM_LICENSE)
+-.ENDIF			# "$(CUSTOM_LICENSE)" == ""
+-$(PACKLICS) : $(PACKLICDEPS)
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-
+ #$(COMPONENT_MANIFEST) : $$(@:f)
+ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
+ 	@@-$(MKDIRHIER) $(@:d)
+Index: extension_pre.mk
+===================================================================
+RCS file: /cvs/tools/solenv/inc/extension_pre.mk,v
+retrieving revision 1.2
+diff -u -u -r1.2 extension_pre.mk
+--- solenv/inc/extension_pre.mk	6 Jun 2008 08:11:07 -0000	1.2
++++ solenv/inc/extension_pre.mk	16 Jun 2008 15:01:36 -0000
+@@ -37,17 +37,9 @@
+ 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
+-
+ #TODO:  check ZIP9TARGET for previous use!
+ common_build_zip=
+-MANIFEST_DEPS=	$(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
++MANIFEST_DEPS=	$(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
+ ZIP9DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_FILES) $(COMPONENT_LIBRARIES) $(COMPONENT_MANIFEST) $(COMPONENT_JARFILES) $(COMPONENT_MERGED_XCU) $(EXTENSION_PACKDEPS)
+ ZIP9TARGET=		$(EXTENSION_ZIPNAME)
+ ZIP9DIR=		$(EXTENSIONDIR)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]