Changeset 160120 in webkit

Timestamp:

Dec 4, 2013, 1:29:45 PM (13 years ago)

Author:

Brent Fulgham

Message:

Merge r160118.

2013-12-04 Brent Fulgham <Brent Fulgham>

[Win] Correct WebKit.make copy command to land resources in proper directory.
​https://bugs.webkit.org/show_bug.cgi?id=125249

Reviewed by Tim Horton.

• WebKit.vcxproj/WebKit.make: Correct the copy command.

Location:

branches/safari-537.60-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebKit.vcxproj/WebKit.make (modified) (1 diff)

branches/safari-537.60-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2013-12-04  Brent Fulgham  <bfulgham@apple.com>
+
+        Merge r160118.
+
+    2013-12-04  Brent Fulgham  <bfulgham@apple.com>
+
+            [Win] Correct WebKit.make copy command to land resources in proper directory.
+            https://bugs.webkit.org/show_bug.cgi?id=125249
+
+            Reviewed by Tim Horton.
+
+            * WebKit.vcxproj/WebKit.make: Correct the copy command.
+
 2013-12-03  Brent Fulgham  <bfulgham@apple.com>
 

branches/safari-537.60-branch/Source/WebKit/WebKit.vcxproj/WebKit.make

@@ -15 +15 @@
         xcopy "%ConfigurationBuildDir%\bin32\*.pdb" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
         -xcopy "%ConfigurationBuildDir%\bin32\*.dll" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
-        xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources" "$(DSTROOT)\%ProgramFilesAAS%" /e/v/i/h/y
+        xcopy "%ConfigurationBuildDir%\bin32\WebKit.resources\*" "$(DSTROOT)\%ProgramFilesAAS%\WebKit.resources\" /e/v/i/h/y
         xcopy "%ConfigurationBuildDir%\include\*" "$(DSTROOT)\AppleInternal\include\" /e/v/i/h/y        
         xcopy "%ConfigurationBuildDir%\lib32\*" "$(DSTROOT)\AppleInternal\lib32\" /e/v/i/h/y