Folded smoketestdoc back into smoketestoo_native; no need to have it separated.

26 files changed, 5 insertions, 12 deletions

diff --git a/smoketestdoc/prj/build.lst b/smoketestdoc/prj/build.lst
deleted file mode 100644
index ec825ab48049..000000000000
--- a/smoketestdoc/prj/build.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-smdoc   smoketestdoc :: soltools codemaker unoil javaunohelper NULL
-smdoc   smoketestdoc                                    usr1    -   all smdoc_mkout NULL
-smdoc   smoketestdoc\data                               nmake   -   all smdoc_data NULL
-smdoc   smoketestdoc\com\sun\star\comp\smoketest        nmake   -   all smdoc_ext NULL
diff --git a/smoketestdoc/prj/d.lst b/smoketestdoc/prj/d.lst
deleted file mode 100644
index c89f0d9b8ba2..000000000000
--- a/smoketestdoc/prj/d.lst
+++ /dev/null
@@ -1,4 +0,0 @@
-mkdir: %_DEST%\bin
-
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
-..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF b/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF
index 09e2f42ca0f6..09e2f42ca0f6 100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/MANIFEST.MF
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/MANIFEST.MF
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
index 83c370e11a18..83c370e11a18 100644
--- a/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.idl
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.idl
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
index c08c719116ae..c08c719116ae 100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/TestExtension.java
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/TestExtension.java
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/delzip b/smoketestoo_native/com/sun/star/comp/smoketest/delzip
index 636fda90bfcb..636fda90bfcb 100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/delzip
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/delzip
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
index be7af0510699..be7af0510699 100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/makefile.mk
diff --git a/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml b/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
index fcedabf96b4b..fcedabf96b4b 100755
--- a/smoketestdoc/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketestoo_native/com/sun/star/comp/smoketest/manifest.xml
diff --git a/smoketestdoc/data/Events.xml b/smoketestoo_native/data/Events.xml
index 414f2c48e884..414f2c48e884 100644
--- a/smoketestdoc/data/Events.xml
+++ b/smoketestoo_native/data/Events.xml
diff --git a/smoketestdoc/data/Global.xml b/smoketestoo_native/data/Global.xml
index 6f9c066fc3b6..6f9c066fc3b6 100644
--- a/smoketestdoc/data/Global.xml
+++ b/smoketestoo_native/data/Global.xml
diff --git a/smoketestdoc/data/OptionsDlg.xml b/smoketestoo_native/data/OptionsDlg.xml
index 5da93552f476..5da93552f476 100644
--- a/smoketestdoc/data/OptionsDlg.xml
+++ b/smoketestoo_native/data/OptionsDlg.xml
diff --git a/smoketestdoc/data/Test_10er.xml b/smoketestoo_native/data/Test_10er.xml
index 54ee0769a5b8..54ee0769a5b8 100644
--- a/smoketestdoc/data/Test_10er.xml
+++ b/smoketestoo_native/data/Test_10er.xml
diff --git a/smoketestdoc/data/Test_DB.xml b/smoketestoo_native/data/Test_DB.xml
index 52ea5d9be934..52ea5d9be934 100644
--- a/smoketestdoc/data/Test_DB.xml
+++ b/smoketestoo_native/data/Test_DB.xml
diff --git a/smoketestdoc/data/Test_Ext.xml b/smoketestoo_native/data/Test_Ext.xml
index ac39f4816d7b..ac39f4816d7b 100644
--- a/smoketestdoc/data/Test_Ext.xml
+++ b/smoketestoo_native/data/Test_Ext.xml
diff --git a/smoketestdoc/data/content.xml b/smoketestoo_native/data/content.xml
index 60559afac4ab..60559afac4ab 100644
--- a/smoketestdoc/data/content.xml
+++ b/smoketestoo_native/data/content.xml
diff --git a/smoketestdoc/data/dialog-lb.xml b/smoketestoo_native/data/dialog-lb.xml
index 973dfe688828..973dfe688828 100644
--- a/smoketestdoc/data/dialog-lb.xml
+++ b/smoketestoo_native/data/dialog-lb.xml
diff --git a/smoketestdoc/data/dialog-lc.xml b/smoketestoo_native/data/dialog-lc.xml
index e3a5a0e326e4..e3a5a0e326e4 100644
--- a/smoketestdoc/data/dialog-lc.xml
+++ b/smoketestoo_native/data/dialog-lc.xml
diff --git a/smoketestdoc/data/makefile.mk b/smoketestoo_native/data/makefile.mk
index 6cf2706b52b2..6cf2706b52b2 100644
--- a/smoketestdoc/data/makefile.mk
+++ b/smoketestoo_native/data/makefile.mk
diff --git a/smoketestdoc/data/manifest.xml b/smoketestoo_native/data/manifest.xml
index 48fc9ce900a0..48fc9ce900a0 100644
--- a/smoketestdoc/data/manifest.xml
+++ b/smoketestoo_native/data/manifest.xml
diff --git a/smoketestdoc/data/meta.xml b/smoketestoo_native/data/meta.xml
index 43f14295e2b3..43f14295e2b3 100644
--- a/smoketestdoc/data/meta.xml
+++ b/smoketestoo_native/data/meta.xml
diff --git a/smoketestdoc/data/script-lb.xml b/smoketestoo_native/data/script-lb.xml
index fc4f6c6370ba..fc4f6c6370ba 100644
--- a/smoketestdoc/data/script-lb.xml
+++ b/smoketestoo_native/data/script-lb.xml
diff --git a/smoketestdoc/data/script-lc.xml b/smoketestoo_native/data/script-lc.xml
index e3a5a0e326e4..e3a5a0e326e4 100644
--- a/smoketestdoc/data/script-lc.xml
+++ b/smoketestoo_native/data/script-lc.xml
diff --git a/smoketestdoc/data/settings.xml b/smoketestoo_native/data/settings.xml
index cd4524b741ff..cd4524b741ff 100644
--- a/smoketestdoc/data/settings.xml
+++ b/smoketestoo_native/data/settings.xml
diff --git a/smoketestdoc/data/styles.xml b/smoketestoo_native/data/styles.xml
index 3f8d75fa6db3..3f8d75fa6db3 100644
--- a/smoketestdoc/data/styles.xml
+++ b/smoketestoo_native/data/styles.xml
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
index 999d209c2a85..2b2c294045e6 100755
--- a/smoketestoo_native/makefile.mk
+++ b/smoketestoo_native/makefile.mk
@@ -53,7 +53,7 @@ ALLTAR : cpptest
 
 cpptest : $(SHL1TARGETN)
 
-TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin$(UPDMINOREXT)/smoketestdoc.sxw
+TEST_ARGUMENTS = smoketest.doc=$(BIN)/smoketestdoc.sxw
 CPPTEST_LIBRARY = $(SHL1TARGETN)
 
 .IF "$(OS)" != "WNT"
diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst
index 9527079f56d2..e7afaaacb8e5 100644
--- a/smoketestoo_native/prj/build.lst
+++ b/smoketestoo_native/prj/build.lst
@@ -1,3 +1,4 @@
-smtoon      smoketestoo_native     ::       instsetoo_native test smoketestdoc NULL
-smtoon      smoketestoo_native    usr1	-       all     smoketestoonative_mkout NULL
-smtoon      smoketestoo_native    nmake	-       all,test10     smoketestoonative_mk NULL
+smtoon smoketestoo_native :: codemaker instsetoo_native javaunohelper soltools test unoil NULL
+smtoon smoketestoo_native\com\sun\star\comp\smoketest nmake - all smoketestoonative_com_sun_star_comp_smoketest NULL
+smtoon smoketestoo_native\data nmake - all smoketestoonative_data NULL
+smtoon smoketestoo_native nmake - all smoketestoonative_mk smoketestoonative_com_sun_star_comp_smoketest smoketestoonative_data NULL