2006-04-04 Eric Seidel <eseidel@apple.com>

        Reviewed by andersca.

        Work-around spaces-in-pathnames issue in gnumake on win32.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=8173

        * WebCore.vcproj/WebCore/build-generated-files.sh:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ec50ba81c0784cd03aa1beacba83a888f679a06..d1a94364f23642bd5369d7da3163181e0c0681c1 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-04  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by andersca.
+
+        Work-around spaces-in-pathnames issue in gnumake on win32.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
+
+        * WebCore.vcproj/WebCore/build-generated-files.sh:
+
 2006-04-03  Darin Adler  <darin@apple.com>
 
         - tried to fix build again

diff --git a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
index b46df91fe50cf29176e8503da3de7dba29dde2ae..50c441c43b3d4f571d604efc1c93b83c84d90212 100755 (executable)
--- a/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
+++ b/WebCore/WebCore.vcproj/WebCore/build-generated-files.sh
@@ -4,7 +4,13 @@
 WebKitOutputDirUnix=`cygpath -a -u "$2"`
 WebKitOutputConfigDirUnix="${WebKitOutputDirUnix}/$1"
 
-export SRCROOT="`pwd`/../.."
+SRCROOT="`pwd`/../.."
+SRCROOT=`realpath "$SRCROOT"`
+# Do a little dance to get the path into 8.3 form to make it safe for gnu make
+# http://bugzilla.opendarwin.org/show_bug.cgi?id=8173
+SRCROOT=`cygpath -m -s "$SRCROOT"`
+SRCROOT=`cygpath -u "$SRCROOT"`
+export SRCROOT
 # FIXME: Eventually win32 might wish to generate to the Debug/Release output directories.
 export BUILT_PRODUCTS_DIR="$SRCROOT"
 export CREATE_HASH_TABLE="$SRCROOT/../JavaScriptCore/kjs/create_hash_table"

diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index dfa8749f20b2aef1697a9350aa992d38e1b99d01..4d7123ecff1d9a7b80255789b2032e49f3a9ec46 100644 (file)
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef DOM_DocumentImpl_h
-#define DOM_DocumentImpl_h
+#ifndef DOM_Document_h
+#define DOM_Document_h
 
 #include "Attr.h"
 #include "Color.h"