gbuild'ize smoketest(oo_native) and merge them

Add smoketest to tail_build and make it a subsequentcheck target.

17 files changed, 331 insertions, 255 deletions

diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
new file mode 100644
index 000000000000..da2538caf8d7
--- /dev/null
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_CppunitTest_CppunitTest,smoketest))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\
+	smoketest/smoketest \
+))
+
+$(eval $(call gb_CppunitTest_add_api,smoketest,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,smoketest,\
+	cppu \
+	cppuhelper \
+	sal \
+	unotest \
+))
+
+ifeq ($(OS),MACOSX)
+my_soffice:=path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice
+else
+my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
+endif
+
+$(eval $(call gb_CppunitTest_set_args,smoketest,\
+	-env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
+	-env:UNO_TYPES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/bin/types.rdb) \
+	-env:arg-soffice=$(my_soffice) \
+	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
+	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
+	-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \
+	--protector $(call gb_Library_get_target,unoexceptionprotector) \
+	unoexceptionprotector \
+))
+
+$(call gb_CppunitTest_get_target,smoketest): clean_CustomTarget_smoketest
+
+clean_CustomTarget_smoketest:
+	rm -rf $(WORKDIR)/CustomTarget/smoketest
+	mkdir -p $(WORKDIR)/CustomTarget/smoketest
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
new file mode 100644
index 000000000000..8276cc58135a
--- /dev/null
+++ b/smoketest/Jar_TestExtension.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Jar_Jar,TestExtension))
+
+$(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\
+	juh.jar \
+	jurt.jar \
+	ridl.jar \
+	unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,TestExtension,\
+	$(OUTDIR)/bin/juh.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,TestExtension,\
+	smoketest/com/sun/star/comp/smoketest/TestExtension \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Makefile b/smoketest/Makefile
new file mode 100644
index 000000000000..ccb1c85a04da
--- /dev/null
+++ b/smoketest/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
new file mode 100644
index 000000000000..0ef1c52ba991
--- /dev/null
+++ b/smoketest/Module_smoketest.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,smoketest))
+
+ifeq ($(CROSS_COMPILING),)
+
+$(eval $(call gb_Module_add_targets,smoketest,\
+	Package_losmoketest \
+	Zip_smoketestdoc \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,smoketest,\
+	Jar_TestExtension \
+	Zip_TestExtension \
+))
+endif
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
+	CppunitTest_smoketest \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Package_losmoketest.mk b/smoketest/Package_losmoketest.mk
new file mode 100644
index 000000000000..b8dfba506ba1
--- /dev/null
+++ b/smoketest/Package_losmoketest.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,smoketest_losmoketest,$(SRCDIR)/smoketest))
+
+$(eval $(call gb_Package_add_file,smoketest_losmoketest,bin/losmoketest,losmoketest))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/README b/smoketest/README
new file mode 100644
index 000000000000..1027041c8c4c
--- /dev/null
+++ b/smoketest/README
@@ -0,0 +1 @@
+Smoke test for each component of LibreOffice.
diff --git a/smoketest/Zip_TestExtension.mk b/smoketest/Zip_TestExtension.mk
new file mode 100644
index 000000000000..b332f4352665
--- /dev/null
+++ b/smoketest/Zip_TestExtension.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Zip_Zip,TestExtension,$(WORKDIR)/Zip/TestExtension))
+
+$(eval $(call gb_Zip_add_file,TestExtension,TestExtension.jar,\
+	$(call gb_Jar_get_outdir_target,TestExtension) \
+))
+
+$(eval $(call gb_Zip_add_file,TestExtension,META-INF/manifest.xml,\
+	$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/manifest.xml \
+))
+
+$(call gb_Zip_get_final_target,TestExtension) : $(OUTDIR)/bin/TestExtension.oxt
+$(call gb_Zip_get_clean_target,TestExtension) : Clean_TestExtension_oxt
+
+$(OUTDIR)/bin/TestExtension.oxt : $(call gb_Zip_get_target,TestExtension)
+	$(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_TestExtension_oxt
+Clean_TestExtension_oxt :
+	rm -f $(OUTDIR)/bin/TestExtension.oxt
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
new file mode 100644
index 000000000000..c27d32629349
--- /dev/null
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan@gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+SMOKETESTDOC_DIR:=$(SRCDIR)/smoketest/data
+
+$(eval $(call gb_Zip_Zip,smoketestdoc,$(WORKDIR)/Zip/smoketestdoc))
+
+$(eval $(call gb_Zip_add_commandoptions,smoketestdoc,-D))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,mimetype))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,content.xml,$(SMOKETESTDOC_DIR)/content.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,meta.xml,$(SMOKETESTDOC_DIR)/meta.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,settings.xml,$(SMOKETESTDOC_DIR)/settings.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,styles.xml,$(SMOKETESTDOC_DIR)/styles.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,META-INF/manifest.xml,$(SMOKETESTDOC_DIR)/manifest.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/script-lc.xml,$(SMOKETESTDOC_DIR)/script-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/script-lb.xml,$(SMOKETESTDOC_DIR)/script-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Events.xml,$(SMOKETESTDOC_DIR)/Events.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Global.xml,$(SMOKETESTDOC_DIR)/Global.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_10er.xml,$(SMOKETESTDOC_DIR)/Test_10er.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_DB.xml,$(SMOKETESTDOC_DIR)/Test_DB.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_Ext.xml,$(SMOKETESTDOC_DIR)/Test_Ext.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml,$(SMOKETESTDOC_DIR)/dialog-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml,$(SMOKETESTDOC_DIR)/dialog-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml,$(SMOKETESTDOC_DIR)/OptionsDlg.xml))
+
+$(WORKDIR)/Zip/smoketestdoc/mimetype :
+	mkdir -p $(dir $@)
+	printf application/vnd.sun.xml.writer > $@
+
+$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
+$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
+
+$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc)
+	$(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_smoketestdoc_sxw
+Clean_smoketestdoc_sxw :
+	rm -f $(OUTDIR)/bin/smoketestdoc.sxw
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl b/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
deleted file mode 100644
index 83c370e11a18..000000000000
--- a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * 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
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_
-#define _com_sun_star_comp_smoketest_TestExtension_idl_
-
-#include <com/sun/star/lang/XServiceInfo.idl>
-
-
-module com { module sun { module star { module comp { module smoketest {
-        // example service, XServiceInfo is implemented here for demonstration
-        // issues. XServiceInfo must be implemented by all components.
-        service TestExtension: ::com::sun::star::lang::XServiceInfo;
-};};};};};
-
-#endif
diff --git a/smoketest/com/sun/star/comp/smoketest/delzip b/smoketest/com/sun/star/comp/smoketest/delzip
deleted file mode 100755
index 636fda90bfcb..000000000000
--- a/smoketest/com/sun/star/comp/smoketest/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/smoketest/com/sun/star/comp/smoketest/makefile.mk b/smoketest/com/sun/star/comp/smoketest/makefile.mk
deleted file mode 100755
index 88e5370ef7d3..000000000000
--- a/smoketest/com/sun/star/comp/smoketest/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ     = ../../../../..
-PRJNAME = smoketestdoc
-PACKAGE = com/sun/star/comp/smoketest
-TARGET  = com_sun_star_comp_smoketest
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(SOLAR_JAVA)" != ""
-
-.INCLUDE : settings.mk
-
-JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
-
-JARTARGET          = TestExtension.jar
-JARCOMPRESS        = TRUE
-CUSTOMMANIFESTFILE = MANIFEST.MF
-
-ZIP1TARGET=TestExtension
-ZIP1LIST=*
-ZIPFLAGS=-r
-ZIP1DIR=$(MISC)/$(TARGET)
-ZIP1EXT=.oxt
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = TestExtension.java
-
-# --- Targets ------------------------------------------------------
-
-ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\
-         $(MISC)/$(TARGET)/TestExtension.rdb\
-         $(MISC)/$(TARGET)/META-INF/manifest.xml
-
-.INCLUDE :  target.mk
-
-.IF "$(depend)" == ""
-$(MISC)/$(TARGET)/META-INF:
-    @-$(MKDIRHIER) $(@)
-
-$(MISC)/TestExtension.urd: TestExtension.idl
-    $(COMMAND_ECHO)$(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $<
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml $(MISC)/$(TARGET)/TestExtension.rdb : $(MISC)/$(TARGET)/META-INF
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml: manifest.xml
-    $(COMMAND_ECHO)$(COPY) $< $@
-
-$(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd
-    $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $<
-
-$(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb
-    $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
-
-$(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN)
-    $(COMMAND_ECHO)$(COPY) $< $@
-.END
-
-.ELSE
-@all:
-    @echo "Java disabled. Nothing to do."
-.ENDIF
diff --git a/smoketest/com/sun/star/comp/smoketest/manifest.xml b/smoketest/com/sun/star/comp/smoketest/manifest.xml
index fcedabf96b4b..0e730444291c 100755
--- a/smoketest/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketest/com/sun/star/comp/smoketest/manifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
- <manifest:file-entry manifest:full-path="TestExtension.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
 </manifest:manifest>
diff --git a/smoketest/data/makefile.mk b/smoketest/data/makefile.mk
deleted file mode 100644
index 6cf2706b52b2..000000000000
--- a/smoketest/data/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = smoketestdoc
-TARGET = data
-
-.INCLUDE: settings.mk
-
-$(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
-    $(COPY) $< $@
-
-$(MISC)/zip/smoketestdoc.sxw: \
-        Events.xml \
-        Global.xml \
-        OptionsDlg.xml \
-        Test_10er.xml \
-        Test_DB.xml \
-        Test_Ext.xml \
-        content.xml \
-        dialog-lb.xml \
-        dialog-lc.xml \
-        manifest.xml \
-        meta.xml \
-        script-lb.xml \
-        script-lc.xml \
-        settings.xml \
-        styles.xml
-    $(COMMAND_ECHO)$(RM) -r $(MISC)/zip
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip
-    $(COMMAND_ECHO)$(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/
-    $(COMMAND_ECHO)printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/META-INF
-    $(COMMAND_ECHO)$(COPY) manifest.xml $(MISC)/zip/META-INF/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic
-    $(COMMAND_ECHO)$(COPY) script-lc.xml $(MISC)/zip/Basic/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic/Standard
-    $(COMMAND_ECHO)$(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \
-        Test_Ext.xml $(MISC)/zip/Basic/Standard/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs
-    $(COMMAND_ECHO)$(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/
-    $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs/Standard
-    $(COMMAND_ECHO)$(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/
-    $(COMMAND_ECHO)cd $(MISC)/zip && zip -rD $(@:f) .
-
-.INCLUDE: target.mk
diff --git a/smoketest/makefile.mk b/smoketest/makefile.mk
deleted file mode 100755
index ef218704d55f..000000000000
--- a/smoketest/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-# 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
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = .
-PRJNAME = smoketestoo_native
-TARGET = smoketest
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1TARGET = smoketest
-SHL1OBJS = $(SLO)/smoketest.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE :	target.mk
diff --git a/smoketest/prj/build.lst b/smoketest/prj/build.lst
index abec637a7f52..1796c636b4b6 100644
--- a/smoketest/prj/build.lst
+++ b/smoketest/prj/build.lst
@@ -1,4 +1,2 @@
-smt smoketest :: codemaker javaunohelper soltools test unoil NULL
-smt smoketest\com\sun\star\comp\smoketest nmake - all smoketest_com_sun_star_comp_smoketest NULL
-smt smoketest\data nmake - all smoketest_data NULL
-smt smoketest nmake - all smoketest_mk smoketest_com_sun_star_comp_smoketest smoketest_data NULL
+smt smoketest :: javaunohelper soltools test unoil NULL
+smt smoketest\prj nmake - all smoketest_prj NULL
diff --git a/smoketest/prj/d.lst b/smoketest/prj/d.lst
index 4da25c205f22..e69de29bb2d1 100644
--- a/smoketest/prj/d.lst
+++ b/smoketest/prj/d.lst
@@ -1,4 +0,0 @@
-..\losmoketest %_DEST%\bin\losmoketest
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
-..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
-..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
diff --git a/smoketest/prj/makefile.mk b/smoketest/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/smoketest/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk