[Libreoffice-commits] .: 10 commits - android/qa configmgr/source Library_merged.mk Makefile Module_tail_build.mk postprocess/prj Repository.mk RepositoryModule_ooo.mk smoketest/com smoketest/CppunitTest_smoketest.mk smoketest/data smoketest/Jar_TestExtension.mk smoketest/Makefile smoketest/makefile.mk smoketest/Module_smoketest.mk smoketestoo_native/makefile.mk smoketestoo_native/prj smoketestoo_native/README smoketest/Package_losmoketest.mk smoketest/prj smoketest/README smoketest/Zip_smoketestdoc.mk smoketest/Zip_TestExtension.mk solenv/gbuild svx/Executable_gengal.bin.mk tail_build/prj ucb/source
Matus Kukan
mkukan at kemper.freedesktop.org
Sun Feb 19 10:52:16 PST 2012
Library_merged.mk | 2
Makefile | 32 ++---
Module_tail_build.mk | 6 +
Repository.mk | 1
RepositoryModule_ooo.mk | 1
android/qa/desktop/Makefile | 3
android/qa/sc/Makefile | 3
configmgr/source/configmgr.component | 2
configmgr/source/services.cxx | 2
postprocess/prj/build.lst | 2
smoketest/CppunitTest_smoketest.mk | 71 ++++++++++++
smoketest/Jar_TestExtension.mk | 52 +++++++++
smoketest/Makefile | 7 +
smoketest/Module_smoketest.mk | 50 +++++++++
smoketest/Package_losmoketest.mk | 32 +++++
smoketest/README | 1
smoketest/Zip_TestExtension.mk | 48 ++++++++
smoketest/Zip_smoketestdoc.mk | 69 ++++++++++++
smoketest/com/sun/star/comp/smoketest/TestExtension.idl | 40 -------
smoketest/com/sun/star/comp/smoketest/delzip | 1
smoketest/com/sun/star/comp/smoketest/makefile.mk | 88 ----------------
smoketest/com/sun/star/comp/smoketest/manifest.xml | 1
smoketest/data/makefile.mk | 70 ------------
smoketest/makefile.mk | 47 --------
smoketest/prj/build.lst | 6 -
smoketest/prj/d.lst | 4
smoketest/prj/makefile.mk | 1
smoketestoo_native/README | 1
smoketestoo_native/makefile.mk | 62 -----------
smoketestoo_native/prj/build.lst | 2
solenv/gbuild/CppunitTest.mk | 21 +++
solenv/gbuild/Library.mk | 14 +-
solenv/gbuild/Zip.mk | 12 ++
solenv/gbuild/extensions/pre_MergedLibsList.mk | 4
svx/Executable_gengal.bin.mk | 2
tail_build/prj/build.lst | 2
ucb/source/core/ucb1.component | 2
ucb/source/core/ucbserv.cxx | 2
ucb/source/ucp/file/prov.cxx | 2
ucb/source/ucp/file/ucpfile1.component | 2
40 files changed, 407 insertions(+), 363 deletions(-)
New commits:
commit e5147229c7cf615a107faeb30cd222c51f7f2407
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Feb 19 19:49:57 2012 +0100
fix MinGW build
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 3143e5f..1f080fb 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -71,7 +71,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\
kernel32 \
msvcrt \
- oldnames \
+ $(gb_Library_win32_OLDNAMES) \
user32 \
uwinapi \
))
commit b1a87ca7840ab4ed17e8a775fcd4726c2fc5b75d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Feb 19 00:15:27 2012 +0100
fix handling of component files in mergelibs mode
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 1b7a2aa..31c3e43 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -105,15 +105,19 @@ endef
# But the component target also must be delivered, so a new phony target
# gb_Library__get_final_target has been invented for that purpose...
define gb_Library_set_componentfile
-$(call gb_ComponentTarget_ComponentTarget,$(2),$(call gb_Library__get_componentprefix,$(1)),\
- $(call gb_Library_get_runtime_filename,$(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1))))
-$(call gb_Library__get_final_target,$(1)) : \
+$(call gb_ComponentTarget_ComponentTarget,$(2),\
+ $(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
+ $(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
+$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_get_outdir_target,$(2))
-$(call gb_ComponentTarget_get_target,$(2)) :| $(call gb_Library_get_target,$(1))
-$(call gb_Library_get_clean_target,$(1)) : \
+$(call gb_ComponentTarget_get_target,$(2)) :| \
+ $(call gb_Library_get_target,$(gb_Library__get_name))
+$(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_get_clean_target,$(2))
endef
+gb_Library__get_name = $(if $(filter $(1),$(gb_MERGEDLIBS)),merged,$(1))
+
gb_Library__get_componentprefix = \
$(call gb_Library__get_layer_componentprefix,$(call \
gb_Library_get_layer,$(1)))
commit a62f426993835770a35f6d366047d8d5d6322e12
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 17 23:15:26 2012 +0100
add configmgr, ucb1, ucpfile1, xcr to libmerged
diff --git a/Library_merged.mk b/Library_merged.mk
index b994231..72be071 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
ucbhelper \
utl \
vcl \
- xcr \
+ xmlreader \
$(gb_STDLIBS) \
))
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index c0fbe00..14f5368 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -111,7 +111,6 @@ copy-stuff: buildrcs
bootstrap.uno \
canvastoolslo \
comphelpgcc3 \
- configmgr.uno \
cppcanvaslo \
drawinglayerlo \
expwrap.uno \
@@ -152,9 +151,7 @@ copy-stuff: buildrcs
svllo \
test \
tllo \
- ucb1 \
ucbhelper4gcc3 \
- ucpfile1 \
uno_cppu \
uno_cppuhelpergcc3 \
uno_sal \
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 71d145b..81b8251 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -58,7 +58,6 @@ copy-stuff:
basegfxlo \
bootstrap.uno \
comphelpgcc3 \
- configmgr.uno \
datelo \
expwrap.uno \
fastsax.uno \
@@ -98,9 +97,7 @@ copy-stuff:
textinstream.uno \
test \
tllo \
- ucb1 \
ucbhelper4gcc3 \
- ucpfile1 \
uno_cppu \
uno_cppuhelpergcc3 \
uno_sal \
diff --git a/configmgr/source/configmgr.component b/configmgr/source/configmgr.component
index 9ad4c79..4cc8f1b 100755
--- a/configmgr/source/configmgr.component
+++ b/configmgr/source/configmgr.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="configmgr"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.configuration.ConfigurationProvider">
<service name="com.sun.star.configuration.ConfigurationProvider"/>
diff --git a/configmgr/source/services.cxx b/configmgr/source/services.cxx
index 656f9d4..72d6101 100644
--- a/configmgr/source/services.cxx
+++ b/configmgr/source/services.cxx
@@ -87,7 +87,7 @@ static cppu::ImplementationEntry const services[] = {
}
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL configmgr_component_getFactory(
char const * pImplName, void * pServiceManager, void * pRegistryKey)
{
return cppu::component_getFactoryHelper(
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index a7dfc22..3bcab1a 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -31,6 +31,7 @@ ifeq ($(MERGELIBS),TRUE)
gb_MERGEDLIBS := \
avmedia \
canvastools \
+ configmgr \
cppcanvas \
deploymentmisc \
drawinglayer \
@@ -51,7 +52,10 @@ gb_MERGEDLIBS := \
svx \
svxcore \
tk \
+ ucb1 \
+ ucpfile1 \
uui \
+ xcr \
xo \
endif
diff --git a/ucb/source/core/ucb1.component b/ucb/source/core/ucb1.component
index e9d4088..7dff311 100644
--- a/ucb/source/core/ucb1.component
+++ b/ucb/source/core/ucb1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucb"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.CommandEnvironment">
<service name="com.sun.star.ucb.CommandEnvironment"/>
diff --git a/ucb/source/core/ucbserv.cxx b/ucb/source/core/ucbserv.cxx
index 33a6892..1eb6ddb 100644
--- a/ucb/source/core/ucbserv.cxx
+++ b/ucb/source/core/ucbserv.cxx
@@ -40,7 +40,7 @@ using ::rtl::OUString;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucb_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx
index c71191a..bd9889e 100644
--- a/ucb/source/ucp/file/prov.cxx
+++ b/ucb/source/ucp/file/prov.cxx
@@ -49,7 +49,7 @@ using namespace com::sun::star::ucb;
using namespace com::sun::star::container;
//=========================================================================
-extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * )
{
void * pRet = 0;
diff --git a/ucb/source/ucp/file/ucpfile1.component b/ucb/source/ucp/file/ucpfile1.component
index 2803245..7cfe70c 100644
--- a/ucb/source/ucp/file/ucpfile1.component
+++ b/ucb/source/ucp/file/ucpfile1.component
@@ -26,7 +26,7 @@
*
**********************************************************************-->
-<component loader="com.sun.star.loader.SharedLibrary"
+<component loader="com.sun.star.loader.SharedLibrary" prefix="ucpfile"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.ucb.FileProvider">
<service name="com.sun.star.ucb.FileContentProvider"/>
commit 0fd044f85f92ad76b07c44f95bb1b810834d3805
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Feb 17 20:49:40 2012 +0100
add configmgr to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a558491..aee973b 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
bean \
canvas \
chart2 \
+ configmgr \
cppcanvas \
cui \
dbaccess \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 6eda238..dd6ae9f 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib apple_remote basebmp basegfx bridges comphelper configmgr DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi un
oil unotest unotools ure DESKTOP:xmlhelp xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib apple_remote basebmp basegfx bridges comphelper DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi unoil unotes
t unotools ure DESKTOP:xmlhelp xmlreader xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 6cc03d286ad22c2e2945bbf34631fc98776bb95d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Feb 15 00:15:16 2012 +0100
tail_build: add test, toolkit, vcl, xmlscript
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index a057bbb..a558491 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -74,16 +74,20 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
svx \
sw \
swext \
+ test \
+ toolkit \
ucb \
UnoControls \
unoxml \
uui \
vbahelper \
+ vcl \
wizards \
writerfilter \
writerperfect \
xmerge \
xmloff \
+ xmlscript \
xmlsecurity \
))
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index 5861359..6eda238 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain XPDF:xpdf ZLIB:zlib basegfx bridges comphelper configmgr DBCONNECTIVITY:connectivity cppu cppuhelper javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal salhelper sax shell solenv soltools sot stoc svl sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl DESKTOP:xmlhelp xmlscript xsltml NULL
+tb tail_build : AFMS:afms APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost CAIRO:cairo CURL:curl FONTCONFIG:fontconfig FREETYPE:freetype GRAPHITE:graphite HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools JPEG:jpeg LIBCDR:libcdr LIBCMIS:libcmis LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SANE:sane SAXON:saxon TRANSLATIONS:translations TWAIN:twain X11_EXTENSIONS:x11_extensions XPDF:xpdf ZLIB:zlib apple_remote basebmp basegfx bridges comphelper configmgr DBCONNECTIVITY:connectivity cppu cppuhelper cpputools i18npool i18nutil icc javaunohelper jurt jvmaccess jvmfwk offapi officecfg oovbaapi QADEVOOO:qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar rsc sal salhelper sax shell solenv soltools sot stoc svl sysui tools ucbhelper udkapi un
oil unotest unotools ure DESKTOP:xmlhelp xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit 6468e140a199c64d2d748060118e1fc62599adec
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Thu Feb 16 12:36:59 2012 +0100
gbuild: add gb_CppunitTest_abort_on_assertion for smoketest
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
index da2538c..c2d4f2f 100644
--- a/smoketest/CppunitTest_smoketest.mk
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -27,6 +27,8 @@
$(eval $(call gb_CppunitTest_CppunitTest,smoketest))
+$(eval $(call gb_CppunitTest_abort_on_assertion,smoketest))
+
$(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\
smoketest/smoketest \
))
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0d8959e..15e5aa1 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -52,7 +52,7 @@ endif
# gb_CppunitTest_get_filename
# DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions do not pop up as message box, but are routed to the shell
gb_CppunitTest_CPPTESTTARGET := $(call gb_Executable_get_target,cppunit/cppunittester)
-gb_CppunitTest_CPPTESTCOMMAND := $(gb_CppunitTest_CPPTESTPRECOMMAND) $(if $(G_SLICE),G_SLICE=$(G_SLICE)) $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) DBGSV_ERROR_OUT=shell STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET)
+
gb_CppunitTest__get_linktargetname = CppunitTest/$(call gb_CppunitTest_get_filename,$(1))
# TODO: move this to platform under suitable name
@@ -83,7 +83,16 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_CPPTESTTARGET)
$(call gb_Output_announce,$*,$(true),CUT,2)
$(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $@) && \
- ($(gb_CppunitTest_CPPTESTCOMMAND) $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false))))
+ ($(gb_CppunitTest_CPPTESTPRECOMMAND) \
+ $(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
+ $(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \
+ $(if $(DBGSV_ERROR_OUT),DBGSV_ERROR_OUT=$(DBGSV_ERROR_OUT)) \
+ $(if $(SAL_DIAGNOSE_ABORT),SAL_DIAGNOSE_ABORT=$(SAL_DIAGNOSE_ABORT)) \
+ STAR_RESOURCEPATH=$(dir $(call gb_ResTarget_get_outdir_target,example)) \
+ $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTTARGET) \
+ $(call gb_LinkTarget_get_target,CppunitTest/$(call gb_CppunitTest_get_libfilename,$*)) \
+ $(call gb_CppunitTest__make_args,$(ARGS),$(UNO_SERVICES),$(UNO_TYPES)) \
+ $(if $(gb_CppunitTest__interactive),,> $@.log 2>&1 || (cat $@.log && $(UNIT_FAILED_MSG) && false))))
define gb_CppunitTest_CppunitTest
$(call gb_CppunitTest__CppunitTest_impl,$(1),$(call gb_CppunitTest__get_linktargetname,$(1)))
@@ -111,10 +120,18 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS :=
$(call gb_CppunitTest_get_target,$(1)) : URE := $(false)
$(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES :=
$(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES :=
+$(call gb_CppunitTest_get_target,$(1)) : DBGSV_ERROR_OUT := shell
+$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT :=
$$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1))))
endef
+define gb_CppunitTest_abort_on_assertion
+$(call gb_CppunitTest_get_target,$(1)) : DBGSV_ERROR_OUT := abort
+$(call gb_CppunitTest_get_target,$(1)) : SAL_DIAGNOSE_ABORT := TRUE
+
+endef
+
define gb_CppunitTest_set_args
$(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
commit eb7ee4d1d3ca9ead8ee66079fc205c560ac30d0f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Feb 14 23:36:57 2012 +0100
Makefile: adapt to gbuild'ized smoketest, create target for installing
diff --git a/Makefile b/Makefile
index bd16840..8ebbe46 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-.PHONY : all bootstrap build check clean clean-build clean-host dev-install dev-install-link distclean distro-pack-install docs fetch findunusedcode id install subsequenttest tags
+.PHONY : all bootstrap build check clean clean-build clean-host dev-install distclean distro-pack-install docs fetch findunusedcode id install subsequentcheck tags
ifeq ($(MAKECMDGOALS),)
MAKECMDGOALS:=all
@@ -396,14 +396,17 @@ install:
echo "Installation finished, you can now execute:" && \
echo "$(INSTALLDIR)/program/soffice"
-dev-install-link:
+dev-install: build
+ @rm -rf $(OUTDIR)/installation
+ @mkdir $(OUTDIR)/installation
+ifeq ($(DISABLE_LINKOO),TRUE)
+ @ooinstall $(OUTDIR)/installation/opt
+ @install-gdb-printers -L
+else
+ @ooinstall -l $(OUTDIR)/installation/opt
+endif
@rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
-dev-install: dev-install-link
- cd smoketestoo_native && \
- unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-
distro-pack-install: install
$(SRCDIR)/bin/distro-install-clean-up
$(SRCDIR)/bin/distro-install-desktop-integration
@@ -436,22 +439,14 @@ findunusedcode:
| grep -v ^salhelper:: \
> unusedcode.easy
-check: subsequentcheck_after_build
+check: subsequentcheck
-subsequentcheck_after_build: build dev-install-link
- @cd smoketestoo_native && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
-
-subsequentcheck: smoketestoo_native
+subsequentcheck: dev-install
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile subsequentcheck
debugrun:
$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile debugrun
-slowcheck:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f post.Makefile slowcheck
-
endif # not clean or distclean
commit a391a096bd3e0f96ba21cc42ee7dd46c7faeb2b2
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Feb 12 13:39:52 2012 +0100
gbuild'ize smoketest(oo_native) and merge them
Add smoketest to tail_build and make it a subsequentcheck target.
diff --git a/Makefile b/Makefile
index cb99243..bd16840 100644
--- a/Makefile
+++ b/Makefile
@@ -96,6 +96,7 @@ scripting\
sd\
sfx2\
slideshow\
+smoketest\
sot\
starmath\
svl\
@@ -219,8 +220,6 @@ scp2\
sdext\
setup_native\
shell\
-smoketest\
-smoketestoo_native\
solenv\
soltools\
stax\
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 362434d..a057bbb 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
sd \
sfx2 \
slideshow \
+ smoketest \
starmath \
svtools \
svx \
diff --git a/Repository.mk b/Repository.mk
index 35ded73..e164ac4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -363,6 +363,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
package2 \
reg \
scriptframe \
+ smoketest \
sofficeapp \
srtrs1 \
store \
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 8859503..28378aa 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -99,6 +99,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sd \
sfx2 \
slideshow \
+ smoketest \
sot \
starmath \
svl \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index aa756e5..deb1fb8 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport smoketest tail_build NULL
+po postprocess :: BINFILTER:binfilter CRASHREP:crashrep CT2N:ct2n embeddedobj embedserv EPM:epm extras HELP:helpcontent2 LIBRSVG:librsvg ODK:odk DESKTOP:scp2 testtools wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --git a/smoketest/CppunitTest_smoketest.mk b/smoketest/CppunitTest_smoketest.mk
new file mode 100644
index 0000000..da2538c
--- /dev/null
+++ b/smoketest/CppunitTest_smoketest.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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,smoketest))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,smoketest,\
+ smoketest/smoketest \
+))
+
+$(eval $(call gb_CppunitTest_add_api,smoketest,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,smoketest,\
+ cppu \
+ cppuhelper \
+ sal \
+ unotest \
+))
+
+ifeq ($(OS),MACOSX)
+my_soffice:=path:$(OUTDIR)/installation/opt/LibreOffice.app/Contents/MacOS/soffice
+else
+my_soffice:=path:$(OUTDIR)/installation/opt/program/soffice
+endif
+
+$(eval $(call gb_CppunitTest_set_args,smoketest,\
+ -env:UNO_SERVICES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/xml/ure/services.rdb) \
+ -env:UNO_TYPES=$(call gb_CppunitTarget__make_url,$(OUTDIR)/bin/types.rdb) \
+ -env:arg-soffice=$(my_soffice) \
+ -env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
+ -env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
+ -env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \
+ --protector $(call gb_Library_get_target,unoexceptionprotector) \
+ unoexceptionprotector \
+))
+
+$(call gb_CppunitTest_get_target,smoketest): clean_CustomTarget_smoketest
+
+clean_CustomTarget_smoketest:
+ rm -rf $(WORKDIR)/CustomTarget/smoketest
+ mkdir -p $(WORKDIR)/CustomTarget/smoketest
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Jar_TestExtension.mk b/smoketest/Jar_TestExtension.mk
new file mode 100644
index 0000000..8276cc5
--- /dev/null
+++ b/smoketest/Jar_TestExtension.mk
@@ -0,0 +1,52 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Jar_Jar,TestExtension))
+
+$(eval $(call gb_Jar_set_manifest,TestExtension,$(SRCDIR)/smoketest/com/sun/star/comp/smoketest/MANIFEST.MF))
+
+$(eval $(call gb_Jar_set_jarclasspath,TestExtension,\
+ juh.jar \
+ jurt.jar \
+ ridl.jar \
+ unoil.jar \
+))
+
+$(eval $(call gb_Jar_add_jars,TestExtension,\
+ $(OUTDIR)/bin/juh.jar \
+ $(OUTDIR)/bin/jurt.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,TestExtension,com))
+
+$(eval $(call gb_Jar_add_sourcefiles,TestExtension,\
+ smoketest/com/sun/star/comp/smoketest/TestExtension \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Makefile b/smoketest/Makefile
new file mode 100644
index 0000000..ccb1c85
--- /dev/null
+++ b/smoketest/Makefile
@@ -0,0 +1,7 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
new file mode 100644
index 0000000..0ef1c52
--- /dev/null
+++ b/smoketest/Module_smoketest.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Module_Module,smoketest))
+
+ifeq ($(CROSS_COMPILING),)
+
+$(eval $(call gb_Module_add_targets,smoketest,\
+ Package_losmoketest \
+ Zip_smoketestdoc \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,smoketest,\
+ Jar_TestExtension \
+ Zip_TestExtension \
+))
+endif
+
+$(eval $(call gb_Module_add_subsequentcheck_targets,smoketest,\
+ CppunitTest_smoketest \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Package_losmoketest.mk b/smoketest/Package_losmoketest.mk
new file mode 100644
index 0000000..b8dfba5
--- /dev/null
+++ b/smoketest/Package_losmoketest.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Package_Package,smoketest_losmoketest,$(SRCDIR)/smoketest))
+
+$(eval $(call gb_Package_add_file,smoketest_losmoketest,bin/losmoketest,losmoketest))
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/README b/smoketest/README
new file mode 100644
index 0000000..1027041
--- /dev/null
+++ b/smoketest/README
@@ -0,0 +1 @@
+Smoke test for each component of LibreOffice.
diff --git a/smoketest/Zip_TestExtension.mk b/smoketest/Zip_TestExtension.mk
new file mode 100644
index 0000000..b332f43
--- /dev/null
+++ b/smoketest/Zip_TestExtension.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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_Zip_Zip,TestExtension,$(WORKDIR)/Zip/TestExtension))
+
+$(eval $(call gb_Zip_add_file,TestExtension,TestExtension.jar,\
+ $(call gb_Jar_get_outdir_target,TestExtension) \
+))
+
+$(eval $(call gb_Zip_add_file,TestExtension,META-INF/manifest.xml,\
+ $(SRCDIR)/smoketest/com/sun/star/comp/smoketest/manifest.xml \
+))
+
+$(call gb_Zip_get_final_target,TestExtension) : $(OUTDIR)/bin/TestExtension.oxt
+$(call gb_Zip_get_clean_target,TestExtension) : Clean_TestExtension_oxt
+
+$(OUTDIR)/bin/TestExtension.oxt : $(call gb_Zip_get_target,TestExtension)
+ $(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_TestExtension_oxt
+Clean_TestExtension_oxt :
+ rm -f $(OUTDIR)/bin/TestExtension.oxt
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/Zip_smoketestdoc.mk b/smoketest/Zip_smoketestdoc.mk
new file mode 100644
index 0000000..c27d326
--- /dev/null
+++ b/smoketest/Zip_smoketestdoc.mk
@@ -0,0 +1,69 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# 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.
+
+SMOKETESTDOC_DIR:=$(SRCDIR)/smoketest/data
+
+$(eval $(call gb_Zip_Zip,smoketestdoc,$(WORKDIR)/Zip/smoketestdoc))
+
+$(eval $(call gb_Zip_add_commandoptions,smoketestdoc,-D))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,mimetype))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,content.xml,$(SMOKETESTDOC_DIR)/content.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,meta.xml,$(SMOKETESTDOC_DIR)/meta.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,settings.xml,$(SMOKETESTDOC_DIR)/settings.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,styles.xml,$(SMOKETESTDOC_DIR)/styles.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,META-INF/manifest.xml,$(SMOKETESTDOC_DIR)/manifest.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/script-lc.xml,$(SMOKETESTDOC_DIR)/script-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/script-lb.xml,$(SMOKETESTDOC_DIR)/script-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Events.xml,$(SMOKETESTDOC_DIR)/Events.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Global.xml,$(SMOKETESTDOC_DIR)/Global.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_10er.xml,$(SMOKETESTDOC_DIR)/Test_10er.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_DB.xml,$(SMOKETESTDOC_DIR)/Test_DB.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Basic/Standard/Test_Ext.xml,$(SMOKETESTDOC_DIR)/Test_Ext.xml))
+
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/dialog-lc.xml,$(SMOKETESTDOC_DIR)/dialog-lc.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/dialog-lb.xml,$(SMOKETESTDOC_DIR)/dialog-lb.xml))
+$(eval $(call gb_Zip_add_file,smoketestdoc,Dialogs/Standard/OptionsDlg.xml,$(SMOKETESTDOC_DIR)/OptionsDlg.xml))
+
+$(WORKDIR)/Zip/smoketestdoc/mimetype :
+ mkdir -p $(dir $@)
+ printf application/vnd.sun.xml.writer > $@
+
+$(call gb_Zip_get_final_target,smoketestdoc) : $(OUTDIR)/bin/smoketestdoc.sxw
+$(call gb_Zip_get_clean_target,smoketestdoc) : Clean_smoketestdoc_sxw
+
+$(OUTDIR)/bin/smoketestdoc.sxw : $(call gb_Zip_get_target,smoketestdoc)
+ $(call gb_Deliver_deliver,$<,$@)
+
+.PHONY : Clean_smoketestdoc_sxw
+Clean_smoketestdoc_sxw :
+ rm -f $(OUTDIR)/bin/smoketestdoc.sxw
+
+# vim: set noet sw=4 ts=4:
diff --git a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl b/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
deleted file mode 100644
index 83c370e..0000000
--- a/smoketest/com/sun/star/comp/smoketest/TestExtension.idl
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _com_sun_star_comp_smoketest_TestExtension_idl_
-#define _com_sun_star_comp_smoketest_TestExtension_idl_
-
-#include <com/sun/star/lang/XServiceInfo.idl>
-
-
-module com { module sun { module star { module comp { module smoketest {
- // example service, XServiceInfo is implemented here for demonstration
- // issues. XServiceInfo must be implemented by all components.
- service TestExtension: ::com::sun::star::lang::XServiceInfo;
-};};};};};
-
-#endif
diff --git a/smoketest/com/sun/star/comp/smoketest/delzip b/smoketest/com/sun/star/comp/smoketest/delzip
deleted file mode 100755
index 636fda9..0000000
--- a/smoketest/com/sun/star/comp/smoketest/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/smoketest/com/sun/star/comp/smoketest/makefile.mk b/smoketest/com/sun/star/comp/smoketest/makefile.mk
deleted file mode 100755
index 88e5370..0000000
--- a/smoketest/com/sun/star/comp/smoketest/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ../../../../..
-PRJNAME = smoketestdoc
-PACKAGE = com/sun/star/comp/smoketest
-TARGET = com_sun_star_comp_smoketest
-
-# --- Settings -----------------------------------------------------
-
-.IF "$(SOLAR_JAVA)" != ""
-
-.INCLUDE : settings.mk
-
-JARFILES = ridl.jar jurt.jar unoil.jar juh.jar
-
-JARTARGET = TestExtension.jar
-JARCOMPRESS = TRUE
-CUSTOMMANIFESTFILE = MANIFEST.MF
-
-ZIP1TARGET=TestExtension
-ZIP1LIST=*
-ZIPFLAGS=-r
-ZIP1DIR=$(MISC)/$(TARGET)
-ZIP1EXT=.oxt
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = TestExtension.java
-
-# --- Targets ------------------------------------------------------
-
-ZIP1DEPS=$(MISC)/$(TARGET)/$(JARTARGET)\
- $(MISC)/$(TARGET)/TestExtension.rdb\
- $(MISC)/$(TARGET)/META-INF/manifest.xml
-
-.INCLUDE : target.mk
-
-.IF "$(depend)" == ""
-$(MISC)/$(TARGET)/META-INF:
- @-$(MKDIRHIER) $(@)
-
-$(MISC)/TestExtension.urd: TestExtension.idl
- $(COMMAND_ECHO)$(IDLC) -O$(MISC) -I$(SOLARIDLDIR) -cid -we $<
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml $(MISC)/$(TARGET)/TestExtension.rdb : $(MISC)/$(TARGET)/META-INF
-
-$(MISC)/$(TARGET)/META-INF/manifest.xml: manifest.xml
- $(COMMAND_ECHO)$(COPY) $< $@
-
-$(MISC)/$(TARGET)/TestExtension.rdb: $(MISC)/TestExtension.urd
- $(COMMAND_ECHO)$(REGMERGE) $@ /UCR $<
-
-$(JAVACLASSFILES) .UPDATEALL: $(MISC)/$(TARGET)/TestExtension.rdb
- $(COMMAND_ECHO)$(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
-
-$(MISC)/$(TARGET)/$(JARTARGET) : $(JARTARGETN)
- $(COMMAND_ECHO)$(COPY) $< $@
-.END
-
-.ELSE
- at all:
- @echo "Java disabled. Nothing to do."
-.ENDIF
diff --git a/smoketest/com/sun/star/comp/smoketest/manifest.xml b/smoketest/com/sun/star/comp/smoketest/manifest.xml
index fcedabf..0e73044 100755
--- a/smoketest/com/sun/star/comp/smoketest/manifest.xml
+++ b/smoketest/com/sun/star/comp/smoketest/manifest.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
<manifest:file-entry manifest:full-path="TestExtension.jar" manifest:media-type="application/vnd.sun.star.uno-component;type=Java"/>
- <manifest:file-entry manifest:full-path="TestExtension.rdb" manifest:media-type="application/vnd.sun.star.uno-typelibrary;type=RDB"/>
</manifest:manifest>
diff --git a/smoketest/data/makefile.mk b/smoketest/data/makefile.mk
deleted file mode 100644
index 6cf2706..0000000
--- a/smoketest/data/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#***********************************************************************/
-
-PRJ = ..
-PRJNAME = smoketestdoc
-TARGET = data
-
-.INCLUDE: settings.mk
-
-$(BIN)/smoketestdoc.sxw: $(MISC)/zip/smoketestdoc.sxw
- $(COPY) $< $@
-
-$(MISC)/zip/smoketestdoc.sxw: \
- Events.xml \
- Global.xml \
- OptionsDlg.xml \
- Test_10er.xml \
- Test_DB.xml \
- Test_Ext.xml \
- content.xml \
- dialog-lb.xml \
- dialog-lc.xml \
- manifest.xml \
- meta.xml \
- script-lb.xml \
- script-lc.xml \
- settings.xml \
- styles.xml
- $(COMMAND_ECHO)$(RM) -r $(MISC)/zip
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip
- $(COMMAND_ECHO)$(COPY) content.xml meta.xml settings.xml styles.xml $(MISC)/zip/
- $(COMMAND_ECHO)printf application/vnd.sun.xml.writer > $(MISC)/zip/mimetype
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/META-INF
- $(COMMAND_ECHO)$(COPY) manifest.xml $(MISC)/zip/META-INF/
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic
- $(COMMAND_ECHO)$(COPY) script-lc.xml $(MISC)/zip/Basic/
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Basic/Standard
- $(COMMAND_ECHO)$(COPY) script-lb.xml Events.xml Global.xml Test_10er.xml Test_DB.xml \
- Test_Ext.xml $(MISC)/zip/Basic/Standard/
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs
- $(COMMAND_ECHO)$(COPY) dialog-lc.xml $(MISC)/zip/Dialogs/
- $(COMMAND_ECHO)$(MKDIR) $(MISC)/zip/Dialogs/Standard
- $(COMMAND_ECHO)$(COPY) dialog-lb.xml OptionsDlg.xml $(MISC)/zip/Dialogs/Standard/
- $(COMMAND_ECHO)cd $(MISC)/zip && zip -rD $(@:f) .
-
-.INCLUDE: target.mk
diff --git a/smoketest/makefile.mk b/smoketest/makefile.mk
deleted file mode 100755
index ef21870..0000000
--- a/smoketest/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = .
-PRJNAME = smoketestoo_native
-TARGET = smoketest
-
-ENABLE_EXCEPTIONS = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-CFLAGSCXX += $(CPPUNIT_CFLAGS)
-
-SLOFILES = $(SHL1OBJS)
-
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1TARGET = smoketest
-SHL1OBJS = $(SLO)/smoketest.obj
-SHL1RPATH = NONE
-SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(CPPUNITLIB) $(SALLIB) $(UNOTESTLIB)
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-.INCLUDE : target.mk
diff --git a/smoketest/prj/build.lst b/smoketest/prj/build.lst
index abec637..1796c63 100644
--- a/smoketest/prj/build.lst
+++ b/smoketest/prj/build.lst
@@ -1,4 +1,2 @@
-smt smoketest :: codemaker javaunohelper soltools test unoil NULL
-smt smoketest\com\sun\star\comp\smoketest nmake - all smoketest_com_sun_star_comp_smoketest NULL
-smt smoketest\data nmake - all smoketest_data NULL
-smt smoketest nmake - all smoketest_mk smoketest_com_sun_star_comp_smoketest smoketest_data NULL
+smt smoketest :: javaunohelper soltools test unoil NULL
+smt smoketest\prj nmake - all smoketest_prj NULL
diff --git a/smoketest/prj/d.lst b/smoketest/prj/d.lst
index 4da25c2..e69de29 100644
--- a/smoketest/prj/d.lst
+++ b/smoketest/prj/d.lst
@@ -1,4 +0,0 @@
-..\losmoketest %_DEST%\bin\losmoketest
-..\%__SRC%\bin\smoketestdoc.sxw %_DEST%\bin\smoketestdoc.sxw
-..\%__SRC%\bin\TestExtension.oxt %_DEST%\bin\TestExtension.oxt
-..\%__SRC%\lib\libsmoketest.* %_DEST%\lib\libsmoketest.*
diff --git a/smoketest/prj/makefile.mk b/smoketest/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/smoketest/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/smoketestoo_native/README b/smoketestoo_native/README
deleted file mode 100644
index 1027041..0000000
--- a/smoketestoo_native/README
+++ /dev/null
@@ -1 +0,0 @@
-Smoke test for each component of LibreOffice.
diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
deleted file mode 100755
index e970162..0000000
--- a/smoketestoo_native/makefile.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-#*************************************************************************
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#***********************************************************************/
-
-PRJ = .
-PRJNAME = smoketestoo_native
-TARGET = smoketest
-ABORT_ON_ASSERTION = TRUE
-
-.INCLUDE: settings.mk
-
-.INCLUDE: target.mk
-.INCLUDE: installationtest.mk
-
-.IF "$(depend)" == ""
-# disable smoketest when cross-compiling for now; we can use wine at some stage (?)
-.IF "$(CROSS_COMPILING)" != "YES"
-ALLTAR : cpptest
-.ELSE
-ALLTAR :
-.END
-.END
-
-TEST_ARGUMENTS = smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw
-CPPTEST_LIBRARY = $(OUTDIR)/lib/$(DLLPRE)smoketest$(DLLPOST)
-
-.IF "$(OS)" != "WNT" || "$(CROSS_COMPILING)" == "YES"
-.IF "$(DISABLE_LINKOO)" == "TRUE"
-my_linkoo =
-.ELSE
-my_linkoo = -l
-.END
-localinstall :
- $(RM) -r $(installationtest_instpath)
- $(MKDIRHIER) $(installationtest_instpath)
- ooinstall $(my_linkoo) $(installationtest_instpath)/opt
-.IF "$(DISABLE_LINKOO)" == "TRUE"
- install-gdb-printers -L
-.END
-cpptest : localinstall
-.END
diff --git a/smoketestoo_native/prj/build.lst b/smoketestoo_native/prj/build.lst
deleted file mode 100644
index 9a43f63..0000000
--- a/smoketestoo_native/prj/build.lst
+++ /dev/null
@@ -1,2 +0,0 @@
-smtoon smoketestoo_native :: instsetoo_native NULL
-smtoon smoketestoo_native nmake - all smtoon_mkout NULL
diff --git a/smoketestoo_native/prj/d.lst b/smoketestoo_native/prj/d.lst
deleted file mode 100644
index e69de29..0000000
commit 8c2a56253abe04b76395e8eea1d2a9d9893601cf
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Feb 12 13:38:35 2012 +0100
gbuild: Zip: allow to add command line options when zipping
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 69e1f40..f4f7b78 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -115,4 +115,9 @@ $(foreach dependency,$(2),$(call gb_Zip_add_dependency,$(1),$(dependency)))
endef
+define gb_Zip_add_commandoptions
+$(call gb_Zip_get_target,$(1)) : gb_Zip_ZIPCOMMAND += $(2)
+
+endef
+
# vim: set noet sw=4 ts=4:
commit 8e85ef05018ba44b142eed75e2a64cc9480a8970
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Feb 12 13:36:56 2012 +0100
gbuild: Zip: clean properly all created targets on 'make clean'
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index f6d492e..69e1f40 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -37,8 +37,9 @@ $(call gb_Zip_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),ZIP,3)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Zip_get_target,$*) && \
- rm -f $(call gb_Zip_get__preparation_target,$*) && \
+ rm -f $(call gb_Zip__get_preparation_target,$*) && \
rm -f $(call gb_Zip_get_final_target,$*) && \
+ $(if $(CLEAR_LOCATION),rm -rf $(gb_Package_Location_$*) &&) \
rm -f $(call gb_Zip_get_outdir_target,$*))
# rule to create zip package in workdir
@@ -71,6 +72,7 @@ $(call gb_Zip__get_preparation_target,%) :
define gb_Zip_Zip
$(call gb_Zip_get_target,$(1)) : FILES :=
$(call gb_Zip_get_target,$(1)) : LOCATION := $(2)
+$(call gb_Zip_get_clean_target,$(1)) : CLEAR_LOCATION :=
gb_Package_Location_$(1) := $(2)
$(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1))))
$(call gb_Deliver_add_deliverable,$(call gb_Zip_get_outdir_target,$(1)),$(call gb_Zip_get_target,$(1)),$(1))
@@ -81,12 +83,15 @@ endef
# adding a file creates a dependency to it
# the full path name of the file needs access to the package location
# as scoped variables only exist in rules, we use a postfixed name to refer to the location
+#
# if package location is in $(WORKDIR) we can specify third parameter and copy file from different place
+# then we need also remove the location on make clean
define gb_Zip_add_file
$(call gb_Zip_get_target,$(1)) : FILES += $(2)
$(call gb_Zip_get_target,$(1)) : $(gb_Package_Location_$(1))/$(2)
$(gb_Package_Location_$(1))/$(2) :| $(call gb_Zip__get_preparation_target,$(1))
ifneq ($(3),)
+$(call gb_Zip_get_clean_target,$(1)) : CLEAR_LOCATION := TRUE
$(gb_Package_Location_$(1))/$(2) : $(3)
mkdir -p $$(dir $$@)
cp -f $$< $$@
More information about the Libreoffice-commits
mailing list