[Libreoffice-commits] .: Branch 'feature/gbuild_ure' - 2 commits - solenv/gbuild testtools/CustomTarget_uno_test.mk

[Libreoffice Gerrit user]

 solenv/gbuild/CliAssembly.mk            |    2 +-
 solenv/gbuild/CppunitTest.mk            |    2 ++
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    4 +++-
 solenv/gbuild/platform/com_GCC_defs.mk  |    4 +++-
 testtools/CustomTarget_uno_test.mk      |    4 +++-
 5 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit f5e41d6ba0fe7ddcb0c37f5f442e0c3f4249b632
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 16 12:40:58 2012 +0200

    fix URE deps
    
    Change-Id: Ifbcd2c7db1985ca8fcc74dbbe74ffb93177d6490

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e1fe68d..c31f928 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -154,8 +154,10 @@ endef
 define gb_CppunitTest_use_ure
 $(call gb_CppunitTest_use_rdb,$(1),ure/services)
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(true)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unobootstrapprotector)
 $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Library_get_target,unoexceptionprotector)
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_Package_get_target,cppuhelper_unorc)
 
 endef
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 978fcf4..f06f882 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -49,6 +49,8 @@ ifneq ($(origin CXX),default)
 gb_CXX := $(CXX)
 endif
 
+gb_CPPU_ENV := msci
+
 gb_COMPILERDEFS := \
 	-DMSC \
 	-D_CRT_NON_CONFORMING_SWPRINTFS \
@@ -57,7 +59,7 @@ gb_COMPILERDEFS := \
 	-D_MT \
 	-D_DLL \
 	-DBOOST_MEM_FN_ENABLE_CDECL \
-	-DCPPU_ENV=msci \
+	-DCPPU_ENV=$(gb_CPPU_ENV) \
 	-DM1500 \
 
 gb_CPUDEFS := -D_X86_=1
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index 60ae0c3..dad141d 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -52,9 +52,11 @@ endif
 
 gb_CCVER := $(shell $(gb_CC) -dumpversion | $(gb_AWK) -F. -- '{ print $$1*10000+$$2*100+$$3 }')
 
+gb_CPPU_ENV := gcc3
+
 gb_COMPILERDEFS := \
 	-D$(COM) \
-	-DCPPU_ENV=gcc3 \
+	-DCPPU_ENV=$(gb_CPPU_ENV) \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 gb_CFLAGS_COMMON := \
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index ac907f5..bed453d 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -36,7 +36,9 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
 		$(call gb_Rdb_get_outdir_target,uno_services) \
 		$(call gb_Rdb_get_outdir_target,ure/services) \
 		$(call gb_Executable_get_target_for_build,uno) \
-		$(call gb_InternalUnoApi_get_target,bridgetest)
+		$(call gb_InternalUnoApi_get_target,bridgetest) \
+		$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
+		$(call gb_Package_get_target,cppuhelper_unorc)
 	$(call gb_Helper_abbreviate_dirs,\
 		$(call gb_Executable_get_target_for_build,uno) \
 		-ro $(OUTDIR)/xml/uno_services.rdb \
commit a11ad8aae90b4dbc56a0936835817b089f30d31d
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Sep 16 09:22:50 2012 +0200

    convert file path
    
    Change-Id: I1e6a4b3b787ee503feda04fc27a593dbd8e93d0e

diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 8ada2c7..d068fa5 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -58,7 +58,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	al \
 		-out:$(1) \
 		-version:$(CLI_ASSEMBLY_VERSION) \
-		-keyfile:$(CLI_ASSEMBLY_KEYFILE) \
+		-keyfile:$(call gb_Helper_windows_path,$(CLI_ASSEMBLY_KEYFILE)) \
 		-link:$(CLI_ASSEMBLY_CONFIGFILE) \
 		$(if $(CLI_ASSEMBLY_PLATFORM),-platform:$(CLI_ASSEMBLY_PLATFORM)) \
 )