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

[brosenk svn gnome org]

Author: brosenk
Date: Mon Jul  7 20:17:15 2008
New Revision: 13107
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13107&view=rev

Log:
m22-ify unittesting-testtools


Added:
   trunk/patches/unittesting/unittesting-testtools-m21.diff
      - copied unchanged from r13104, /trunk/patches/unittesting/unittesting-testtools.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/unittesting/unittesting-testtools.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul  7 20:17:15 2008
@@ -2047,7 +2047,14 @@
 unittesting-svx.diff
 unittesting-sw.diff
 unittesting-testshl2.diff
+
+[ UnitTesting <= dev300-m21 ]
+unittesting-testtools-m21.diff
+
+[ UnitTesting >= dev300-m22 ]
 unittesting-testtools.diff
+
+[ UnitTesting ]
 unittesting-toolkit.diff
 unittesting-tools.diff
 unittesting-ucbhelper.diff

Modified: trunk/patches/unittesting/unittesting-testtools.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-testtools.diff	(original)
+++ trunk/patches/unittesting/unittesting-testtools.diff	Mon Jul  7 20:17:15 2008
@@ -1,12 +1,12 @@
---- testtools/prj/tests.lst	1970-01-01 01:00:00.000000000 +0100
-+++ testtools/prj/tests.lst	2007-09-07 14:32:15.000000000 +0200
-@@ -0,0 +1 @@
-+tt   testtools\qa\cli                                   nmake - all tt_qa_cli NULL
---- testtools/prj/build.lst	2007-09-07 21:19:43.000000000 +0200
-+++ testtools/prj/build.lst	2007-09-07 22:01:23.000000000 +0200
+--- ./testtools/prj/build.lst.testtools~	2008-06-25 13:49:38.000000000 +0200
++++ ./testtools/prj/build.lst	2008-07-07 22:12:50.947846872 +0200
 @@ -1,4 +1,4 @@
--tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure NULL
-+tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure QADEVOOO:qadevOOo NULL
+-tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi NULL
++tt testtools : cpputools io remotebridges stoc javaunohelper pyuno cli_ure offapi QADEVOOO:qadevOOo NULL
  tt testtools\inc nmake - all tt_inc NULL
  tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_javaTestObjs tt_inc NULL
  tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
+--- ./testtools/prj/tests.lst.testtools~	2008-07-07 22:11:28.989095131 +0200
++++ ./testtools/prj/tests.lst	2008-07-07 22:11:28.989095131 +0200
+@@ -0,0 +1 @@
++tt   testtools\qa\cli                                   nmake - all tt_qa_cli NULL