diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-15 13:41:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-15 13:41:19 +0000 |
| commit | 71dee2f153371c6dc0c1488aabf75711f9d53e2b (patch) | |
| tree | 44db829e5d3702bdc779d65f56cddd5369d40a1c | |
| parent | 9e299a0fe67455f9f6881365dbe8422dd0d735d2 (diff) | |
move cppumaker test to cppu
| -rw-r--r-- | codemaker/prj/build.lst | 2 | ||||
| -rw-r--r-- | cppu/prj/build.lst | 3 | ||||
| -rw-r--r-- | cppu/qa/cppumaker/makefile.mk (renamed from codemaker/test/cppumaker/makefile.mk) | 11 | ||||
| -rw-r--r-- | cppu/qa/cppumaker/test_cppumaker.cxx (renamed from codemaker/test/cppumaker/test_codemaker_cppumaker.cxx) | 2 | ||||
| -rw-r--r-- | cppu/qa/cppumaker/types.idl (renamed from codemaker/test/cppumaker/types.idl) | 0 | ||||
| -rw-r--r-- | cppu/qa/cppumaker/version.map (renamed from codemaker/test/cppumaker/version.map) | 0 |
6 files changed, 8 insertions, 10 deletions
diff --git a/codemaker/prj/build.lst b/codemaker/prj/build.lst index 71f5290235bc..a0fa864ebd8e 100644 --- a/codemaker/prj/build.lst +++ b/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 - diff --git a/cppu/prj/build.lst b/cppu/prj/build.lst index 4ded629ef0fd..62ddfff0f29f 100644 --- a/cppu/prj/build.lst +++ b/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 diff --git a/codemaker/test/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk index c91d3c653799..1dd1a4bace19 100644 --- a/codemaker/test/cppumaker/makefile.mk +++ b/cppu/qa/cppumaker/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # 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) $@ diff --git a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 73a0ed84185f..833ab6ba551b 100644 --- a/codemaker/test/cppumaker/test_codemaker_cppumaker.cxx +++ b/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" diff --git a/codemaker/test/cppumaker/types.idl b/cppu/qa/cppumaker/types.idl index 9d9c70234ae3..9d9c70234ae3 100644 --- a/codemaker/test/cppumaker/types.idl +++ b/cppu/qa/cppumaker/types.idl diff --git a/codemaker/test/cppumaker/version.map b/cppu/qa/cppumaker/version.map index 3308588ef6f8..3308588ef6f8 100644 --- a/codemaker/test/cppumaker/version.map +++ b/cppu/qa/cppumaker/version.map |