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

[tml svn gnome org]

Author: tml
Date: Wed Apr 30 16:39:35 2008
New Revision: 12403
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12403&view=rev

Log:
2008-04-30  Tor Lillqvist  <tml novell com>

	* patches/src680/msvs9-temporary-fix.diff: Update for
	dev300-m10. Keep just the diff to config_office/set_soenv.in.



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

Modified: trunk/patches/dev300/msvs9-temporary-fix.diff
==============================================================================
--- trunk/patches/dev300/msvs9-temporary-fix.diff	(original)
+++ trunk/patches/dev300/msvs9-temporary-fix.diff	Wed Apr 30 16:39:35 2008
@@ -1,76 +1,3 @@
---- config_office/configure.in.BAK	2008-04-25 16:23:00.234375000 +0300
-+++ config_office/configure.in	2008-04-25 17:01:03.187500000 +0300
-@@ -549,9 +549,9 @@
- ],,)
- AC_ARG_WITH(mspdb-path,
- [  --with-mspdb-path       For Microsoft C/C++ compiler users, please supply the
--                          path pointing to the mspdb71.dll (.NET 2003).
-+                          path pointing to the mspdb71.dll (.NET 2003) or mspdb80.dll.
-  
--                          Usage: --with-mspdb-path=<absolute path to mspdb71.dll>
-+                          Usage: --with-mspdb-path=<absolute path to mspdb*.dll>
- ],,)
- AC_ARG_WITH(midl-path,
- [  --with-midl-path        For Microsoft C/C++ .NET compiler users, please supply
-@@ -1587,7 +1587,7 @@
- 		AC_MSG_RESULT([done])
- 
- 		dnl ===========================================================
--		dnl  Check for mspdb71.dll
-+		dnl  Check for mspdb71.dll/mspdb80.dll
- 		dnl ===========================================================
- 		dnl  .NET 2003 Compiler
- 		if test -n "$MSPDB_PATH";then
-@@ -1643,7 +1643,10 @@
- 							}
- 							}"`
- 			AC_MSG_RESULT([found Compiler version $CCNUMVER.])
--			if test "$CCNUMVER" -ge "001400000000"; then
-+			if test "$CCNUMVER" -ge "001500000000"; then
-+				COMEX=12
-+				AC_MSG_RESULT([found .NET 2008 / VS 9.0.])
-+			elif test "$CCNUMVER" -ge "001400000000"; then
- 				COMEX=11
- 				AC_MSG_RESULT([found .NET 2005.])
- 			elif test "$CCNUMVER" -ge "001300102240"; then
-@@ -1676,7 +1679,8 @@
- dnl ===================================================================
- dnl  .NET needs special treatment
- dnl ===================================================================
--if test "$COMEX" = "10" -o "$COMEX" = "11"; then
-+if test "$_os" = "WINNT"; then
-+if test "$COMEX" -ge "10"; then
- 	dnl Check midl.exe
- 	if test -n "$MIDL_PATH";then
- 		MIDL_PATH=`dirname "$MIDL_PATH"`
-@@ -1692,6 +1696,10 @@
-       if test -x "$vstest/Common7/Tools/Bin/midl.exe" ; then
- 		  MIDL_PATH="$vstest/Common7/Tools/Bin"
-       fi
-+	  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])
-@@ -1732,7 +1740,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
-@@ -1747,6 +1755,7 @@
- AC_SUBST(MIDL_PATH)
- AC_SUBST(CSC_PATH)
- AC_SUBST(FRAME_HOME)
-+fi
- 
- dnl ===================================================================
- dnl Check if stdc headers are available excluding windows.
 --- config_office/oowintool.BAK	2008-04-25 13:12:44.546875000 +0300
 +++ config_office/oowintool	2008-04-25 16:45:16.093750000 +0300
 @@ -95,12 +95,16 @@
@@ -163,31 +90,3 @@
  }
  
  sub msvc_copy_dlls($)
---- config_office/set_soenv.in.BAK	2008-04-25 17:32:53.859375000 +0300
-+++ config_office/set_soenv.in	2008-04-25 20:06:49.687500000 +0300
-@@ -664,8 +664,14 @@
-           $ATL_INCLUDE = $COMPATH.$ds."atlmfc".$ds."include";
-           $MFC_LIB     = "";
-           $MFC_INCLUDE = "";
--      } elsif ( "@COMEX@" eq "11" ) { # .NET 2005 needs M1400
--          $CVER        = "M1400";
-+      } elsif ( "@COMEX@" ge "11" ) { # .NET 2005 needs M1400
-+		  if ( "@COMEX@" eq "11" ) {
-+			  $CVER        = "M1400";
-+		  } elsif ( "@COMEX@" eq "12" ) {
-+			  $CVER        = "M1500";
-+		  } else {                   # Unsupported
-+			  die "Unsupported value for COMEX variable.\n";
-+		  }
-           if ( "@DISABLE_ACTIVEX@" ) {
-               $ATL_LIB     = $PSDK_HOME.$ds."lib"; # Doesn't exist for VSE
-               $ATL_INCLUDE = $PSDK_HOME.$ds."include".$ds."atl";
-@@ -1225,7 +1231,7 @@
- 	   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
- 		   $PATH .= $ps.$tmppath;
- 	   }
--	   if ( ( $COMEX eq "10" ) || ( $COMEX eq "11" ) ) {
-+	   if ( ( $COMEX ge "10" ) ) {
- 		   # .NET needs midl.exe
-                $tmppath = CygFormat($MIDL_PATH);
- 		   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {