create installation set for tests

+ it currently includes just the smoketest and is available only for Linux

+ the side effect is that it builds the smoketest before instsetoo_native
+ it runs it only during dev-install when the variable RUN_SMOKETEST == YES

7 files changed, 342 insertions, 1 deletions

diff --git a/scp2/prj/build.lst b/scp2/prj/build.lst
index 8f1397068296..083461558fcd 100644
--- a/scp2/prj/build.lst
+++ b/scp2/prj/build.lst
@@ -19,6 +19,7 @@ cp    scp2\source\ooo             nmake    -    all    cp_ooo cp_langmacros cp_l
 cp    scp2\source\python          nmake    -    all    cp_python cp_langmacros cp_langtemplates NULL
 cp    scp2\source\quickstart      nmake    -    all    cp_quickstart cp_langmacros cp_langtemplates NULL
 cp    scp2\source\sdkoo           nmake    -    all    cp_sdkoo cp_langmacros cp_langtemplates NULL
+cp    scp2\source\smoketest       nmake    -    all    cp_smoketest cp_langmacros cp_langtemplates NULL
 cp    scp2\source\testtool        nmake    -    all    cp_testtool cp_langmacros cp_langtemplates NULL
 cp    scp2\source\writer          nmake    -    all    cp_writer cp_langmacros cp_langtemplates NULL
 cp    scp2\source\base            nmake    -    all    cp_base cp_langmacros cp_langtemplates NULL
@@ -26,4 +27,4 @@ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacr
 cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
 cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
 cp    scp2\source\accessories     nmake    -    all    cp_accessories cp_langmacros NULL
-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_extensions cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_smoketest cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_accessories NULL
diff --git a/scp2/prj/d.lst b/scp2/prj/d.lst
index 37aaabbbae2a..0c19b55b0c6c 100644
--- a/scp2/prj/d.lst
+++ b/scp2/prj/d.lst
@@ -4,6 +4,8 @@
 ..\%__SRC%\bin\osl\ure.ins %_DEST%\bin\ure.ins
 ..\%__SRC%\bin\osl\sdkoo.inf %_DEST%\bin\sdkoo.inf
 ..\%__SRC%\bin\osl\sdkoo.ins %_DEST%\bin\sdkoo.ins
+..\%__SRC%\bin\osl\test.inf %_DEST%\bin\test.inf
+..\%__SRC%\bin\osl\test.ins %_DEST%\bin\test.ins
 ..\%__SRC%\bin\osl\setup_osljre.inf %_DEST%\bin\setup_osljre.inf
 ..\%__SRC%\bin\osl\setup_osljre.ins %_DEST%\bin\setup_osljre.ins
 
