[Libreoffice-commits] .: 2 commits - sd/CppunitTest_sd_uimpress.mk sd/CppUnitTest_sd_uimpress.mk sd/Module_sd.mk
David Tardon
dtardon at kemper.freedesktop.org
Sun Apr 24 01:07:14 PDT 2011
sd/CppUnitTest_sd_uimpress.mk | 105 ------------------------------------------
sd/CppunitTest_sd_uimpress.mk | 105 ++++++++++++++++++++++++++++++++++++++++++
sd/Module_sd.mk | 5 +-
3 files changed, 109 insertions(+), 106 deletions(-)
New commits:
commit 39745b82806aac1d07deeeb11e3ede43a4d2bda3
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 24 08:00:50 2011 +0200
rename CppunitTest makefile for consistency
diff --git a/sd/CppUnitTest_sd_uimpress.mk b/sd/CppUnitTest_sd_uimpress.mk
deleted file mode 100644
index a1974c6..0000000
--- a/sd/CppUnitTest_sd_uimpress.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.
-#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon at redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Major Contributor(s):
-#
-# 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,sd_uimpress))
-
-$(eval $(call gb_CppunitTest_add_package_headers,sd_uimpress,sd_qa_unit))
-
-$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
- $$(INCLUDE) \
- -I$(realpath $(SRCDIR)/sd/inc) \
- -I$(realpath $(SRCDIR)/sd/inc/pch) \
- -I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
-))
-
-$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
- $$(DEFS) \
- -DSD_DLLIMPLEMENTATION \
-))
-
-$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
-
-$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
- avmedia \
- basegfx \
- canvastools \
- comphelper \
- cppcanvas \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- i18nisolang1 \
- sal \
- salhelper \
- sb \
- sfx \
- sot \
- svl \
- svt \
- svxcore \
- svx \
- tk \
- tl \
- ucbhelper \
- utl \
- vcl \
- xo \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
- sd/qa/unit/uimpress \
-))
-
-$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress))
-
-$(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\
- types \
-))
-
-$(eval $(call gb_CppunitTest_add_service_rdbs,sd_uimpress,\
- sd_uimpress \
-))
-
-$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
- --headless \
- --invisible \
-))
-
-$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress))
-
-$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\
- framework/util/fwk \
-))
-
-$(eval $(call gb_RdbTarget_add_old_components,sd_uimpress,\
- i18npool \
-))
-
-# vim: set noet sw=4:
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
new file mode 100644
index 0000000..a1974c6
--- /dev/null
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -0,0 +1,105 @@
+# 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.
+#
+# The Initial Developer of the Original Code is
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# 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,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_add_package_headers,sd_uimpress,sd_qa_unit))
+
+$(eval $(call gb_CppunitTest_set_include,sd_uimpress,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/sd/inc) \
+ -I$(realpath $(SRCDIR)/sd/inc/pch) \
+ -I$(OUTDIR)/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_CppunitTest_set_defs,sd_uimpress,\
+ $$(DEFS) \
+ -DSD_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_CppunitTest_add_library_objects,sd_uimpress,sd))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sd_uimpress,\
+ avmedia \
+ basegfx \
+ canvastools \
+ comphelper \
+ cppcanvas \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ i18nisolang1 \
+ sal \
+ salhelper \
+ sb \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svxcore \
+ svx \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sd_uimpress,\
+ sd/qa/unit/uimpress \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sd_uimpress))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sd_uimpress,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sd_uimpress,\
+ sd_uimpress \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sd_uimpress,\
+ --headless \
+ --invisible \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,sd_uimpress))
+
+$(eval $(call gb_RdbTarget_add_components,sd_uimpress,\
+ framework/util/fwk \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sd_uimpress,\
+ i18npool \
+))
+
+# vim: set noet sw=4:
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 899a48f..a4f1298 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_targets,sd,\
))
$(eval $(call gb_Module_add_check_targets,sd,\
- CppUnitTest_sd_uimpress \
+ CppunitTest_sd_uimpress \
))
$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
commit cc8d3a700e7d43a3833a483981bec7a6e63125bd
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 24 07:59:28 2011 +0200
add CppUnit test to check targets
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index bb17b5a..899a48f 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_Module_Module,sd))
$(eval $(call gb_Module_add_targets,sd,\
AllLangResTarget_sd \
- CppUnitTest_sd_uimpress \
Library_sd \
Library_sdd \
Library_sdfilt \
@@ -40,6 +39,10 @@ $(eval $(call gb_Module_add_targets,sd,\
Package_xml \
))
+$(eval $(call gb_Module_add_check_targets,sd,\
+ CppUnitTest_sd_uimpress \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,sd,\
JunitTest_sd_unoapi \
))
More information about the Libreoffice-commits
mailing list