Backed out changeset 2ef6f317bbba
authorKyle Huey <khuey@kylehuey.com>
Sat, 19 Mar 2011 07:58:35 -0400
changeset 63521 6b0ab7481a419042f0c509e781b3f7c34191e7df
parent 63484 2ef6f317bbbacbad8d52502cc9ba9a9357ef8df8
child 63522 3188b82e4ea2d1ca5b023d0b516e540d38b55c48
push id19231
push userkhuey@kylehuey.com
push dateWed, 23 Mar 2011 00:22:04 +0000
treeherdermozilla-central@57a0f8967cce [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b13pre
backs out2ef6f317bbbacbad8d52502cc9ba9a9357ef8df8
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
Backed out changeset 2ef6f317bbba
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,18 +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_EXTRA_LIBS = $(call EXPAND_LIBNAME,shlwapi)
+HOST_CSRCS      = nsinstall_win.c
 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,17 +6,16 @@
  * 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
@@ -328,18 +327,16 @@ 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;
 }