ooo-build r15451 - in trunk: . patches/dev300 patches/unittesting

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar  4 00:05:48 2009
New Revision: 15451
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15451&view=rev

Log:
2009-03-03  Kohei Yoshida  <kyoshida novell com>

	* patches/unittesting/unittesting-ucb-m2.diff:
	* patches/unittesting/unittesting-ucb.diff:
	* patches/dev300/apply: adjusted for ooo310-m3.



Added:
   trunk/patches/unittesting/unittesting-ucb-m2.diff
      - copied unchanged from r15445, /trunk/patches/unittesting/unittesting-ucb.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/unittesting/unittesting-ucb.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Mar  4 00:05:48 2009
@@ -2446,6 +2446,11 @@
 unittesting-xmloff.diff
 unittesting-xmlscript.diff
 unittesting-xmlsecurity.diff
+
+[ UnitTesting < dev300-m42 < ooo310-m3 ]
+unittesting-ucb-m2.diff
+
+[ UnitTesting >= dev300-m42 >= ooo310-m3 ]
 unittesting-ucb.diff
 
 [ UnitBootstrap ]

Modified: trunk/patches/unittesting/unittesting-ucb.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-ucb.diff	(original)
+++ trunk/patches/unittesting/unittesting-ucb.diff	Wed Mar  4 00:05:48 2009
@@ -1,13 +1,18 @@
---- ucb/prj/build.lst	2007-06-19 18:10:23.000000000 +0200
-+++ ucb/prj/build.lst	2007-09-07 11:52:29.000000000 +0200
+diff --git ucb/prj/build.lst ucb/prj/build.lst
+index f0eb0da..dd90fe9 100644
+--- ucb/prj/build.lst
++++ ucb/prj/build.lst
 @@ -1,4 +1,4 @@
--uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl NULL
-+uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper vcl tools NULL
+-uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper NULL
++uc ucb : cppuhelper CURL:curl OPENSSL:openssl NEON:neon LIBXML2:libxml2 offapi sal salhelper ucbhelper udkapi comphelper tools NULL
  uc	ucb							usr1	-	all	uc_mkout NULL
  uc	ucb\inc					    nmake	-	all	uc_inc NULL
  uc	ucb\source\regexp		    nmake	-	all	uc_regexp uc_inc NULL
---- ucb/prj/tests.lst	1970-01-01 01:00:00.000000000 +0100
-+++ ucb/prj/tests.lst	2007-09-07 18:02:58.000000000 +0200
+diff --git ucb/prj/tests.lst ucb/prj/tests.lst
+new file mode 100644
+index 0000000..258e434
+--- /dev/null
++++ ucb/prj/tests.lst
 @@ -0,0 +1,9 @@
 +uc   ucb\qa\complex\tdoc\interfaces                     nmake - all uc_qa_complex_tdoc_interfaces NULL
 +#does not build: uc   ucb\qa\complex\tdoc                                nmake - all uc_qa_complex_tdoc NULL
@@ -18,9 +23,11 @@
 +#doest not build: uc   ucb\test\com\sun\star\comp\ucb                     nmake - all uc_test_com_sun_star_comp_ucb NULL
 +uc   ucb\workben\cachemap                               nmake - all uc_workben_cachemap NULL
 +uc   ucb\workben\ucb                                    nmake - all uc_workben_ucb NULL
---- ucb/workben/ucb/makefile.mk	2007-03-09 10:23:41.000000000 +0100
-+++ ucb/workben/ucb/makefile.mk	2007-09-07 12:12:33.000000000 +0200
-@@ -82,7 +82,6 @@ APP1STDLIBS=\
+diff --git ucb/workben/ucb/makefile.mk ucb/workben/ucb/makefile.mk
+index f7d77b1..d3adfbc 100644
+--- ucb/workben/ucb/makefile.mk
++++ ucb/workben/ucb/makefile.mk
+@@ -78,7 +78,6 @@ APP1STDLIBS=\
  	$(CPPUHELPERLIB) \
  	$(COMPHELPERLIB) \
  	$(TOOLSLIB) \