diff --git a/scp2/source/smoketest/makefile.mk b/scp2/source/smoketest/makefile.mk
new file mode 100644
index 000000000000..27d0ee3d292c
--- /dev/null
+++ b/scp2/source/smoketest/makefile.mk
@@ -0,0 +1,42 @@
+#***********************************************************************
+# 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) 2011 Petr Mladek <pmladek@suse.cz> (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.
+#***********************************************************************
+
+PRJ=..$/..
+PRJNAME=scp2so
+TARGET=smoketest
+
+.INCLUDE: settings.mk
+
+SCP_PRODUCT_TYPE=osl
+
+PARFILES= \
+        smoketest.par          
+
+
+.INCLUDE: target.mk
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/module_smoketest.scp b/scp2/source/smoketest/module_smoketest.scp
new file mode 100644
index 000000000000..480dd9c793af
--- /dev/null
+++ b/scp2/source/smoketest/module_smoketest.scp
@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2011 Petr Mladek <pmladek@suse.cz> (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.
+ */
+
+#include "macros.inc"
+
+Module gid_Module_Optional_Smoketest
+    PackageInfo = "packinfo_test.txt";
+    MOD_NAME_DESC ( MODULE_OPTIONAL_SMOKETEST );
+    Sortkey = "630";
+    ParentID = gid_Module_Optional;
+    Default = NO;
+    Files = (gid_Test_File_Txt_License,
+             gid_Test_File_Txt_Readme,
+             gid_Test_File_Misc_Smoketestdoc,
+             gid_Test_File_Misc_TypesRdb,
+             gid_Test_File_Bin_LOSmoketest,
+             gid_Test_File_Exe_Cppunittester,
+             gid_Test_File_Lib_Cppunit,
+             gid_Test_File_Lib_Smoketest,
+             gid_Test_File_Lib_Test,
+             gid_Test_File_Lib_Unotest,
+             gid_Test_File_Lib_Unoexceptionprotector);
+End
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/module_smoketest.ulf b/scp2/source/smoketest/module_smoketest.ulf
new file mode 100644
index 000000000000..a29a9fde1798
--- /dev/null
+++ b/scp2/source/smoketest/module_smoketest.ulf
@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2011 Petr Mladek <pmladek@suse.cz> (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.
+ */
+
+[STR_NAME_MODULE_OPTIONAL_SMOKETEST]
+en-US = "%PRODUCTNAME %PRODUCTVERSION Smoketest"
+
+[STR_DESC_MODULE_OPTIONAL_SMOKETEST]
+en-US = "The smoketest of %PRODUCTNAME %PRODUCTVERSION"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/source/smoketest/smoketest.scp b/scp2/source/smoketest/smoketest.scp
new file mode 100644
index 000000000000..dc4f6d38d9e7
--- /dev/null
+++ b/scp2/source/smoketest/smoketest.scp
@@ -0,0 +1,204 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2011 Petr Mladek <pmladek@suse.cz> (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.
+ */
+
+#include "macros.inc"
+
+Installation gid_Installation_Test
+    ProductName = "${PRODUCTNAME}";
+    ProductVersion = "${PRODUCTVERSION}";
+    ProductExtension = "${PRODUCTEXTENSION}";
+#if defined WNT
+    DefaultDestPath = "<winprogpath>\%PRODUCTNAME";
+#else
+    DefaultDestPath = "/opt/%PRODUCTNAME";
+#endif
+End
+
+Module gid_Module_Root_Smoketest
+    Name = "smoketest";
+    Description = "smoketest";
+    PackageInfo = "packinfo_test.txt";
+End
+
+#ifndef MACOSX
+Directory gid_Test_Dir_Brand_Root
+    ParentID = PREDEFINED_PROGDIR;
+  #ifdef WNT
+    HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
+  #else
+    HostName = ".";
+  #endif
+    Styles = (OFFICEDIRECTORY,ISINSTALLLOCATION,CREATE);
+End
+#endif
+
+Directory gid_Test_Brand_Dir_Program
+#if defined MACOSX
+    ParentID = gid_Test_Dir_Bundle_Contents;
+    DosName = "MacOS";
+#else
+    ParentID = gid_Test_Dir_Brand_Root;
+    DosName = "program";
+#endif
+End
+
+Directory gid_Test_Brand_Dir_Share
+#if defined MACOSX
+    ParentID = gid_Test_Dir_Bundle_Contents;
+#else
+    ParentID = gid_Test_Dir_Brand_Root;
+#endif
+    DosName = "share";
+End
+
+Directory gid_Test_Brand_Dir_Share_Test
+    ParentID = gid_Test_Brand_Dir_Share;
+    DosName = "test";
+End
+
+Directory gid_Test_Dir_Common_Ure
+    ParentID = gid_Test_Dir_Brand_Root;
+    HostName = "ure";
+    Styles = (UREDIRECTORY);
+End
+
+Directory gid_Test_Dir_Ure_Share
+    ParentID = gid_Test_Dir_Common_Ure;
+    DosName = "share";
+End
+
+Directory gid_Test_Dir_Ure_Misc
+    ParentID = gid_Test_Dir_Ure_Share;
+    DosName = "misc";
+End
+
+Directory gid_Test_Dir_Ure_Misc_Test
+    ParentID = gid_Test_Dir_Ure_Misc;
+    DosName = "test";
+End
+
+
+File gid_Test_File_Txt_License
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+  #ifdef UNX
+    Name = "LICENSE";
+  #endif
+  #ifdef WNT
+    Name = "license.txt";
+  #endif
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Txt_Readme
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+  #ifdef UNX
+    Name = "README_en-US";
+  #endif
+  #ifdef WNT
+    Name = "readme_en-US.txt";
+  #endif
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Misc_Smoketestdoc
+    TXT_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Share_Test;
+    Name = "smoketestdoc.sxw";
+    Styles = (PACKED, SCPZIP_REPLACE);
+End
+
+File gid_Test_File_Misc_TypesRdb
+    TXT_FILE_BODY;
+    Dir = gid_Test_Dir_Ure_Misc_Test;
+    Name = "types.rdb";
+    Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
+End
+
+File gid_Test_File_Bin_LOSmoketest
+    BIN_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Program;
+    Name = "losmoketest";
+    Styles = (PACKED);
+End
+
+File gid_Test_File_Exe_Cppunittester
+    BIN_FILE_BODY;
+    Dir = gid_Test_Brand_Dir_Program;
+    Name = "cppunittester";
+    Styles = (PACKED);
+End
+
+File gid_Test_File_Lib_Cppunit
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT3(libcppunit-1.12,UNXSUFFIX,.1));
+  #endif
+End
+
+File gid_Test_File_Lib_Smoketest
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libsmoketest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Test
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libtest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Unotest
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libunotest,UNXSUFFIX));
+  #endif
+End
+
+File gid_Test_File_Lib_Unoexceptionprotector
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = gid_Test_Brand_Dir_Program;
+  #ifdef UNX
+    Name = STRING(CONCAT2(unoexceptionprotector,UNXSUFFIX));
+  #endif
+End
+
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 49134a0a3ff0..5d22a7097640 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -253,5 +253,12 @@ SCP4LINK_PRODUCT_TYPE = osl
 SCP4TARGET = sdkoo
 SCP4FILES = sdkoo.par
 
+# ------------------------------------------------------------------------
+# Test
+
+SCP5LINK_PRODUCT_TYPE = osl
+SCP5TARGET = test
+SCP5FILES = smoketest.par
+
 # --- target -------------------------------------------------------------
 .INCLUDE :  target.mk