[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 0705c8e4d36f9c263d3327e507a67b7d6cddae91
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 8 19:04:40 2010 +0000

    Roll out r71532
    
    It broke the build for Cygwin 1.7 installs. Cygwin 1.7's default
    .bashrc unsets %TEMP%, which broke copy-tools.cmd.
    
    JavaScriptCore:
    
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
    * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
    * JavaScriptCore.vcproj/JavaScriptCore/copy-tools.cmd: Removed.
    * JavaScriptCore.vcproj/JavaScriptCore/show-alert.js: Removed.
    
    WebKitTools:
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 815716a..8f663ff 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-08  Adam Roben  <aroben at apple.com>
+
+        Roll out r71532
+
+        It broke the build for Cygwin 1.7 installs. Cygwin 1.7's default
+        .bashrc unsets %TEMP%, which broke copy-tools.cmd.
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj:
+        * JavaScriptCore.vcproj/JavaScriptCore/copy-tools.cmd: Removed.
+        * JavaScriptCore.vcproj/JavaScriptCore/show-alert.js: Removed.
+
 2010-11-08  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
index 281ca78..d1e5d46 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.make
@@ -1,6 +1,6 @@
 all:
-    echo XXJavaScriptCoreGeneratedXX > "$(WEBKITOUTPUTDIR)\buildfailed"
-    copy-tools.cmd
+    -xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "$(WEBKITLIBRARIESDIR)\tools"
+    touch "$(WEBKITOUTPUTDIR)\buildfailed"
     bash build-generated-files.sh "$(WEBKITOUTPUTDIR)" "$(WEBKITLIBRARIESDIR)"
     -mkdir 2>NUL "$(WEBKITOUTPUTDIR)\include\JavaScriptCore"
     xcopy /y /d "..\..\API\APICast.h" "$(WEBKITOUTPUTDIR)\include\JavaScriptCore"
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
index 799f7c3..7d5ca69 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreGenerated.vcproj
@@ -44,17 +44,9 @@
 			>
 		</File>
 		<File
-			RelativePath=".\copy-tools.cmd"
-			>
-		</File>
-		<File
 			RelativePath=".\JavaScriptCoreGenerated.make"
 			>
 		</File>
-		<File
-			RelativePath=".\show-alert.js"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-tools.cmd b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-tools.cmd
deleted file mode 100755
index b141ac4..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/copy-tools.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
- at echo off
-
-set LogFile=%TEMP%\copy-tools-log.txt
-xcopy /y/d/e/i "..\..\..\WebKitLibraries\win\tools" "%WebKitLibrariesDir%\tools" > "%LOGFILE%" 2>&1
-"%SYSTEMROOT%\system32\find.exe" "0 File(s) copied" "%LogFile%" > NUL
-if errorlevel 1 set FilesWereCopied=1
-del "%LogFile%"
-
-if "%FilesWereCopied%" NEQ "1" exit
-
-if "%WEBKIT_NONINTERACTIVE_BUILD%" EQU "1" (
-    echo =============================
-    echo =============================
-    echo WebKit's .vsprops files have been updated. The current build will fail. Then you must build again.
-    echo =============================
-    echo =============================
-) else (
-    wscript show-alert.js "WebKit's .vsprops files have been updated. The current build will fail. Then you must close and reopen Visual Studio, then build again."
-)
-
-exit 1
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/show-alert.js b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/show-alert.js
deleted file mode 100644
index 22bbce1..0000000
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/show-alert.js
+++ /dev/null
@@ -1 +0,0 @@
-WScript.Echo(WScript.Arguments.Item(0));
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6aef1cd..a07d295 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-08  Adam Roben  <aroben at apple.com>
+
+        Roll out r71532
+
+        It broke the build for Cygwin 1.7 installs. Cygwin 1.7's default
+        .bashrc unsets %TEMP%, which broke copy-tools.cmd.
+
+        * Scripts/webkitdirs.pm:
+
 2010-11-08  Tony Chang  <tony at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 4bee48e..2c1d8da 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1210,8 +1210,6 @@ sub buildVisualStudioProject
 
     my @command = ($vcBuildPath, $project, $action, $config);
 
-    $ENV{WEBKIT_NONINTERACTIVE_BUILD} = "1";
-
     print join(" ", @command), "\n";
     return system @command;
 }

-- 
WebKit Debian packaging