#i103496#: fixes for pch

testshl2/prj/build.lst

@@ -3,7 +3,7 @@ t2  testshl2                           usr1    -   all t2_mkout NULL
 t2  testshl2\inc                       nmake   -   all t2_inc NULL
 t2  testshl2\source\cppunit\win32      nmake   -   all t2_src_cppunit_win32 t2_inc NULL
 t2  testshl2\source\cppunit            nmake   -   all t2_src_cppunit t2_src_cppunit_win32 t2_inc NULL
-t2  testshl2\source\cppunit\result     nmake   -   all t2_src_cppunit_rsult t2_inc NULL
-t2  testshl2\source                    nmake   -   all t2_src t2_inc NULL
+t2  testshl2\source\cppunit\result     nmake   -   all t2_src_cppunit_result t2_inc NULL
+t2  testshl2\source                    nmake   -   all t2_src t2_src_cppunit_result t2_src_cppunit t2_inc NULL
 t2  testshl2\util                      nmake   -   all t2_util t2_src NULL
 

testshl2/source/cppunit/cmdlinebits.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #ifdef WNT
 # define UNDER_WINDOWS_DEBUGGING

testshl2/source/cppunit/joblist.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdlib.h>
 #include <stdio.h>

testshl2/source/cppunit/registertestfunction.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdlib.h>
 #include <testshl/simpleheader.hxx>

testshl2/source/cppunit/result/SynchronizedObject.cpp

-#include <testshl/result/SynchronizedObject.h>
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+#include <cppunit/SynchronizedObject.h>
 
 
 namespace CppUnit

testshl2/source/cppunit/result/TestResult.cpp

+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
 #include <cppunit/TestFailure.h>
 #include <testshl/result/TestListener.h>
 #include "testshl/getopt.hxx"

testshl2/source/cppunit/result/TestResultCollector.cpp

+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
 #include <cppunit/TestFailure.h>
 #include <testshl/result/TestResultCollector.h>
 

testshl2/source/cppunit/result/TestSucessListener.cpp

+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
+
 #include <testshl/result/TestSucessListener.h>
 
 

testshl2/source/cppunit/result/TextTestResult.cpp

+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_testshl2.hxx"
+
 #include <cppunit/Exception.h>
 #include <cppunit/NotEqualException.h>
 #include <cppunit/Test.h>

testshl2/source/cppunit/result/emacsTestResult.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdlib.h>
 

testshl2/source/cppunit/result/log.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include "testshl/log.hxx"
 

testshl2/source/cppunit/result/makefile.mk

@@ -31,7 +31,7 @@
 
 PRJ=..$/..$/..
 
-PRJNAME=cppunit
+PRJNAME=testshl2
 TARGET=c5t_testresult
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE

testshl2/source/cppunit/result/optionhelper.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include "testshl/result/optionhelper.hxx"
 // #include <sstream>

testshl2/source/cppunit/result/outputter.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 //
 #include <string>

testshl2/source/cppunit/result/signal.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdio.h>
 #include <stdlib.h>

testshl2/source/cppunit/result/testshlTestResult.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdlib.h>
 

testshl2/source/cppunit/result/treswrapper.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <cstdarg>
 #include <stdlib.h>

testshl2/source/cppunit/signaltest.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <typeinfo>
 

testshl2/source/cppunit/t_print.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdio.h>
 #include <testshl/cmdlinebits.hxx>

testshl2/source/cppunit/tresregister.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #include <stdio.h>
 #include <sal/types.h>

testshl2/source/cppunit/tresstatewrapper.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 // this functions build the wrapper, to handle old function calls to rtl_tres_state
 // IMPORTANT: Due to the fact that rtl_tres_state is in the sal.lib

testshl2/source/cppunit/win32/makefile.mk

@@ -30,7 +30,7 @@
 #*************************************************************************
 PRJ=..$/..$/..
 
-PRJNAME=cppunit
+PRJNAME=testshl2
 TARGET=c5t_winstuff
 LIBTARGET=NO
 ENABLE_EXCEPTIONS=TRUE

testshl2/source/cppunit/win32/winstuff.cxx

@@ -29,7 +29,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-// #include "precompiled_cppunit.hxx"
+#include "precompiled_testshl2.hxx"
 
 #ifdef WIN32
 #include "testshl/winstuff.hxx"

testshl2/source/makefile.mk

@@ -80,7 +80,6 @@ APP1STDLIBS+= \
         $(LB)$/libc5t_winstuff$(DLLPOSTFIX).a
 .ELSE
 APP1LIBS= \
-        $(LB)$/testshl2.lib \
         $(LB)$/c5t_testresult.lib \
         $(LB)$/c5t_no_regallfkt.lib \
         $(LB)$/c5t_winstuff.lib
@@ -89,14 +88,12 @@ APP1LIBS= \
 
 .IF "$(GUI)" == "OS2"
 APP1LIBS= \
-        $(LB)$/testshl2.lib \
         $(LB)$/c5t_no_regallfkt.lib \
         $(LB)$/c5t_testresult.lib
 .ENDIF
 
 .IF "$(GUI)" == "UNX"
 APP1STDLIBS+= \
-        $(LB)$/testshl2$(DLLPOSTFIX).a \
         $(LB)$/libc5t_testresult$(DLLPOSTFIX).a \
         $(LB)$/libc5t_no_regallfkt$(DLLPOSTFIX).a
 .ENDIF