[Libreoffice-commits] .: Branch 'feature/vs2012' - 2 commits - Library_merged.mk oowintool solenv/gbuild

[Libreoffice Gerrit user]

 Library_merged.mk                       |    9 ++++++++-
 oowintool                               |    8 ++++++--
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    8 ++++++++
 3 files changed, 22 insertions(+), 3 deletions(-)

New commits:
commit 61741d4c1cc691fb5c83b470b67d7b81a27ab4d7
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Fri Sep 7 17:01:04 2012 -0400

    add support for libmerged on Windows
    
    Change-Id: I05d1c557967000be2fb7128b43d6e8c6005a7892

diff --git a/Library_merged.mk b/Library_merged.mk
index 9bc7214..a1607f4 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_use_libraries,merged,\
 ))
 
 $(eval $(call gb_Library_use_externals,merged,\
-	icui18n \
 	icule \
 	icuuc \
 	jpeg \
@@ -116,11 +115,19 @@ $(eval $(call gb_Library_use_libraries,merged,\
 	oleaut32 \
 	shell32 \
 	user32 \
+	usp10 \
 	uuid \
 	version \
 	winmm \
 	winspool \
 ))
+$(eval $(call gb_Library_use_externals,merged,\
+	icuin \
+))
+else
+$(eval $(call gb_Library_use_externals,merged,\
+	icui18n \
+))
 endif
 
 ifeq ($(OS),MACOSX)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 4b3fb31..f01fddd 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -340,6 +340,13 @@ gb_LinkTarget_INCLUDE_STL := $(filter %/stl, $(subst -I. , ,$(SOLARINC)))
 
 gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb
 
+# avoid fatal error LNK1170 for Library_merged
+define gb_LinkTarget_MergedResponseFile
+cut -f -1000 -d ' ' $${RESPONSEFILE} > $${RESPONSEFILE}.1 && \
+cut -f 1001- -d ' ' $${RESPONSEFILE} >> $${RESPONSEFILE}.1 && \
+mv $${RESPONSEFILE}.1 $${RESPONSEFILE} &&
+endef
+
 define gb_LinkTarget__command
 $(call gb_Output_announce,$(2),$(true),LNK,4)
 $(call gb_Helper_abbreviate_dirs,\
@@ -353,6 +360,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(foreach object,$(ASMOBJECTS),$(call gb_AsmObject_get_target,$(object))) \
 		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),$(shell cat $(extraobjectlist))) \
 		$(NATIVERES)) && \
+		$(if $(filter $(call gb_Library_get_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \
 	unset INCLUDE && \
 	$(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
commit 709e2103e44536864de0378a92ae6cbc72c2728e
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Fri Sep 7 16:57:12 2012 -0400

    fix msm_path detection
    
    Change-Id: Id507a3483a126f4a04dcb9be287c12a3eae5429c

diff --git a/oowintool b/oowintool
index e8f0b3b..58ea153 100755
--- a/oowintool
+++ b/oowintool
@@ -313,7 +313,9 @@ sub msvc_copy_dlls($)
 sub msvc_find_msms()
 {
     my $ver = find_msvc();
-    my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format);
+    my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) ||
+	(cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) ||
+	(cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format);
     defined $msm_path || die "MSMDir not found";
     return -e "$msm_path/Microsoft_VC".$ver->{'dll_suffix'}."_CRT_x86.msm" ? 0 : 1;
 }
@@ -326,7 +328,9 @@ sub msvc_copy_msms($$)
     my $ver = find_msvc();
     defined $ver || return;
 
-    my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/$ver->{'ver'}/Setup/VS/MSMDir"), 'w', $output_format);
+    my $msm_path = (cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir"), 'w', $output_format) ||
+	(cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/10.0/Setup/VS/MSMDir"), 'w', $output_format) ||
+	(cygpath reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/11.0/Setup/VS/MSMDir"), 'w', $output_format);
     defined $msm_path || die "MSMDir not found";
 	if ($ver->{'dll_suffix'} == 90) {
 	if ( $postfix eq "_x86" ) {