[Libreoffice-commits] .: sc/CppunitTest_sc_ucalc.mk sc/Module_sc.mk sc/Package_qa_unit.mk sc/qa

[David Tardon]

 sc/CppunitTest_sc_ucalc.mk |   42 +++++++++++++++++++++++++----------
 sc/Module_sc.mk            |    1 
 sc/Package_qa_unit.mk      |   44 -------------------------------------
 sc/qa/unit/Makefile        |   53 ---------------------------------------------
 4 files changed, 30 insertions(+), 110 deletions(-)

New commits:
commit d49010cdb93499911264361308a577895b18f8ad
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 24 09:35:45 2011 +0200

    use the new UNO-related defs from CppunitTarget

diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index ad929cd..dd2bd64 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -17,6 +17,7 @@
 # Initial Developer. All Rights Reserved.
 #
 # Major Contributor(s):
+#       David Tardon, Red Hat Inc. <dtardon at redhat.com>
 #
 # For minor contributions see the git repository.
 #
@@ -29,24 +30,12 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,sc_ucalc))
 
-$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
 $(eval $(call gb_CppunitTest_add_package_headers,sc_ucalc,sc_qa_unit))
 
 $(eval $(call gb_CppunitTest_add_exception_objects,sc_ucalc, \
     sc/qa/unit/ucalc \
 ))
 
-$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
-	--headless \
-	--invisible \
-	"-env:UNO_TYPES=$(foreach binrdb,udkapi.rdb types.rdb,\
-		file://$(if $(filter WNT,$(OS)),/)$(OUTDIR)/bin/$(binrdb))" \
-	"-env:UNO_SERVICES=$(foreach rdb,$(OUTDIR)/xml/ure/services.rdb $(WORKDIR)/CustomTarget/sc/qa/unit/services.rdb,\
-		file://$(if $(filter WNT,$(OS)),/)$(rdb))" \
-	$(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR, \
-		-env:$(dir)=file://$(if $(filter WNT,$(OS)),/$(OUTDIR)/bin,$(OUTDIR)/lib)) \
-))
-
 $(eval $(call gb_CppunitTest_add_library_objects,sc_ucalc,sc))
 
 $(eval $(call gb_CppunitTest_add_linked_libs,sc_ucalc, \
@@ -88,4 +77,33 @@ $(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
     -I$(OUTDIR)/inc \
 ))
 
+$(eval $(call gb_CppunitTest_uses_ure,sc_ucalc))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sc_ucalc,\
+    types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sc_ucalc,\
+    sc_ucalc \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sc_ucalc,\
+    --headless \
+    --invisible \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,sc_ucalc))
+
+$(eval $(call gb_RdbTarget_add_components,sc_ucalc,\
+    framework/util/fwk \
+    sfx2/util/sfx \
+    unoxml/source/service/unoxml \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sc_ucalc,\
+    i18npool \
+    ucb1 \
+    ucpfile1 \
+))
+
 # vim: set noet sw=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 73ae040..0b91eee 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -35,7 +35,6 @@ $(eval $(call gb_Module_add_targets,sc,\
 
 $(eval $(call gb_Module_add_check_targets,sc,\
 	CppunitTest_sc_ucalc \
-	Package_qa_unit \
 ))
 
 
diff --git a/sc/Package_qa_unit.mk b/sc/Package_qa_unit.mk
deleted file mode 100644
index 8db8cb7..0000000
--- a/sc/Package_qa_unit.mk
+++ /dev/null
@@ -1,44 +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. 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
-#        Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-#
-# 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,sc_qa_unit,$(WORKDIR)/CustomTarget/sc/qa/unit))
-$(eval $(call gb_Package_add_customtarget,sc_qa_unit,sc/qa/unit))
-
-# dependencies that cause the CustomTarget Makefile to be called recursively for
-# (re)build
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,sc/qa/unit,\
-	$(foreach newcomponentfile,\
-		framework/util/fwk \
-		sfx2/util/sfx \
-		unoxml/source/service/unoxml,\
-	$(OUTDIR)/xml/component/$(newcomponentfile).component) \
-	$(foreach oldcomponentfile, \
-		i18npool \
-		ucb1 \
-		ucpfile1, \
-	$(OUTDIR)/xml/$(oldcomponentfile).component) \
-))
-
-# vim: set noet sw=4:
diff --git a/sc/qa/unit/Makefile b/sc/qa/unit/Makefile
deleted file mode 100644
index 87694f1..0000000
--- a/sc/qa/unit/Makefile
+++ /dev/null
@@ -1,53 +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. 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
-#        Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen at canonical.com> (Canonical Ltd.)
-#
-# 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.
-
-MYDIR := $(realpath $(dir $(firstword $(MAKEFILE_LIST))))
-
-all : services.rdb
-
-services.rdb : $(foreach newcomponentfile,\
-		framework/util/fwk \
-		sfx2/util/sfx \
-		unoxml/source/service/unoxml,\
-	$(OUTDIR)/xml/component/$(newcomponentfile).component \
-)
-
-services.rdb : $(foreach oldcomponentfile, \
-		i18npool \
-		ucb1 \
-		ucpfile1, \
-	$(OUTDIR)/xml/$(oldcomponentfile).component \
-)
-
-services.rdb :
-	echo '<?xml version="1.0"?><components xmlns="http://openoffice.org/2010/uno-components">' > $@
-	$(gb_AWK) -- \
-		'/^<\?xml version.*/ { next; } \
-		{ gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); print; }' \
-		$^ >> $@
-	echo '</components>' >> $@
-
-.PHONY : all
-# vim: set noet sw=4 ts=4: