[PATCH] rework of make check, running smoketest and installing - gbuild patches

Hi all,

As already promised on irc I'm proposing gbuild patches for
smoketest(oo_native).

In smoketestoo_native/ there were commands for installing which I
moved to toplevel Makefile.
There was also smoketest being run. This I moved to smoketest/ module
as regular subsequentcheck target.
So there is no smoketestoo_native anymore.
Do we want special 'make' command for running only smoketest ?
(Probably not because one can do: cd smoketest && make subsequentcheck)

But could someone please verify if sw_subsequent_rtftok works ? (
after c26d9befbab1f60b5b8c191c883569eae3d08c2d )
I get compile error and I have this bad feeling 'make' is ignoring
errors on subsequentcheck targets so we live in an illusion that
everything is all right.

Is it ok to push these patches?
Any further improvements to be done?

Thanks,

Matus

From e2c626677ad95d4ce3659c7c424190ff7b9a9cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sun, 12 Feb 2012 13:36:56 +0100
Subject: [PATCH 1/4] gbuild: Zip: clean properly all created targets on 'make clean'

---
 solenv/gbuild/Zip.mk |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index f6d492e..69e1f40 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -37,8 +37,9 @@ $(call gb_Zip_get_clean_target,%) :
        $(call gb_Output_announce,$*,$(false),ZIP,3)
        $(call gb_Helper_abbreviate_dirs,\
                rm -f $(call gb_Zip_get_target,$*) && \
-               rm -f $(call gb_Zip_get__preparation_target,$*) && \
+               rm -f $(call gb_Zip__get_preparation_target,$*) && \
                rm -f $(call gb_Zip_get_final_target,$*) && \
+               $(if $(CLEAR_LOCATION),rm -rf $(gb_Package_Location_$*) &&) \
                rm -f $(call gb_Zip_get_outdir_target,$*))
 
 # rule to create zip package in workdir
@@ -71,6 +72,7 @@ $(call gb_Zip__get_preparation_target,%) :
 define gb_Zip_Zip
 $(call gb_Zip_get_target,$(1)) : FILES :=
 $(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
+$(call gb_Zip_get_clean_target,$(1)) : CLEAR_LOCATION :=
 gb_Package_Location_$(1) := $(2)
 $(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call 
gb_Zip_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call 
gb_Zip_get_target,$(1)),$(1))
@@ -81,12 +83,15 @@ endef
 # adding a file creates a dependency to it
 # the full path name of the file needs access to the package location
 # as scoped variables only exist in rules, we use a postfixed name to refer to the location
+#
 # if package location is in $(WORKDIR) we can specify third parameter and copy file from different 
