ooo-build r13484 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Wed Aug  6 15:01:54 2008
New Revision: 13484
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13484&view=rev

Log:
2008-08-06  Tor Lillqvist  <tml novell com>

	* patches/dev300/msvs9-temporary-fix.diff
	* patches/dev300/msvs9-temporary-fix-m28.diff: Split into separate
	version for [ < dev300-m29 < ooo300-m1 ] and [ >= dev300-m29 >=
	ooo300-m1 ].

	* patches/dev300/apply: Do it.



Added:
   trunk/patches/dev300/msvs9-temporary-fix-m28.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/msvs9-temporary-fix.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug  6 15:01:54 2008
@@ -156,11 +156,18 @@
 speed-configmgr.diff, i#56783, michael
 
 
-[ TemporaryHacks ]
+[ TemporaryHacks < dev300-m29 < ooo300-m1  ]
+
+# Detect MSVS9 if available
+msvs9-temporary-fix-m28.diff, i#88945, tml
+
+[ TemporaryHacks >= dev300-m29 >= ooo300-m1  ]
 
-# Detect MSVS8 if available
+# Detect MSVS9 if available
 msvs9-temporary-fix.diff, i#88945, tml
 
+[ TemporaryHacks ]
+
 # fix the smoketest
 smoketest-fix.diff, michael, i#84720
 

Added: trunk/patches/dev300/msvs9-temporary-fix-m28.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/msvs9-temporary-fix-m28.diff	Wed Aug  6 15:01:54 2008
@@ -0,0 +1,132 @@
+--- config_office/configure.in
++++ config_office/configure.in
+@@ -1758,6 +1758,12 @@
+ 		  MIDL_PATH="$vstest/Common7/Tools/Bin"
+       fi
+ 	fi
++	if test -z "$MIDL_PATH" ; then
++		psdktest=`./oowintool --psdk-home`
++		if test -x "$psdktest/Bin/midl.exe" ; then
++			MIDL_PATH="$psdktest/Bin"
++		fi
++	fi
+ 	if test ! -x "$MIDL_PATH/midl.exe"; then
+ 		AC_MSG_ERROR([midl.exe not found. Make sure it's in the path or use --with-midl-path])
+ 	fi
+@@ -1809,7 +1809,7 @@
+ 	    fi
+ 	    if test -z "$FRAME_HOME" ; then
+           frametest=`./oowintool --dotnetsdk-dir`
+-          if test -x "$frametest/lib/mscoree.lib"; then
++          if test -f "$frametest/lib/mscoree.lib"; then
+              FRAME_HOME="$frametest"
+           fi
+ 	    fi
+@@ -5046,10 +5046,14 @@
+ fi
+ 
+ dnl ===================================================================
+-dnl Windows builds - attempt to auto-copy required dlls into external/
++dnl Windows builds - use oowintool to copy CRT dlls and manifest
+ dnl ===================================================================
+ if test "$_os" = "WINNT"; then
+-       ./oowintool --msvc-copy-dlls ../external/msvcp
++       if ./oowintool --msvc-copy-dlls ../external/msvcp ; then
++          :
++       else
++          AC_MSG_ERROR([oowintool failed to copy CRT])
++       fi
+ fi
+ 
+ dnl ===================================================================
+@@ -5067,90 +5067,6 @@
+    fi
+ fi
+ 
+-dnl ===================================================================
+-dnl Windows builds with .NET 2003 needs msvcp71.dll/msvcr71.dll in external/msvcp71
+-dnl ===================================================================
+-if test "$_os" = "WINNT" -a "$COMEX" = "10" ; then
+-   AC_MSG_CHECKING([for msvcp71.dll/msvcr71.dll])
+-   if test -x ../external/msvcp71/msvcp71.dll -a -x ../external/msvcp71/msvcr71.dll; then
+-      AC_MSG_RESULT([found])
+-   else
+-      MSVCPPATH=`/bin/find "$COMPATH/../.." -iname msvcp71.dll | head -n 1`
+-      MSVCRPATH=`/bin/find "$COMPATH/../.." -iname msvcr71.dll | head -n 1`
+-      if test -n "$MSVCPPATH" -a -n "$MSVCRPATH"; then
+-         cp "$MSVCPPATH" ../external/msvcp71/ && chmod +x ../external/msvcp71/msvcp71.dll && MSVCPCOPY="OK"
+-         cp "$MSVCRPATH" ../external/msvcp71/ && chmod +x ../external/msvcp71/msvcr71.dll && MSVCRCOPY="OK"
+-      fi
+-      if test -z "$MSVCPCOPY" -o -z "$MSVCRCOPY"; then
+-         AC_MSG_ERROR([msvcp71.dll and/or msvcr71.dll are/is missing in the default location.
+-These dlls are part of the .NET installation and should be found in a directory
+-similar to:
+-"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Visual C++ .NET Professional - English\\"
+-As the automatic detection fails please copy the files to external/msvcp71/.])
+-      else
+-         AC_MSG_RESULT([found and copied])
+-      fi
+-   fi
+-fi
+-
+-dnl ===================================================================
+-dnl Windows builds with Visual C++ 2005 needs msvc{p,r}80.dll in external/msvcp80
+-dnl ===================================================================
+-if test "$_os" = "WINNT" -a "$COMEX" = "11"; then
+-   AC_MSG_CHECKING([for msvcp80.dll/msvcr80.dll])
+-   if test -x ../external/msvcp80/msvcp80.dll -a -x ../external/msvcp80/msvcr80.dll; then
+-      AC_MSG_RESULT([found])
+-   else
+-      MSVCPPATH=`/bin/find "$COMPATH/../.." -iname msvcp80.dll | head -n 1`
+-      MSVCRPATH=`/bin/find "$COMPATH/../.." -iname msvcr80.dll | head -n 1`
+-      if test -n "$MSVCPPATH" -a -n "$MSVCRPATH"; then
+-         cp "$MSVCPPATH" ../external/msvcp80/ && chmod +x ../external/msvcp80/msvcp80.dll && MSVCPCOPY="OK"
+-         cp "$MSVCRPATH" ../external/msvcp80/ && chmod +x ../external/msvcp80/msvcr80.dll && MSVCRCOPY="OK"
+-      fi
+-      if test -z "$MSVCPCOPY" -o -z "$MSVCRCOPY"; then
+-         AC_MSG_ERROR([msvcp80.dll and/or msvcr80.dll are/is missing in the default location.
+-These dlls are part of the VS installation and should be found in a directory
+-similar to:
+-"c:\\Program Files\\<no-idea>"
+-As the automatic detection fails please copy the files to external/msvcp80/.])
+-      else
+-         AC_MSG_RESULT([found and copied])
+-      fi
+-   fi
+-fi
+-
+-dnl ===================================================================
+-dnl Windows builds with Visual Studio 2008 needs msvc{m,p,r}90.dll in external/msvcp90
+-dnl ===================================================================
+-if test "$_os" = "WINNT"; then
+-   if test "$COMEX" = "12"; then
+-   AC_MSG_CHECKING([for msvcm90.dll/msvcp90.dll/msvcr90.dll/Microsoft.VC90.CRT.manifest])
+-   if test -x ../external/msvcp90/msvcm90.dll -a -x ../external/msvcp90/msvcp90.dll -a -x ../external/msvcp90/msvcr90.dll -a -x ../external/msvcp90/Microsoft.VC90.CRT.manifest; then
+-      AC_MSG_RESULT([found])
+-   else
+-      MSVCMPATH=`/bin/find "$COMPATH/../.." -iname msvcm90.dll | head -n 1`
+-      MSVCPPATH=`/bin/find "$COMPATH/../.." -iname msvcp90.dll | head -n 1`
+-      MSVCRPATH=`/bin/find "$COMPATH/../.." -iname msvcr90.dll | head -n 1`
+-      MSVCMANPATH=`/bin/find "$COMPATH/../.." -iname Microsoft.VC90.CRT.manifest | head -n 1`
+-      if test -n "$MSVCMPATH" -a -n "$MSVCPPATH" -a -n "$MSVCRPATH" -a -n "$MSVCMANPATH"; then
+-         cp "$MSVCMPATH" ../external/msvcp90/ && chmod +x ../external/msvcp90/msvcm90.dll && MSVCMCOPY="OK"
+-         cp "$MSVCPPATH" ../external/msvcp90/ && chmod +x ../external/msvcp90/msvcp90.dll && MSVCPCOPY="OK"
+-         cp "$MSVCRPATH" ../external/msvcp90/ && chmod +x ../external/msvcp90/msvcr90.dll && MSVCRCOPY="OK"
+-         cp "$MSVCMANPATH" ../external/msvcp90/ && chmod +x ../external/msvcp90/Microsoft.VC90.CRT.manifest && MSVCMANCOPY="OK"
+-      fi
+-      if test -z "$MSVCMCOPY" -o -z "$MSVCPCOPY" -o -z "$MSVCRCOPY" -o -z "$MSVCMANCOPY"; then
+-         AC_MSG_ERROR([Any or all of msvcm90.dll, msvcp90.dll, msvcr90.dll and Microsoft.VC90.CRT.manifest are missing in the default location.
+-These dlls are part of the VS installation and should be found in a directory
+-similar to:
+-"C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86\\Microsoft.VC90.CRT\\"
+-As the automatic detection fails please copy the files to external/msvcp90/.])
+-      else
+-         AC_MSG_RESULT([found and copied])
+-      fi
+-   fi
+-fi
+-fi
+-
+ dnl ===================================================================
+ dnl Windows builds - attempt to auto-copy required instmsiX.exe into external/
+ dnl ===================================================================

Modified: trunk/patches/dev300/msvs9-temporary-fix.diff
==============================================================================
--- trunk/patches/dev300/msvs9-temporary-fix.diff	(original)
+++ trunk/patches/dev300/msvs9-temporary-fix.diff	Wed Aug  6 15:01:54 2008
@@ -39,7 +39,7 @@
  fi
  
  dnl ===================================================================
-@@ -5067,90 +5067,6 @@
+@@ -5067,99 +5067,6 @@
     fi
  fi
  
@@ -96,10 +96,13 @@
 -fi
 -
 -dnl ===================================================================
--dnl Windows builds with Visual Studio 2008 needs msvc{m,p,r}90.dll in external/msvcp90
+-dnl Windows builds with Visual Studio 2008 needs msvc{m,p,r}90.dll in external/msvcp90 and merge modules in external/msm90
 -dnl ===================================================================
 -if test "$_os" = "WINNT"; then
 -   if test "$COMEX" = "12"; then
+-      AC_MSG_CHECKING([for Microsoft_VC90_CRT_x86.msm/policy_9_0_Microsoft_VC90_CRT_x86.msm])
+-      if test -x ../external/msm90/Microsoft_VC90_CRT_x86.msm -a -x ../external/msm90/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
+-        AC_MSG_RESULT([found])
 -   AC_MSG_CHECKING([for msvcm90.dll/msvcp90.dll/msvcr90.dll/Microsoft.VC90.CRT.manifest])
 -   if test -x ../external/msvcp90/msvcm90.dll -a -x ../external/msvcp90/msvcp90.dll -a -x ../external/msvcp90/msvcr90.dll -a -x ../external/msvcp90/Microsoft.VC90.CRT.manifest; then
 -      AC_MSG_RESULT([found])
@@ -116,14 +119,20 @@
 -      fi
 -      if test -z "$MSVCMCOPY" -o -z "$MSVCPCOPY" -o -z "$MSVCRCOPY" -o -z "$MSVCMANCOPY"; then
 -         AC_MSG_ERROR([Any or all of msvcm90.dll, msvcp90.dll, msvcr90.dll and Microsoft.VC90.CRT.manifest are missing in the default location.
--These dlls are part of the VS installation and should be found in a directory
--similar to:
+-            These dlls are part of the VS installation and should be found in a directory similar to:
 -"C:\\Program Files\\Microsoft Visual Studio 9.0\\VC\\redist\\x86\\Microsoft.VC90.CRT\\"
 -As the automatic detection fails please copy the files to external/msvcp90/.])
 -      else
 -         AC_MSG_RESULT([found and copied])
 -      fi
 -   fi
+-      else
+-        AC_MSG_ERROR([Any or all of Microsoft_VC90_CRT_x86 and policy_9_0_Microsoft_VC90_CRT_x86 are missing in the default location.
+-        These dlls are part of the VS installation and should be found in a directory
+-        similar to:
+-        "C:\\Program Files\\Common Files\\Merge Modules\\"
+-        As the automatic detection fails please copy the files to external/msm90/.])
+-      fi
 -fi
 -fi
 -