GNOME.org
 

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

Author: pmladek
Date: Fri Mar  6 17:38:55 2009
New Revision: 15492
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15492&view=rev

Log:
2009-03-06  Petr Mladek  <pmladek suse cz>

	* dev300/piece-reportbuilder.diff, patches/dev300/apply: updated
	  and enabled for ooo310-m4
	* patches/dev300/apply: disable piece-reportdesign.diff for ooo310-m4
	  and above; seems obsolete



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/piece-reportbuilder.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar  6 17:38:55 2009
@@ -2853,8 +2853,6 @@
 piece-jvmfwk.diff
 piece-forms.diff
 piece-apache-commons.diff
-#piece-reportbuilder.diff
-piece-reportdesign.diff
 piece-vbahelper.diff
 piece-sc.diff
 piece-sw.diff
@@ -2869,6 +2867,13 @@
 # the symlinker system files are read-only otherwise
 piece-desktop-avoid-user-conf-symlinks.diff, pmladek
 
+[ PieceBits >= dev300-m43 >= ooo310-m4 ]
+piece-reportbuilder.diff
+
+[ PieceBits < dev300-m43 < ooo310-m4 ]
+piece-reportdesign.diff
+
+
 [ BFFixes ]
 fit-list-to-size-binfilter.diff, i#94086, thorsten
 

Modified: trunk/patches/dev300/piece-reportbuilder.diff
==============================================================================
--- trunk/patches/dev300/piece-reportbuilder.diff	(original)
+++ trunk/patches/dev300/piece-reportbuilder.diff	Fri Mar  6 17:38:55 2009
@@ -1,28 +1,119 @@
---- reportbuilder/util/makefile.pmk.old	2008-08-12 16:14:14.000000000 +0200
-+++ reportbuilder/util/makefile.pmk	2008-09-25 21:29:37.000000000 +0200
-@@ -29,10 +29,10 @@
- #
- #*************************************************************************
- 
--XSLDIR=$(SOLARXMLDIR)$/processing
--XCSROOT=$(SOLARXMLDIR)
--ABSXCSROOT=$(SOLARXMLDIR)
+diff -purN reportbuilder.old/registry/data/org/openoffice/makefile.mk reportbuilder/registry/data/org/openoffice/makefile.mk
+--- reportbuilder.old/registry/data/org/openoffice/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/data/org/openoffice/makefile.mk	2009-03-03 11:17:28.000000000 +0100
+@@ -49,6 +49,6 @@ XCUFILES= \
+ 
+ ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs"
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+diff -purN reportbuilder.old/registry/data/org/openoffice/Office/makefile.mk reportbuilder/registry/data/org/openoffice/Office/makefile.mk
+--- reportbuilder.old/registry/data/org/openoffice/Office/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/data/org/openoffice/Office/makefile.mk	2009-03-03 11:36:11.000000000 +0100
+@@ -54,18 +54,18 @@ XCUFILES= \
+ 
+ ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs"
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Accelerators.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+diff -purN reportbuilder.old/registry/data/org/openoffice/Office/UI/makefile.mk reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk
+--- reportbuilder.old/registry/data/org/openoffice/Office/UI/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk	2009-03-03 14:41:42.000000000 +0100
+@@ -49,4 +49,8 @@ MODULEFILES=
+ 
+ .INCLUDE : target.mk
+ 
+-   
++ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs"
++
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
++    @@-$(MKDIRHIER) $(@:d)
++    $(COPY) $< $@
+diff -purN reportbuilder.old/registry/data/org/openoffice/TypeDetection/makefile.mk reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
+--- reportbuilder.old/registry/data/org/openoffice/TypeDetection/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk	2009-03-03 11:18:54.000000000 +0100
+@@ -50,10 +50,10 @@ XCUFILES= \
+ 
+ ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs"
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+diff -purN reportbuilder.old/registry/schema/org/openoffice/Office/makefile.mk reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
+--- reportbuilder.old/registry/schema/org/openoffice/Office/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/schema/org/openoffice/Office/makefile.mk	2009-03-03 11:36:44.000000000 +0100
+@@ -45,6 +45,6 @@ XCSFILES= \
+ 
+ ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs"
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+diff -purN reportbuilder.old/registry/schema/org/openoffice/Office/UI/makefile.mk reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
+--- reportbuilder.old/registry/schema/org/openoffice/Office/UI/makefile.mk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk	2009-03-03 14:27:39.000000000 +0100
+@@ -42,21 +42,22 @@ XCSFILES= \
+     ReportCommands.xcs \
+ 	DbReportWindowState.xcs
+ 
++XSLTPROC+= --stringparam root $(SPLITINSTALLDIR)$/..$/share$/registry$/schema
++
+ MODULEFILES=
+ 
+ .INCLUDE : target.mk
+ 
+ ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs"
+ 
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+     
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+     
+-"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs
++"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" : $(SPLITINSTALLDIR)$/..$/share$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs
+     @@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+-
+diff -purN reportbuilder.old/util/makefile.pmk reportbuilder/util/makefile.pmk
+--- reportbuilder.old/util/makefile.pmk	2009-02-20 23:58:23.000000000 +0100
++++ reportbuilder/util/makefile.pmk	2009-03-03 14:42:42.000000000 +0100
+@@ -35,7 +35,7 @@ ABSXCSROOT=$(PWD)$/$(MISC)$/$(EXTNAME)
+ XCSROOT=..
+ # XCSROOT=$(SOLARXMLDIR)
+ # ABSXCSROOT=$(SOLARXMLDIR)
 -DTDDIR=$(SOLARXMLDIR)
-+XCSROOT=$(SPLITINSTALLDIR)$/../share
-+XSLDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)$/processing
-+ABSXCSROOT=$(XCSROOT)
 +DTDDIR=$(SOLARVER)/xml$(EXT_UPDMINOR)
  PROCESSOUT=$(MISC)$/$(EXTNAME)
  PROCESSORDIR=$(SOLARBINDIR)
  
---- reportbuilder/util/makefile.mk.old	2008-08-12 16:14:14.000000000 +0200
-+++ reportbuilder/util/makefile.mk	2008-09-25 21:38:02.000000000 +0200
-@@ -99,7 +99,7 @@ $(EXTENSIONDIR)$/%.jar : $(JFREEREPORT_J
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- .ELSE
--$(EXTENSIONDIR)$/%.jar : $(SOLARBINDIR)$/%.jar
-+$(EXTENSIONDIR)$/%.jar : $(SOLARPIECE)$/$(INPATH)$/bin$/%.jar
- 	@@-$(MKDIRHIER) $(@:d)
-     $(COPY) $< $@
- .ENDIF
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]