[Libreoffice-commits] core.git: 5 commits - crashrep/CustomTarget_crashrep_res.mk external/liblangtag include/unotest shell/CustomTarget_shlxthdl_res.mk solenv/gbuild test/Package_unittest.mk unotest/source

Michael Stahl mstahl at redhat.com
Tue Oct 29 01:03:10 CET 2013 

 crashrep/CustomTarget_crashrep_res.mk               |    1 
 external/liblangtag/ExternalPackage_langtag_data.mk |   30 --------------------
 external/liblangtag/Module_liblangtag.mk            |    1 
 include/unotest/bootstrapfixturebase.hxx            |    2 -
 shell/CustomTarget_shlxthdl_res.mk                  |    2 -
 solenv/gbuild/AllLangResTarget.mk                   |    8 -----
 solenv/gbuild/CppunitTest.mk                        |   21 ++------------
 solenv/gbuild/Gallery.mk                            |    2 -
 solenv/gbuild/TargetLocations.mk                    |    6 ----
 test/Package_unittest.mk                            |    7 ----
 unotest/source/cpp/bootstrapfixturebase.cxx         |    5 ---
 11 files changed, 10 insertions(+), 75 deletions(-)

New commits:
commit 18c702a8e14ae5a5335b78647d3bccbe6067858d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Oct 29 00:12:52 2013 +0100

    gbuild: move unittest mock profile to WORKDIR
    
    Change-Id: Idd6420a855fec8b44fce6c0694b491d5f1eec95e

diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index 556204b..cd4cff4 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -36,8 +36,6 @@ class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture
 protected:
   OUString m_aSrcRootURL;
   OUString m_aSrcRootPath;
-  OUString m_aSolverRootURL;
-  OUString m_aSolverRootPath;
   OUString m_aWorkdirRootURL;
   OUString m_aWorkdirRootPath;
 
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 87c5cec..5fe8e95 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -293,10 +293,10 @@ $(call gb_CppunitTest_get_target,$(1)) : HEADLESS=
 
 endef
 
-# Use configuration in $(OUTDIR)/unittest/registry.
+# Use configuration in $(WORKDIR)/unittest/registry.
 define gb_CppunitTest_use_unittest_configuration
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,test_unittest)
-$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry)
+$(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(WORKDIR)/unittest/registry)
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 704cf80..0025f30 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -31,7 +31,7 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/pck \
 	$(OUTDIR)/res \
 	$(OUTDIR)/share \
-	$(OUTDIR)/unittest \
+	$(WORKDIR)/unittest \
 
 gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
 # kind of lame but with just 3 of these why bother with registration etc.
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 8cead93..a21388a 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,test_unittest,$(SRCDIR)/test/user-template))
 
-$(eval $(call gb_Package_set_outdir,test_unittest,$(OUTDIR)))
+$(eval $(call gb_Package_set_outdir,test_unittest,$(WORKDIR)))
 
 $(eval $(call gb_Package_add_file,test_unittest,unittest/registry/modifications.xcd,registry/modifications.xcd))
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/wordbook/sl.dic,user/wordbook/sl.dic))
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index fff21d4..5b6f9d3 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -57,9 +57,6 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
     m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );
     m_aSrcRootURL = getFileURLFromSystemPath(m_aSrcRootPath);
 
-    m_aSolverRootPath = OUString::createFromAscii( pSolverRoot );
-    m_aSolverRootURL = getFileURLFromSystemPath(m_aSolverRootPath);
-
     m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot );
     m_aWorkdirRootURL = getFileURLFromSystemPath(m_aWorkdirRootPath);
 
@@ -94,7 +91,7 @@ void test::BootstrapFixtureBase::setUp()
 {
     // set UserInstallation to user profile dir in test/user-template
     rtl::Bootstrap aDefaultVars;
-    OUString sUserInstallURL = m_aSolverRootURL + OUString("/unittest");
+    OUString sUserInstallURL = m_aWorkdirRootURL + OUString("/unittest");
     aDefaultVars.set(OUString("UserInstallation"), sUserInstallURL);
 
     m_xContext = comphelper::getProcessComponentContext();
commit a50682cd93589ad3242beae2ba14a655ab4c867f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 28 23:31:06 2013 +0100

    gbuild: remove gb_CppunitTestFakeExecutable_get_target
    
    ... use the real Executable instead
    
    Change-Id: I46b8374e921b9165a6bb71fba6f6f3459dd18c67

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e108fbc..87c5cec 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -301,20 +301,7 @@ $(call gb_CppunitTest__use_configuration,$(1),xcsxcu,$(OUTDIR)/unittest/registry
 endef
 
 define gb_CppunitTest_use_executable
-$(call gb_CppunitTest_get_target,$(1)) : \
-        $(call gb_CppunitTestFakeExecutable_get_target,$(2))
-
-$(call gb_CppunitTest_get_clean_target,$(1)) : \
-        $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
-
-$(call gb_CppunitTestFakeExecutable_get_target,$(2)) : \
-        $(call gb_Executable_get_target,$(2))
-	$(call gb_Helper_abbreviate_dirs,mkdir -p $$(dir $$@) && cp $$< $$@)
-
-.PHONY : $(call gb_CppunitTestFakeExecutable_get_clean_target,$(2))
-$(call gb_CppunitTestFakeExecutable_get_clean_target,$(2)) :
-	$(call gb_Helper_abbreviate_dirs, \
-        rm -f $(call gb_CppunitTestFakeExecutable_get_target,$(2)))
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Executable_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e8ee181..704cf80 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -72,8 +72,6 @@ gb_ComponentTarget_get_target = $(WORKDIR)/ComponentTarget/$(1).component
 gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$(1).component
 gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
 gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
-gb_CppunitTestFakeExecutable_get_target = \
-    $(OUTDIR)/unittest/install/$(LIBO_BIN_FOLDER)/$(1)
 gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
 gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
 gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
commit bc15aa35db29fba9a5e2a5434777573423cab429
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 28 23:23:39 2013 +0100

    gbuild: remove gb_ResTarget_get_unittest_target
    
    Change-Id: I94994645d737b2ee36939ab91d28aa6953e9b475

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index a38d879..e809a07 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -370,8 +370,7 @@ $(call gb_ResTarget_get_clean_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		rm -f \
 			$(call gb_ResTarget_get_target,$*) \
-			$(call gb_ResTarget_get_imagelist_target,$*) \
-			$(call gb_ResTarget_get_unittest_target,$*))
+			$(call gb_ResTarget_get_imagelist_target,$*))
 
 $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
 		$(gb_ResTarget_RSCDEPS)
@@ -403,14 +402,9 @@ define gb_ResTarget_ResTarget
 $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
 $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3)
 $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2)
