move cppumaker test to cppu

codemaker/prj/build.lst

@@ -7,5 +7,3 @@ cm	codemaker\source\commoncpp				nmake	-	all	cm_cpp cm_inc NULL
 cm	codemaker\source\cppumaker				nmake	-	all	cm_cppumaker 	cm_codemaker cm_cpp cm_inc NULL
 cm	codemaker\source\commonjava				nmake	-	all	cm_java cm_inc NULL
 cm	codemaker\source\javamaker				nmake	-	all	cm_javamaker cm_codemaker cm_java cm_inc NULL
-cm  codemaker\test\cppumaker                nmake   -   all cm_test_cppumaker cm_cppumaker NULL
-

cppu/prj/build.lst

@@ -10,4 +10,5 @@ cu	cppu\source\UnsafeBridge	    nmake	-	all	cu_UnsafeBridge cu_inc NULL
 cu	cppu\source\AffineBridge	    nmake	-	all	cu_AffineBridge cu_inc NULL
 cu	cppu\source\LogBridge	        nmake	-	all	cu_LogBridge cu_inc NULL
 cu	cppu\util						nmake	-	all	cu_util cu_thpool cu_typelib cu_cppu cu_uno cu_helper_purpenv cu_UnsafeBridge cu_AffineBridge cu_LogBridge NULL
-cd	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
+cu	cppu\qa							nmake	-	all cu_qa_cppunit cu_util NULL
+cu	cppu\qa\cppumaker				nmake	-	all cu_qa_cppumaker cu_inc NULL

codemaker/test/cppumaker/makefile.mk → cppu/qa/cppumaker/makefile.mk

 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
+#
 # Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
@@ -26,8 +26,8 @@
 #*************************************************************************
 
 PRJ := ..$/..
-PRJNAME := codemaker
-TARGET := test_codemaker_cppumaker
+PRJNAME := cppu
+TARGET := test_cppumaker
 
 ENABLE_EXCEPTIONS := TRUE
 
@@ -40,7 +40,7 @@ DLLPRE = # no leading "lib" on .so files
 INCPRE += $(MISC)$/$(TARGET)$/inc
 
 SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/test_codemaker_cppumaker.obj
+SHL1OBJS = $(SLO)$/test_cppumaker.obj
 SHL1STDLIBS = $(CPPULIB) $(CPPUNITLIB) $(SALLIB)
 SHL1VERSIONMAP = version.map
 SHL1IMPLIB = i$(SHL1TARGET)
@@ -54,10 +54,9 @@ ALLTAR: test
 
 $(SHL1OBJS): $(MISC)$/$(TARGET).cppumaker.flag
 
-$(MISC)$/$(TARGET).cppumaker.flag: $(BIN)$/cppumaker$(EXECPOST)
 $(MISC)$/$(TARGET).cppumaker.flag: $(MISC)$/$(TARGET).rdb
     - $(MKDIRHIER) $(MISC)$/$(TARGET)$/inc
-    $(AUGMENT_LIBRARY_PATH) $(BIN)$/cppumaker$(EXECPOST) \
+    $(CPPUMAKER) \
         -O$(MISC)$/$(TARGET)$/inc -BUCR -C $< $(SOLARBINDIR)$/udkapi.rdb
     $(TOUCH) $@
 

codemaker/test/cppumaker/test_codemaker_cppumaker.cxx → cppu/qa/cppumaker/test_cppumaker.cxx

@@ -27,7 +27,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_codemaker.hxx"
+#include "precompiled_cppu.hxx"
 
 #include "FILE.hpp"
 #include "lconv.hpp"