place
+# then we need also remove the location on make clean
 define gb_Zip_add_file
 $(call gb_Zip_get_target,$(1)) : FILES += $(2)
 $(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
 $(gb_Package_Location_$(1))/$(2) :| $(call gb_Zip__get_preparation_target,$(1))
 ifneq ($(3),)
+$(call gb_Zip_get_clean_target,$(1)) : CLEAR_LOCATION := TRUE
 $(gb_Package_Location_$(1))/$(2) : $(3)
        mkdir -p $$(dir $$@)
        cp -f $$< $$@
-- 
1.7.1

From 66aac0d72343ab2871027736891626c83f4ca711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sun, 12 Feb 2012 13:38:35 +0100
Subject: [PATCH 2/4] gbuild: Zip: allow to add command line options when zipping

---
 solenv/gbuild/Zip.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 69e1f40..f4f7b78 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -115,4 +115,9 @@ $(foreach dependency,$(2),$(call gb_Zip_add_dependency,$(1),$(dependency)))
 
 endef
 
+define gb_Zip_add_commandoptions
+$(call gb_Zip_get_target,$(1)) : gb_Zip_ZIPCOMMAND += $(2)
+
+endef
+
 # vim: set noet sw=4 ts=4:
-- 
1.7.1

From 83ee3d6a3d79e9088bb913b7c1b0412d06a01bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Sun, 12 Feb 2012 13:39:52 +0100
Subject: [PATCH 3/4] gbuild'ize smoketest(oo_native) and merge them

Add smoketest to tail_build and make it a subsequentcheck target.
---
 Makefile                                           |    3 +-
 Module_tail_build.mk                               |    1 +
 Repository.mk                                      |    1 +
 RepositoryModule_ooo.mk                            |    1 +
 postprocess/prj/build.lst                          |    2 +-
 smoketest/CppunitTest_smoketest.mk                 |   63 ++++++++++++++
 smoketest/Jar_TestExtension.mk                     |   52 ++++++++++++
 smoketest/Makefile                                 |    7 ++
 smoketest/Module_smoketest.mk                      |   50 +++++++++++
 smoketest/Package_losmoketest.mk                   |   32 +++++++
 smoketest/README                                   |    1 +
 smoketest/Zip_TestExtension.mk                     |   48 +++++++++++
 smoketest/Zip_smoketestdoc.mk                      |   69 +++++++++++++++
 .../com/sun/star/comp/smoketest/TestExtension.idl  |   40 ---------
 smoketest/com/sun/star/comp/smoketest/delzip       |    1 -
 smoketest/com/sun/star/comp/smoketest/makefile.mk  |   88 --------------------
 smoketest/com/sun/star/comp/smoketest/manifest.xml |    1 -
 smoketest/data/makefile.mk                         |   70 ----------------
 smoketest/makefile.mk                              |   47 -----------
 smoketest/prj/build.lst                            |    6 +-
 smoketest/prj/d.lst                                |    4 -
 smoketest/prj/makefile.mk                          |    1 +
 smoketestoo_native/README                          |    1 -
 smoketestoo_native/makefile.mk                     |   62 --------------
 smoketestoo_native/prj/build.lst                   |    2 -
 25 files changed, 330 insertions(+), 323 deletions(-)
 create mode 100644 smoketest/CppunitTest_smoketest.mk
 create mode 100644 smoketest/Jar_TestExtension.mk
 create mode 100644 smoketest/Makefile
 create mode 100644 smoketest/Module_smoketest.mk
 create mode 100644 smoketest/Package_losmoketest.mk
 create mode 100644 smoketest/README
 create mode 100644 smoketest/Zip_TestExtension.mk
 create mode 100644 smoketest/Zip_smoketestdoc.mk
 delete mode 100644 smoketest/com/sun/star/comp/smoketest/TestExtension.idl
 delete mode 100755 smoketest/com/sun/star/comp/smoketest/delzip
 delete mode 100755 smoketest/com/sun/star/comp/smoketest/makefile.mk
 delete mode 100644 smoketest/data/makefile.mk
 delete mode 100755 smoketest/makefile.mk
 create mode 100644 smoketest/prj/makefile.mk
 delete mode 100644 smoketestoo_native/README
 delete mode 100755 smoketestoo_native/makefile.mk
 delete mode 100644 smoketestoo_native/prj/build.lst
 delete mode 100644 smoketestoo_native/prj/d.lst

diff --git a/Makefile b/Makefile
index 99cae26..c207d91 100644
--- a/Makefile
+++ b/Makefile
@@ -90,6 +90,7 @@ scripting\
 sd\
 sfx2\
 slideshow\
+smoketest\
 sot\
 starmath\
 svl\
@@ -218,8 +219,6 @@ scp2\
 sdext\
 setup_native\
 shell\
-smoketest\
-smoketestoo_native\
 solenv\
 soltools\
 stax\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 362434d..a057bbb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
     sd \
     sfx2 \
     slideshow \
+    smoketest \
     starmath \
     svtools \
     svx \
diff --git a/Repository.mk b/Repository.mk
index 5adc794..1bc6fd8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -341,6 +341,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
     package2 \
     reg \
     scriptframe \
+    smoketest \
     sofficeapp \
     srtrs1 \
     store \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 8020878..6d724c1 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -93,6 +93,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     sd \
     sfx2 \
     slideshow \
+    smoketest \
     sot \
     starmath \
     svl \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index aa756e5..deb1fb8 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj 
embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards 
MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools 
JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext 
MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+po      postprocess     ::      BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj 
embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards 
MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools 
JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext 
MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
 po     postprocess                             usr1    -       all     po_mkout NULL
 po     postprocess\checkxml            nmake   -       all     po_checkxml NULL
 po     postprocess\packconfig          nmake   -       all     po_packconfig po_checkxml NULL
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
new file mode 100644
index 0000000..207b8a5
--- /dev/null
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -0,0 +1,63 @@
+# -*- 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=user \
+       
-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 \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
new file mode 100644
index 0000000..8276cc5
--- /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 0000000..ccb1c85
--- /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 0000000..0ef1c52
--- /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 0000000..b8dfba5
--- /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 0000000..1027041
--- /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 0000000..b332f43
--- /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 0000000..c27d326
--- /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 83c370e..0000000
--- 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 636fda9..0000000
--- 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 88e5370..0000000
--- 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 fcedabf..0e73044 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 6cf2706..0000000
--- 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 ef21870..0000000
--- 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 abec637..1796c63 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 4da25c2..e69de29 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 0000000..0997622
--- /dev/null
+++ b/smoketest/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/smoketestoo_native/README b/smoketestoo_native/README
deleted file mode 100644
index 1027041..0000000
--- a/smoketestoo_native/README
+++ /dev/null
@@ -1 +0,0 @@
-Smoke test for each component of LibreOffice.
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
deleted file mode 100755
index e970162..0000000
--- a/smoketestoo_native/makefile.mk
+++ /dev/null
@@ -1,62 +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
-ABORT_ON_ASSERTION = TRUE
-
-.INCLUDE: settings.mk
-
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-.IF "$(depend)" == ""
-# disable smoketest when cross-compiling for now; we can use wine at some stage (?)
-.IF "$(CROSS_COMPILING)" != "YES"
-ALLTAR : cpptest
-.ELSE
-ALLTAR : 
-.END
-.END
-
-TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw
-CPPTEST_LIBRARY = $(OUTDIR)/lib/$(DLLPRE)smoketest$(DLLPOST)
-
-.IF "$(OS)" != "WNT" || "$(CROSS_COMPILING)" == "YES"
-.IF "$(DISABLE_LINKOO)" == "TRUE"
-my_linkoo =
-.ELSE
-my_linkoo = -l
-.END
-localinstall :
-    $(RM) -r $(installationtest_instpath)
-    $(MKDIRHIER) $(installationtest_instpath)
-    ooinstall $(my_linkoo) $(installationtest_instpath)/opt
-.IF "$(DISABLE_LINKOO)" == "TRUE"
-    install-gdb-printers -L
-.END
-cpptest : localinstall
-.END
diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst
deleted file mode 100644
index 9a43f63..0000000
--- a/smoketestoo_native/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-smtoon smoketestoo_native :: instsetoo_native NULL
-smtoon smoketestoo_native nmake - all smtoon_mkout NULL
diff --git a/smoketestoo_native/prj/d.lst b/smoketestoo_native/prj/d.lst
deleted file mode 100644
index e69de29..0000000
-- 
1.7.1

From 621e3d6e4e5e3ea893d4d584f132dfe5bc5d4b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=BA=C5=A1=20Kukan?= <matus.kukan@gmail.com>
Date: Tue, 14 Feb 2012 23:36:57 +0100
Subject: [PATCH 4/4] Makefile: adapt to gbuild'ized smoketest, create target for installing

---
 Makefile |   29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index c207d91..16d82a5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 
-.PHONY : all autogen bootstrap build check clean clean-build clean-host dev-install 
dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest 
tags
+.PHONY : all autogen bootstrap build check clean clean-build clean-host dev-install distclean 
distro-pack-install docs fetch findunusedcode id install subsequentcheck tags
 
 ifeq ($(MAKECMDGOALS),)
 MAKECMDGOALS:=all
@@ -397,14 +397,17 @@ install:
        echo "Installation finished, you can now execute:" && \
        echo "$(INSTALLDIR)/program/soffice"
 
-dev-install-link:
+dev-install: build
+       @rm -rf $(OUTDIR)/installation
+       @mkdir $(OUTDIR)/installation
+ifeq ($(DISABLE_LINKOO),TRUE)
+       @ooinstall $(OUTDIR)/installation/opt
+       @install-gdb-printers -L
+else
+       @ooinstall -l $(OUTDIR)/installation/opt
+endif
        @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
 
-dev-install: dev-install-link
-       cd smoketestoo_native && \
-       unset MAKEFLAGS && \
-       $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-
 distro-pack-install: install
        $(SRCDIR)/bin/distro-install-clean-up
        $(SRCDIR)/bin/distro-install-desktop-integration
@@ -437,22 +440,14 @@ findunusedcode:
               | grep -v ^salhelper:: \
               > unusedcode.easy
 
-check: subsequentcheck_after_build
+check: subsequentcheck
 
-subsequentcheck_after_build: build dev-install-link
-       @cd smoketestoo_native && unset MAKEFLAGS && \
-       $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
-       $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
-
-subsequentcheck: smoketestoo_native
+subsequentcheck: dev-install
        $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
 
 debugrun:
        $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun
 
-slowcheck:
-       $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile slowcheck
-
 endif # not clean or distclean
 
 
-- 
1.7.1