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

[tml svn gnome org]

Author: tml
Date: Wed Feb 18 07:32:07 2009
New Revision: 15360
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15360&view=rev

Log:
2009-02-18  Tor Lillqvist  <tml novell com>

	* patches/dev300/novell-win32-drop-win9x.diff: Take out tests for
	unicows.lib and instmsia.exe from configure.

	* patches/dev300/cygwin-make-ver.diff: Revert breakage. Now the
	test again checks if we are using make 3.81 and tells us to use
	3.80 in that case. In the previous version it checked if we use
	make 3.80, and in that case told us to use 3.80...

	As such, if the Make 3.81 problem really is only related to
	building Mozilla, this patch would not be needed for now as we
	don't build the Mozilla bits on Windows anyway because the Mozilla
	version in question can't be built with MSVS9.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/cygwin-make-ver.diff
   trunk/patches/dev300/novell-win32-drop-win9x.diff

Modified: trunk/patches/dev300/cygwin-make-ver.diff
==============================================================================
--- trunk/patches/dev300/cygwin-make-ver.diff	(original)
+++ trunk/patches/dev300/cygwin-make-ver.diff	Wed Feb 18 07:32:07 2009
@@ -1,10 +1,10 @@
---- configure.in.patched	2006-08-09 11:39:50.373000000 +0100
-+++ configure.in	2006-08-09 11:44:06.841750000 +0100
+--- configure.in
++++ configure.in
 @@ -1232,6 +1232,10 @@
             break
        fi
  done
-+$GNUMAKE --version 2> /dev/null | grep ' 3.80'  2>&1 > /dev/null
++$GNUMAKE --version 2> /dev/null | grep ' 3.81'  2>&1 > /dev/null
 +if test $? -eq 0;  then
 +  AC_MSG_ERROR("gmake 3.81 cannot build mozilla - please use 3.80")
 +fi

Modified: trunk/patches/dev300/novell-win32-drop-win9x.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-drop-win9x.diff	(original)
+++ trunk/patches/dev300/novell-win32-drop-win9x.diff	Wed Feb 18 07:32:07 2009
@@ -258,3 +258,66 @@
  			$(OBJ)$/setup_w.obj
  
  # --- Targets ------------------------------------------------------
+--- configure.in
++++ configure.in
+@@ -4751,7 +4751,7 @@
+ 	else
+ 		HAVE_PSDK_H="no"
+ 	fi
+-	if test -f "$PSDK_HOME/lib/unicows.lib"; then
++	if test -f "$PSDK_HOME/lib/user32.lib"; then
+ 		HAVE_PSDK_LIB="yes"
+ 	else
+ 		HAVE_PSDK_LIB="no"
+@@ -5038,22 +5038,6 @@
+ AC_SUBST(ZIP_HOME)
+ 
+ dnl ===================================================================
+-dnl Windows builds need unicows.dll in external/unicows/
+-dnl ===================================================================
+-if test "$_os" = "WINNT"; then
+-   AC_MSG_CHECKING([for unicows.dll])
+-   if test -x ./external/unicows/unicows.dll; then
+-      AC_MSG_RESULT([found])
+-   else
+-      AC_MSG_ERROR([The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/.
+-Get it from the Microsoft site and put it into external/unicows.
+-(Note: Microsoft seems to enjoy changing the exact location of this file. You
+-may have to search Microsoft's website.) Last time it was seen at:
+-<http://download.microsoft.com/download/b/7/5/b75eace3-00e2-4aa0-9a6f-0b6882c71642/unicows.exe>.])
+-   fi
+-fi
+-
+-dnl ===================================================================
+ dnl Windows builds need dbghelp.dll in external/dbghelp/
+ dnl ===================================================================
+ if test "$_os" = "WINNT"; then
+@@ -5103,22 +5087,20 @@
+ fi
+ 
+ dnl ===================================================================
+-dnl Windows builds with VS 2003/2005/2008 need instmsia.exe and instmsiw.exe in external/msi
++dnl Windows builds with VS 2003/2005/2008 need instmsiw.exe in external/msi
+ dnl ===================================================================
+ if test "$_os" = "WINNT"; then
+    if test "$COMEX" -ge "10"; then
+-   AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
+-   if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
++   AC_MSG_CHECKING([for instmsiw.exe])
++   if test -x ./external/msi/instmsiw.exe; then
+       AC_MSG_RESULT([found])
+    else
+-      MSIAPATH=`/bin/find "$COMPATH/../.." -iname instmsia.exe | head -n 1`
+       MSIWPATH=`/bin/find "$COMPATH/../.." -iname instmsiw.exe | head -n 1`
+-      if test -n "$MSIAPATH" -a -n "$MSIWPATH"; then
+-         cp "$MSIAPATH" ./external/msi/ && chmod +x ./external/msi/instmsia.exe && MSIACOPY="OK"
++      if test -n "$MSIWPATH"; then
+          cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK"
+       fi
+-      if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then
+-         AC_MSG_ERROR([instmsia.exe and/or instmsiw.exe are/is missing in the default location.
++      if test -z "$MSIWCOPY"; then
++         AC_MSG_ERROR([instmsiw.exe is missing in the default location.
+ These programs are part of the Visual Studio installation and should be found in a
+ directory similar to:
+ "c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\"