[Libreoffice-commits] .: 2 commits - sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_tcwf.mk sal/Module_sal.mk tools/inc

[Michael Meeks]

 sal/CppunitTest_sal_osl_file.mk          |   24 ------------------
 sal/CppunitTest_sal_osl_old_test_file.mk |   40 +++++++++++++++++++++++++++++++
 sal/CppunitTest_sal_tcwf.mk              |   40 +++++++++++++++++++++++++++++++
 sal/Module_sal.mk                        |    2 +
 tools/inc/tools/fsys.hxx                 |    8 +++---
 5 files changed, 86 insertions(+), 28 deletions(-)

New commits:
commit 22815db58f554cd64ec3a625b81175bf5d93f91c
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Sat Jan 21 11:39:07 2012 +0000

    sal: only allowed one unit-test per gnumakefile, so separate these

diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk
index 464a153..d118f25 100644
--- a/sal/CppunitTest_sal_osl_file.mk
+++ b/sal/CppunitTest_sal_osl_file.mk
@@ -37,28 +37,4 @@ $(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_file,\
     $(gb_STDLIBS) \
 ))
 
-# sal_osl_old_test_file
-$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
-    sal/qa/osl/file/osl_old_test_file \
-))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\
-    sal \
-    $(gb_STDLIBS) \
-))
-
-# sal_tcwf
-$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
-    sal/qa/osl/file/test_cpy_wrt_file \
-))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\
-    sal \
-    $(gb_STDLIBS) \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk
new file mode 100644
index 0000000..30a561e
--- /dev/null
+++ b/sal/CppunitTest_sal_osl_old_test_file.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan at 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.
+
+# sal_osl_old_test_file
+$(eval $(call gb_CppunitTest_CppunitTest,sal_osl_old_test_file))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_osl_old_test_file,\
+    sal/qa/osl/file/osl_old_test_file \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_osl_old_test_file,\
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk
new file mode 100644
index 0000000..8dfe9ff
--- /dev/null
+++ b/sal/CppunitTest_sal_tcwf.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile; 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) 2011 Matúš Kukan <matus.kukan at 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.
+
+# sal_tcwf
+$(eval $(call gb_CppunitTest_CppunitTest,sal_tcwf))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sal_tcwf,\
+    sal/qa/osl/file/test_cpy_wrt_file \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sal_tcwf,\
+    sal \
+    $(gb_STDLIBS) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 92950ac..6d7d2c6 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -48,6 +48,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 	CppunitTest_sal_osl_file \
 	CppunitTest_sal_osl_module \
 	CppunitTest_sal_osl_mutex \
+	CppunitTest_sal_osl_old_test_file \
 	CppunitTest_sal_osl_process \
 	CppunitTest_sal_osl_profile \
 	CppunitTest_sal_osl_security \
@@ -61,6 +62,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 	CppunitTest_sal_rtl_ostringbuffer \
 	CppunitTest_sal_rtl_oustringbuffer \
 	CppunitTest_sal_rtl_strings \
+	CppunitTest_sal_tcwf \
 	CppunitTest_sal_types \
 ))
 
commit 90bcb4b51918b26e840dc5102d2997fb48ee4341
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Fri Jan 20 15:52:05 2012 +0000

    privateise FileCopier - it is not used externally

diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 7a4f2e4..3d2dfa8 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -327,11 +327,11 @@ public:
     static String       GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
 };
 
-// --------------
-// - FileCopier -
-// --------------
+// -----------------------------------------------------
+// - FileCopier - a private impl. detail of tools/ ... -
+// -----------------------------------------------------
 
-class TOOLS_DLLPUBLIC FileCopier
+class FileCopier
 {
     DirEntry            aSource;
     DirEntry            aTarget;