[Libreoffice-commits] .: 3 commits - lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk lotuswordpro/Module_lotuswordpro.mk lotuswordpro/Package_qa_cppunit.mk lotuswordpro/qa
David Tardon
dtardon at kemper.freedesktop.org
Sun Apr 24 01:07:07 PDT 2011
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 52 +++++++++----
lotuswordpro/Library_lwpft.mk | 4 -
lotuswordpro/Module_lotuswordpro.mk | 1
lotuswordpro/Package_qa_cppunit.mk | 38 ---------
lotuswordpro/qa/cppunit/Makefile | 45 -----------
5 files changed, 38 insertions(+), 102 deletions(-)
New commits:
commit d41eed938b536796a4c06fcf6c77158068a22966
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 24 10:00:00 2011 +0200
keep the linked_libs lists sorted
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index c571d59..8c44695 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -42,10 +42,9 @@ $(eval $(call gb_CppunitTest_add_library_objects,lotuswordpro_test_lotuswordpro,
))
$(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
- vcl \
comphelper \
- cppuhelper \
cppu \
+ cppuhelper \
icui18n \
icuuc \
sal \
@@ -53,8 +52,9 @@ $(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
sot \
svt \
svxcore \
- ucbhelper \
tl \
+ ucbhelper \
+ vcl \
xo \
$(gb_STDLIBS) \
))
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index b9fd74a..db1cf58 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_Library_add_linked_libs,lwpft,\
comphelper \
cppu \
cppuhelper \
+ icui18n \
+ icuuc \
sal \
sfx \
sot \
@@ -45,8 +47,6 @@ $(eval $(call gb_Library_add_linked_libs,lwpft,\
tl \
ucbhelper \
vcl \
- icui18n \
- icuuc \
xo \
$(gb_STDLIBS) \
))
commit 92aea9c0ca4a157605a7d94f77d3e9b328d9ead8
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 24 09:59:16 2011 +0200
use add_linked_objects instead of explicit dep
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 595bc2e..c571d59 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -37,12 +37,25 @@ $(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpr
lotuswordpro/qa/cppunit/test_lotuswordpro \
))
+$(eval $(call gb_CppunitTest_add_library_objects,lotuswordpro_test_lotuswordpro,\
+ lwpft \
+))
+
$(eval $(call gb_CppunitTest_add_linked_libs,lotuswordpro_test_lotuswordpro, \
vcl \
comphelper \
cppuhelper \
cppu \
+ icui18n \
+ icuuc \
sal \
+ sfx \
+ sot \
+ svt \
+ svxcore \
+ ucbhelper \
+ tl \
+ xo \
$(gb_STDLIBS) \
))
@@ -73,8 +86,4 @@ $(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
lotuswordpro/util/lwpfilter,\
))
-# we need to explicitly depend on library lwpft because it is not implied
-# by a link relation
-$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
-
# vim: set noet sw=4:
commit 66e5639ed033575cba7f4afb2ca2881bdef8d29d
Author: David Tardon <dtardon at redhat.com>
Date: Sun Apr 24 09:46:04 2011 +0200
use the new UNO-related defs from CppunitTarget
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index efb1e34..595bc2e 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -16,7 +16,9 @@
# Portions created by the Initial Developer are Copyright (C) 2010 the
# Initial Developer. All Rights Reserved.
#
-# Major Contributor(s): Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# Major Contributor(s):
+# Caolán McNamara, Red Hat, Inc. <caolanm at redhat.com>
+# David Tardon, Red Hat Inc. <dtardon at redhat.com>
#
# For minor contributions see the git repository.
#
@@ -29,24 +31,12 @@
$(eval $(call gb_CppunitTest_CppunitTest,lotuswordpro_test_lotuswordpro))
-$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
$(eval $(call gb_CppunitTest_add_package_headers,lotuswordpro_test_lotuswordpro,lotuswordpro_qa_cppunit))
$(eval $(call gb_CppunitTest_add_exception_objects,lotuswordpro_test_lotuswordpro, \
lotuswordpro/qa/cppunit/test_lotuswordpro \
))
-$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
- --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/lotuswordpro/qa/cppunit/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_linked_libs,lotuswordpro_test_lotuswordpro, \
vcl \
comphelper \
@@ -62,6 +52,27 @@ $(eval $(call gb_CppunitTest_set_include,lotuswordpro_test_lotuswordpro,\
-I$(OUTDIR)/inc \
))
+$(eval $(call gb_CppunitTest_uses_ure,lotuswordpro_test_lotuswordpro))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,lotuswordpro_test_lotuswordpro,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,lotuswordpro_test_lotuswordpro,\
+ lotuswordpro_test_lotuswordpro \
+))
+
+$(eval $(call gb_CppunitTest_set_args,lotuswordpro_test_lotuswordpro,\
+ --headless \
+ --invisible \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,lotuswordpro_test_lotuswordpro))
+
+$(eval $(call gb_RdbTarget_add_components,lotuswordpro_test_lotuswordpro,\
+ lotuswordpro/util/lwpfilter,\
+))
+
# we need to explicitly depend on library lwpft because it is not implied
# by a link relation
$(call gb_CppunitTest_get_target,lotuswordpro_test_lotuswordpro) : $(call gb_Library_get_target,lwpft)
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 59c9a6c..d523bda 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -32,7 +32,6 @@ $(eval $(call gb_Module_add_targets,lotuswordpro,\
))
$(eval $(call gb_Module_add_check_targets,lotuswordpro,\
- Package_qa_cppunit \
CppunitTest_lotuswordpro_test_lotuswordpro \
))
diff --git a/lotuswordpro/Package_qa_cppunit.mk b/lotuswordpro/Package_qa_cppunit.mk
deleted file mode 100644
index acd0901..0000000
--- a/lotuswordpro/Package_qa_cppunit.mk
+++ /dev/null
@@ -1,38 +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.)
-# , Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-#
-# 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,lotuswordpro_qa_cppunit,$(WORKDIR)/CustomTarget/lotuswordpro/qa/cppunit))
-$(eval $(call gb_Package_add_customtarget,lotuswordpro_qa_cppunit,lotuswordpro/qa/cppunit))
-
-# dependencies that cause the CustomTarget Makefile to be called recursively for
-# (re)build
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,lotuswordpro/qa/cppunit,\
- $(foreach newcomponentfile,\
- lotuswordpro/util/lwpfilter,\
- $(OUTDIR)/xml/component/$(newcomponentfile).component) \
-))
-
-# vim: set noet sw=4:
diff --git a/lotuswordpro/qa/cppunit/Makefile b/lotuswordpro/qa/cppunit/Makefile
deleted file mode 100644
index 543bd56..0000000
--- a/lotuswordpro/qa/cppunit/Makefile
+++ /dev/null
@@ -1,45 +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.)
-# , Caolán McNamara <caolanm at redhat.com> (Red Hat, Inc.)
-#
-# 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,\
- lotuswordpro/util/lwpfilter,\
- $(OUTDIR)/xml/component/$(newcomponentfile).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:
More information about the Libreoffice-commits
mailing list