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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Jul 17 14:32:59 2008
New Revision: 13275
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13275&view=rev

Log:
2008-07-17  Petr Mladek  <pmladek suse cz>

	* patches/unittesting/unittesting-forms.diff:
	* patches/unittesting/unittesting-forms-m24.diff:
	* patches/dev300/apply: move the forms\qa target from build.lst
	  to tests.lst; another solution would be to add build dependency
	  on qadevOOo but...



Added:
   trunk/patches/unittesting/unittesting-forms-m24.diff
      - copied unchanged from r13274, /trunk/patches/unittesting/unittesting-forms.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/unittesting/unittesting-forms.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Jul 17 14:32:59 2008
@@ -2120,7 +2120,17 @@
 unittesting-embeddedobj.diff
 unittesting-extensions.diff
 unittesting-filter.diff
+
+[ UnitTesting > dev300-m24 < beb300-m0 ]
+
 unittesting-forms.diff
+
+[ UnitTesting <= dev300-m24 >= beb300-m0 ]
+
+unittesting-forms-m24.diff
+
+[ UnitTesting ]
+
 unittesting-fpicker.diff
 unittesting-framework.diff
 unittesting-chart2.diff

Modified: trunk/patches/unittesting/unittesting-forms.diff
==============================================================================
--- trunk/patches/unittesting/unittesting-forms.diff	(original)
+++ trunk/patches/unittesting/unittesting-forms.diff	Thu Jul 17 14:32:59 2008
@@ -1,6 +1,11 @@
---- forms/prj/tests.lst	1970-01-01 01:00:00.000000000 +0100
-+++ forms/prj/tests.lst	2007-09-07 14:32:14.000000000 +0200
-@@ -0,0 +1,3 @@
-+fm   forms\qa\complex\forms                             nmake - all fm_qa_complex_forms NULL
-+fm   forms\qa\integration\forms                         nmake - all fm_qa_integration_forms NULL
-+#does not build: fm   forms\qa\unoapi                                    nmake - all fm_qa_unoapi NULL
+--- forms/prj/build.lst.old	2008-06-25 16:24:29.000000000 +0200
++++ forms/prj/build.lst	2008-07-17 16:16:11.000000000 +0200
+@@ -14,4 +14,3 @@ fm	forms\source\resource					nmake	-	all
+ fm  forms\source\richtext                   nmake   -   all fm_richtext fm_inc NULL
+ fm  forms\source\runtime                    nmake   -   all frm_runtime NULL
+ fm  forms\util                              nmake   -   all fm_util fm_component fm_solar_component fm_solar_control fm_helper fm_misc fm_resource fm_richtext frm_runtime fm_xforms NULL
+-fm  forms\qa                                nmake   -   all fm_qa NULL
+--- /dev/null	2007-09-21 21:12:45.000000000 +0200
++++ forms/prj/tests.lst	2008-07-17 16:16:00.000000000 +0200
+@@ -0,0 +1 @@
++fm   forms\qa                                           nmake - all fm_qa NULL