reenable ucalc.cxx unittest in gbuild

5 files changed, 193 insertions, 132 deletions

diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
new file mode 100644
index 000000000000..0c857abfeb32
--- /dev/null
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -0,0 +1,90 @@
+#*************************************************************************
+# 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
+#       Bjoern Michaelsen, Canonical Ltd. <bjoern.michaelsen@canonical.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,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, \
+    avmedia \
+    basegfx \
+    comphelper \
+    cppu \
+    cppuhelper \
+    drawinglayer \
+    editeng \
+    for \
+    forui \
+    i18nisolang1 \
+    sal \
+    salhelper \
+    sb \
+    sfx \
+    sot \
+    svl \
+    svt \
+    svx \
+    svxcore \
+    tk \
+    tl \
+    ucbhelper \
+    utl \
+    vbahelper \
+    vcl \
+    xo \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sc_ucalc,\
+    -I$(realpath $(SRCDIR)/sc/inc/pch) \
+    -I$(realpath $(SRCDIR)/sc/source/ui/inc) \
+    -I$(realpath $(SRCDIR)/sc/inc) \
+    $$(INCLUDE) \
+    -I$(OUTDIR)/inc/offuh \
+    -I$(OUTDIR)/inc \
+))
+
+# vim: set noet sw=4:
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6878587be498..9a250165b2d7 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -33,3 +33,9 @@ $(eval $(call gb_Module_add_targets,sc,\
         Package_xml \
 ))
 
+$(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
new file mode 100644
index 000000000000..8db8cb798f07
--- /dev/null
+++ b/sc/Package_qa_unit.mk
@@ -0,0 +1,44 @@
+# 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:
diff --git a/sc/qa/unit/Makefile b/sc/qa/unit/Makefile
new file mode 100644
index 000000000000..7bdedd0163ce
--- /dev/null
+++ b/sc/qa/unit/Makefile
@@ -0,0 +1,53 @@
+# 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); print; }' \
+		$^ >> $@
+	echo '</components>' >> $@
+
+.PHONY : all
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
deleted file mode 100644
index d252433fd56b..000000000000
--- a/sc/qa/unit/makefile.mk
+++ /dev/null
@@ -1,132 +0,0 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#
-# 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
-#       Novell, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s):  Michael Meeks <michael.meeks@novell.com>
-#                  Caolan McNamara <caolanm@redhat.com>
-#
-# 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.
-#
-
-PRJ=..$/..
-PRJNAME=sc
-TARGET=qa_unit
-
-ENABLE_EXCEPTIONS=TRUE
-
-.INCLUDE : settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS) -I../../source/ui/inc
-
-SHL1TARGET = $(TARGET)
-SHL1OBJS = $(SLO)$/ucalc.obj
-SHL1STDLIBS=       \
-    $(BASICLIB)	\
-    $(VBAHELPERLIB) \
-    $(SFXLIB)		\
-    $(SVTOOLLIB)	\
-    $(SVLLIB)		\
-    $(SVXCORELIB)		\
-    $(EDITENGLIB)		\
-    $(SVXLIB)		\
-    $(BASEGFXLIB) \
-    $(DRAWINGLAYERLIB) \
-    $(VCLLIB)		\
-    $(CPPULIB)		\
-    $(CPPUHELPERLIB)	\
-    $(COMPHELPERLIB)	\
-    $(UCBHELPERLIB)	\
-    $(TKLIB)		\
-    $(VOSLIB)		\
-    $(SALLIB)		\
-    $(SALHELPERLIB)	\
-    $(TOOLSLIB)	\
-    $(I18NISOLANGLIB) \
-    $(UNOTOOLSLIB) \
-    $(SOTLIB)		\
-    $(XMLOFFLIB)	\
-    $(AVMEDIALIB) \
-    $(FORLIB) \
-    $(FORUILIB) \
-    $(CPPUNITLIB)
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/scalc3.lib $(SLB)$/scalc3c.lib 
-DEF1NAME = $(SHL1TARGET)
-SHL1VERSIONMAP=version.map
-
-.INCLUDE: target.mk
-
-.IF "$(OS)" == "WNT"
-my_file = file:///
-.ELSE
-my_file = file://
-.END
-
-ALLTAR: test
-
-test_components = \
-    component/framework/util/fwk \
-    component/sfx2/util/sfx \
-    component/unoxml/source/service/unoxml \
-    ucb1 \
-    ucpfile1 \
-    i18npool
-
-#Make a services.rdb with the services we know we need to get up and running
-$(MISC)/$(TARGET)/services.input : makefile.mk
-    $(MKDIRHIER) $(@:d)
-    echo \
-        '<list>$(test_components:^"<filename>":+".component</filename>")</list>' \
-        > $@
-
-$(MISC)/$(TARGET)/services.rdb .ERRREMOVE : makefile.mk $(MISC)/$(TARGET)/services.input
-    $(MKDIRHIER) $(@:d)
-    $(XSLTPROC) --nonet --stringparam prefix $(SOLARXMLDIR)/ -o $@.tmp \
-        $(SOLARENV)/bin/packcomponents.xslt $(MISC)/$(TARGET)/services.input
-    cat $(MISC)/$@.tmp | sed 's|/program/|/|g' > $@
-
-#Tweak things so that we use the .res files in the solver
-STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
-.EXPORT : STAR_RESOURCEPATH
-
-.IF "$(OS)" != "DRAGONFLY"
-
-test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb
-    @echo ----------------------------------------------------------
-    @echo - start unit test \#1 on library $(SHL1TARGETN)
-    @echo ----------------------------------------------------------
-    $(CPPUNITTESTER) $(SHL1TARGETN) --headless --invisible \
-        '-env:UNO_TYPES=$(my_file)$(SOLARBINDIR)/udkapi.rdb $(my_file)$(SOLARBINDIR)$/types.rdb' \
-        '-env:UNO_SERVICES=$(my_file)$(SOLARXMLDIR)/ure/services.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb'\
-        -env:URE_INTERNAL_LIB_DIR="$(my_file)$(SOLARSHAREDBIN)" \
-        -env:OOO_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)" \
-        -env:BRAND_BASE_DIR="$(my_file)$(SOLARSHAREDBIN)"
-
-.ELSE
-
-test .PHONY: $(SHL1TARGETN)
-    @echo ----------------------------------------------------------
-    @echo - WARNING!!, test disabled on your platform
-    @echo - Please test manually, and enable if it works
-    @echo ----------------------------------------------------------
-
-.ENDIF