-$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_unittest_target,$(1))
 $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1))
 $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
 
-$(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1))
-$(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
-
 endef
 
 define gb_ResTarget_add_file
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 6e0103e..e8ee181 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -34,8 +34,6 @@ gb_PackagePart_get_destinations = \
 	$(OUTDIR)/unittest \
 
 gb_InstallScript_get_target = $(OUTDIR)/bin/$(1)$(gb_InstallScript_EXT)
-gb_ResTarget_get_unittest_target = \
-    $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
commit febbf192651a0ded0d6c24e6a752ff1cb2718213
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 28 23:21:58 2013 +0100

    langtag, test: remove Packages that deliver to OUTDIR/unittest/install
    
    Change-Id: I13145c52bdf4a37e4a92ed653a2f131e09539285

diff --git a/external/liblangtag/ExternalPackage_langtag_data.mk b/external/liblangtag/ExternalPackage_langtag_data.mk
deleted file mode 100644
index 4c7973ad..0000000
--- a/external/liblangtag/ExternalPackage_langtag_data.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag))
-
-$(eval $(call gb_ExternalPackage_set_outdir,langtag_data,$(OUTDIR)))
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag,data/language-subtag-registry.xml))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\
-	data/common/bcp47/calendar.xml \
-	data/common/bcp47/collation.xml \
-	data/common/bcp47/currency.xml \
-	data/common/bcp47/number.xml \
-	data/common/bcp47/timezone.xml \
-	data/common/bcp47/transform.xml \
-	data/common/bcp47/transform_ime.xml \
-	data/common/bcp47/transform_keyboard.xml \
-	data/common/bcp47/transform_mt.xml \
-	data/common/bcp47/transform_private_use.xml \
-	data/common/bcp47/variant.xml \
-))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/external/liblangtag/Module_liblangtag.mk b/external/liblangtag/Module_liblangtag.mk
index 54827d2..670ae35 100644
--- a/external/liblangtag/Module_liblangtag.mk
+++ b/external/liblangtag/Module_liblangtag.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Module_Module,liblangtag))
 
 $(eval $(call gb_Module_add_targets,liblangtag,\
 	UnpackedTarball_langtag \
-	ExternalPackage_langtag_data \
 	ExternalProject_langtag \
 	ExternalPackage_liblangtag_data \
 ))
diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 67dd84a..8cead93 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -21,11 +21,6 @@ $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/sta
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau))
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm))
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/.dummy,empty-directory-dummy))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/layoutlist.xml,user/config/soffice.cfg/simpress/layoutlist.xml))
-$(eval $(call gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/objectlist.xml,user/config/soffice.cfg/simpress/objectlist.xml))
 $(eval $(call gb_Package_add_file,test_unittest,unittest/user/config/psetupl.xpm,user/config/psetupl.xpm))
 
 # vim: set noet sw=4 ts=4:
commit 32a4efb8c5c002e96cbf4b2a1cc4e7d9817dde31
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Oct 28 23:16:52 2013 +0100

    gbuild: stop using stuff in OUTDIR/unittest/install
    
    Change-Id: Icdfe1282d5e636a034ee7d1b16b9a113a9b70492

diff --git a/crashrep/CustomTarget_crashrep_res.mk b/crashrep/CustomTarget_crashrep_res.mk
index 46d1016..6130432 100644
--- a/crashrep/CustomTarget_crashrep_res.mk
+++ b/crashrep/CustomTarget_crashrep_res.mk
@@ -21,7 +21,6 @@ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \
 	$(SRCDIR)/crashrep/source/win32/rctemplate.txt \
 	$(call gb_Executable_get_runtime_dependencies,lngconvex)
 
-#BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)
 $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
 	$(call gb_Helper_abbreviate_dirs,\
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 025dc91..abcdfa0 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
-		BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
+		BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT)) \
 		$(call gb_Executable_get_command,lngconvex) \
 			-ulf $< \
 			-rc $@ \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 963b77a..e108fbc 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -50,7 +50,7 @@ gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppun
 
 define gb_CppunitTest__make_args
 $(HEADLESS) \
-"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)" \
+"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \
 "-env:BRAND_SHARE_SUBDIR=share" \
 $(if $(URE),\
     $(if $(strip $(CONFIGURATION_LAYERS)),\
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index bc60a3b..b61bb02 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -16,7 +16,7 @@ gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
 
 # BRAND_BASE_DIR is for resource files
 define gb_Gallery__make_env_args
-"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install)" \
+"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD))" \
 "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry)" \
 "-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \
 	$(foreach item,$(gb_Gallery__UNO_COMPONENTS),\

More information about the Libreoffice-commits mailing list