fix mis-merge
This commit is contained in:
David Tardon
parent
218e880b36
commit
7268a5f961
3 changed files with 0 additions and 110 deletions
|
|
@ -30,23 +30,10 @@
|
|||
|
||||
$(eval $(call gb_CppunitTest_CppunitTest,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, \
|
||||
|
|
|
|||
|
|
@ -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@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@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:
|
||||
|
|
@ -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@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@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:
|
||||
Loading…
Reference in a new issue