Bug 574183 - Fix bustage.
☠☠ backed out by 6b0ab7481a41 ☠ ☠
authorMitchell Field <mitchell.field@live.com.au>
Thu, 03 Mar 2011 03:10:48 +1100
changeset 63484 2ef6f317bbbacbad8d52502cc9ba9a9357ef8df8
parent 63483 0c5da403b68e4db66a1a708486ef9f05cd0d81b4
child 63485 d2fb0b03b86b437c618aeacb8560dc6b14ffe7b1
child 63521 6b0ab7481a419042f0c509e781b3f7c34191e7df
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs574183
milestone2.0b13pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 574183 - Fix bustage.
config/Makefile.in
js/src/config/Makefile.in
js/src/config/nsinstall_win.c
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -46,17 +46,17 @@ include $(DEPTH)/config/autoconf.mk
 
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
 
 HOST_PROGRAM	= nsinstall$(HOST_BIN_SUFFIX)
 
 ifeq (WINNT,$(HOST_OS_ARCH))
-HOST_CSRCS	= nsinstall_win.c
+HOST_CSRCS = nsinstall_win.c
 HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
 else
 HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 PLSRCS		= nfspwd.pl
 
 TARGETS		= $(HOST_PROGRAM) $(PLSRCS:.pl=) $(SIMPLE_PROGRAMS)
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -46,17 +46,18 @@ include $(DEPTH)/config/autoconf.mk
 
 # For sanity's sake, we compile nsinstall without the wrapped system
 # headers, so that we can use it to set up the wrapped system headers.
 VISIBILITY_FLAGS =
 
 HOST_PROGRAM	= nsinstall$(HOST_BIN_SUFFIX)
 
 ifeq (WINNT,$(HOST_OS_ARCH))
-HOST_CSRCS      = nsinstall_win.c
+HOST_CSRCS = nsinstall_win.c
+HOST_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
 else
 HOST_CSRCS	= nsinstall.c pathsub.c
 endif
 
 PLSRCS		= nfspwd.pl
 
 TARGETS		= $(HOST_PROGRAM) $(PLSRCS:.pl=) $(SIMPLE_PROGRAMS)
 
--- a/js/src/config/nsinstall_win.c
+++ b/js/src/config/nsinstall_win.c
@@ -6,16 +6,17 @@
  * taken from shmsdos.c
  */
 
 #include <direct.h>
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
 #include <windows.h>
+#include <shlwapi.h>
 #pragma hdrstop
 
 /*
  * sh_FileFcn --
  *
  * A function that operates on a file.  The pathname is either
  * absolute or relative to the current directory, and contains
  * no wildcard characters such as * and ?.   Additional arguments
@@ -327,16 +328,18 @@ sh_DoCopy(wchar_t *srcFileName,
         r = GetFullPathName(dstFileName, 1000, longDst + ARRAY_LEN(LONGPATH_PREFIX) - 1, NULL);
         if (!r) {
             fprintf(stderr, "nsinstall: couldn't get full path of %ls: %s\n",
                     dstFileName, sh_GetLastErrorMessage());
             return FALSE;
         }
 
         if (!CopyFile(longSrc, longDst, FALSE)) {
+            if (!wcscmp(PathFindExtension(longSrc), L".chk"))
+              return TRUE; // Incredibly ugly hack to work around Bug 539689
             fprintf(stderr, "nsinstall: cannot copy %ls to %ls: %s\n",
                     srcFileName, dstFileName, sh_GetLastErrorMessage());
             return FALSE;
         }
     }
     return TRUE;
 }