CWS-TOOLING: integrate CWS sb93

7 files changed, 12 insertions, 13 deletions

diff --git a/qadevOOo/prj/build.lst b/qadevOOo/prj/build.lst
index 962c98e8808c..73092cae2a5f 100644
--- a/qadevOOo/prj/build.lst
+++ b/qadevOOo/prj/build.lst
@@ -1,4 +1,4 @@
-qa  qadevOOo    :   unoil jut NULL
+qa  qadevOOo    : javaunohelper jurt ridljar unoil NULL
 qa  qadevOOo                                             usr1    -   all qa_mkout NULL
 qa  qadevOOo			                         nmake   -   all qa_runner_ant_build NULL
 qa  qadevOOo\runner			                 nmake   -   all qa_make_package qa_runner_ant_build NULL
diff --git a/qadevOOo/runner/convwatch/makefile.mk b/qadevOOo/runner/convwatch/makefile.mk
index 3c9d24fd7407..61d8dfcaf360 100644
--- a/qadevOOo/runner/convwatch/makefile.mk
+++ b/qadevOOo/runner/convwatch/makefile.mk
@@ -40,7 +40,7 @@ TARGET = runner_convwatch
 
 # --- Files --------------------------------------------------------
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 JAVAFILES = \
  TriState.java \
  IniFile.java \
diff --git a/qadevOOo/runner/helper/makefile.mk b/qadevOOo/runner/helper/makefile.mk
index 82cd7d830476..fda152e4fc08 100644
--- a/qadevOOo/runner/helper/makefile.mk
+++ b/qadevOOo/runner/helper/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.11 $
+# $Revision: 1.11.16.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -41,8 +41,7 @@ TARGET = runner_helper
 
 # --- Files --------------------------------------------------------
 
-JARFILES = ridl.jar jurt.jar juh.jar jut.jar \
-           unoil.jar
+JARFILES = ridl.jar jurt.jar juh.jar unoil.jar
 
 JAVAFILES =	APIDescGetter.java      \
             ConfigurationRead.java  \
diff --git a/qadevOOo/runner/util/compare/makefile.mk b/qadevOOo/runner/util/compare/makefile.mk
index 4b81054b3401..249e654cf460 100644
--- a/qadevOOo/runner/util/compare/makefile.mk
+++ b/qadevOOo/runner/util/compare/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.6 $
+# $Revision: 1.6.16.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -40,7 +40,7 @@ TARGET = runner_util_compare
 
 # --- Files --------------------------------------------------------
 
-JARFILES = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 JAVAFILES =	\
  DocComparatorFactory.java \
  DocComparator.java \
diff --git a/qadevOOo/testdocs/backend/org/openoffice/makefile.mk b/qadevOOo/testdocs/backend/org/openoffice/makefile.mk
index 22a2f957eaa8..9bab8204d1f5 100644
--- a/qadevOOo/testdocs/backend/org/openoffice/makefile.mk
+++ b/qadevOOo/testdocs/backend/org/openoffice/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.16.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -39,7 +39,7 @@ PACKAGE = test
 
 #----- compile .java files -----------------------------------------
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = JavaSystemBackend.java
 JAVACLASSFILES  = $(CLASSDIR)$/$(PACKAGE)$/JavaSystemBackend.class
 
diff --git a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/makefile.mk b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/makefile.mk
index 2e5da9d31a5f..3dbd764e893f 100644
--- a/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/makefile.mk
+++ b/qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.16.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -39,7 +39,7 @@ PACKAGE = com$/sun$/star$/cmp
 
 #----- compile .java files -----------------------------------------
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar
 JAVAFILES       = MyPersistObject.java
 JAVACLASSFILES  = $(CLASSDIR)$/$(PACKAGE)$/MyPersistObject.class
 
diff --git a/qadevOOo/testdocs/qadevlibs/source/test/makefile.mk b/qadevOOo/testdocs/qadevlibs/source/test/makefile.mk
index 1a6283a60873..1cb6bcca4371 100644
--- a/qadevOOo/testdocs/qadevlibs/source/test/makefile.mk
+++ b/qadevOOo/testdocs/qadevlibs/source/test/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.16.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -39,7 +39,7 @@ PACKAGE = test
 
 #----- compile .java files -----------------------------------------
 
-JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar jut.jar java_uno.jar OOoRunner.jar
+JARFILES        = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar
 JAVAFILES       = Job.java
 JAVACLASSFILES  = $(CLASSDIR)$/$(PACKAGE)$/Job.class