- Revision
- 165394
- Author
- bfulg...@apple.com
- Date
- 2014-03-10 12:28:54 -0700 (Mon, 10 Mar 2014)
Log Message
Source/WebInspectorUI: Merge r165393.
2014-03-10 Brent Fulgham <bfulg...@apple.com>
[Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
* WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: Use %PlatformArchitecture%
rather than hard-coded 32-bit path.
Source/WebKit: Merge r165393.
2014-03-10 Brent Fulgham <bfulg...@apple.com>
[Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* WebKit.vcxproj/WebKit/Interfaces/InterfacesPreBuild.cmd: Use %PlatformArchitecture% rather than
hard-coded 32-bit path.
* WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Ditto.
Tools: Merge r165393.
2014-03-10 Brent Fulgham <bfulg...@apple.com>
[Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* win/AssembleBuildLogs/AssembleBuildLogs.cmd: Use %PlatformArchitecture% rather than
32-bit hard-coded path.
WebKitLibraries: Merge r165393.
2014-03-10 Brent Fulgham <bfulg...@apple.com>
[Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
https://bugs.webkit.org/show_bug.cgi?id=130023
Reviewed by Dean Jackson.
* win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses.
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog (165393 => 165394)
--- branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,3 +1,15 @@
+2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ Merge r165393.
+
+ 2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ * WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: Use %PlatformArchitecture%
+ rather than hard-coded 32-bit path.
+
2014-02-04 Brent Fulgham <bfulg...@apple.com>
Merge r154395.
Modified: branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd (165393 => 165394)
--- branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,4 +1,4 @@
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\WebInspectorUI"
-xcopy /y /e "%PROJECTDIR%..\UserInterface\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\WebInspectorUI"
-xcopy /y /d "%PROJECTDIR%..\Localizations\en.lproj\*" "%CONFIGURATIONBUILDDIR%\bin32\WebKit.resources\WebInspectorUI"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
+xcopy /y /e "%PROJECTDIR%..\UserInterface\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
+xcopy /y /d "%PROJECTDIR%..\Localizations\en.lproj\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources\WebInspectorUI"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: branches/safari-537.75-branch/Source/WebKit/ChangeLog (165393 => 165394)
--- branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,3 +1,18 @@
+2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ Merge r165393.
+
+ 2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * WebKit.vcxproj/WebKit/Interfaces/InterfacesPreBuild.cmd: Use %PlatformArchitecture% rather than
+ hard-coded 32-bit path.
+ * WebKit.vcxproj/WebKit/WebKitPostBuild.cmd: Ditto.
+
2014-03-07 Brent Fulgham <bfulg...@apple.com>
[Win] Build fix for combined 32-bit and 64-bit target.
Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd (165393 => 165394)
--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/InterfacesPreBuild.cmd 2014-03-10 19:28:54 UTC (rev 165394)
@@ -5,5 +5,5 @@
if errorlevel 1 exit 1
echo XX%PROJECTNAME%XX > "%CONFIGURATIONBUILDDIR%\buildfailed"
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj32\WebKit\%PROJECTNAME%"
+mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKit\%PROJECTNAME%"
bash "%WEBKIT_LIBRARIES%\tools\scripts\auto-version.sh" "%INTDIR%"
Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd (165393 => 165394)
--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitPostBuild.cmd 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,5 +1,7 @@
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\include\WebKit"
+set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources
+
xcopy /y /d "%PROJECTDIR%\..\..\win\WebLocalizableStrings.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitGraphics.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
xcopy /y /d "%PROJECTDIR%\..\..\win\WebKitCOMAPI.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
@@ -11,8 +13,10 @@
xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\npruntime_internal.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
xcopy /y /d "%CONFIGURATIONBUILDDIR%\include\WebCore\nptypes.h" "%CONFIGURATIONBUILDDIR%\include\WebKit"
-mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
-xcopy /y /d "%PROJECTDIR%..\..\WebKit.resources\*" "%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\WebKit.resources"
+echo Copying resources...
+mkdir "%ResourcesDirectory%" 2>NUL
+xcopy /y /d "%PROJECTDIR%\..\..\win\WebKit.resources\Info.plist" "%ResourcesDirectory%" >NUL
+
if exist "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" "%WEBKIT_LIBRARIES%\tools\VersionStamper\VersionStamper.exe" --verbose "%TARGETPATH%"
if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
Modified: branches/safari-537.75-branch/Tools/ChangeLog (165393 => 165394)
--- branches/safari-537.75-branch/Tools/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Tools/ChangeLog 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,3 +1,17 @@
+2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ Merge r165393.
+
+ 2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * win/AssembleBuildLogs/AssembleBuildLogs.cmd: Use %PlatformArchitecture% rather than
+ 32-bit hard-coded path.
+
2014-03-07 Brent Fulgham <bfulg...@apple.com>
[Win] Unreviewed 64-bit build fix.
Modified: branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleLogs.cmd (165393 => 165394)
--- branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleLogs.cmd 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/Tools/win/AssembleBuildLogs/AssembleLogs.cmd 2014-03-10 19:28:54 UTC (rev 165394)
@@ -2,173 +2,182 @@
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WTFGenerated... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WTFGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WTFGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WTF... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WTF\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WTF\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING _javascript_CoreGenerated... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\_javascript_CoreGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\_javascript_CoreGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING LLIntDesiredOffsets... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\LLIntDesiredOffsets\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\LLIntDesiredOffsets\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING LLIntOffsetsExtractor... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\LLIntOffsetsExtractor\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\LLIntOffsetsExtractor\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING LLIntAssembly... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\LLIntAssembly\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\LLIntAssembly\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING _javascript_Core... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\_javascript_Core\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\_javascript_Core\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING jsc... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\jsc\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\jsc\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING testRegExp... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\testRegExp\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\testRegExp\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING testapi... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\testapi\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\testapi\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-if not exist "%CONFIGURATIONBUILDDIR%\obj32\WebKitQuartzCoreAdditions\BuildLog.htm" GOTO SkipInternalProjects
+if not exist "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitQuartzCoreAdditions\BuildLog.htm" GOTO SkipInternalProjects
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitSystemInterfaceGenerated... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitSystemInterfaceGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitSystemInterfaceGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitSystemInterface... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitSystemInterface\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitSystemInterface\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitQuartzCoreAdditionsGenerated... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitQuartzCoreAdditionsGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitQuartzCoreAdditionsGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitQuartzCoreAdditions... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitQuartzCoreAdditions\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitQuartzCoreAdditions\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING CoreUI... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\CoreUI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\CoreUI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING SafariTheme... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\SafariTheme\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\SafariTheme\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
:SkipInternalProjects
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebCoreGenerated... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebCoreGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCoreGenerated\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+if not exist "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\QTMovieWin\BuildLog.htm" GOTO SkipQTMovieWin
+
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING QTMovieWin... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\QTMovieWin\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\QTMovieWin\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+:SkipQTMovieWin
+
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebCore... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebCore\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebCoreTestSupport... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebCoreTestSupport\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCoreTestSupport\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING Interfaces... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\Interfaces\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\Interfaces\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitGUID... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitGUID\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitGUID\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKitExportGenerator... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKitExportGenerator\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKitExportGenerator\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WebKit... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WebKit\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebKit\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo COMPILING WebInspectorUI... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebInspectorUI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WinLauncherLib... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WinLauncherLib\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WinLauncherLib\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING WinLauncher... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\WinLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WinLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING TestNetscapePlugin... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\TestNetscapePlugin\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\TestNetscapePlugin\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING ImageDiff... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\ImageDiff\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\ImageDiff\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING ImageDiffLauncher... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\ImageDiffLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\ImageDiffLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING DumpRenderTree... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\DumpRenderTree\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\DumpRenderTree\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING DumpRenderTreeLauncher... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\DumpRenderTreeLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\DumpRenderTreeLauncher\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING record-memory... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\record-memory\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\record-memory\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING gtest-md... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\gtest-md\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\gtest-md\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo COMPILING TestWebKitAPI... >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
-type "%CONFIGURATIONBUILDDIR%\obj32\TestWebKitAPI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
\ No newline at end of file
+type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\TestWebKitAPI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
\ No newline at end of file
Modified: branches/safari-537.75-branch/WebKitLibraries/ChangeLog (165393 => 165394)
--- branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/WebKitLibraries/ChangeLog 2014-03-10 19:28:54 UTC (rev 165394)
@@ -1,3 +1,16 @@
+2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ Merge r165393.
+
+ 2014-03-10 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Pass environment to Pre-Build, Pre-Link, and Post-Build Stages.
+ https://bugs.webkit.org/show_bug.cgi?id=130023
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Pass WEBKIT_LIBRARIES value to subprocesses.
+
2014-02-28 Brent Fulgham <bfulg...@apple.com>
Unreviewed build fix.
Modified: branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props (165393 => 165394)
--- branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-03-10 19:09:40 UTC (rev 165393)
+++ branches/safari-537.75-branch/WebKitLibraries/win/tools/vsprops/common.props 2014-03-10 19:28:54 UTC (rev 165394)
@@ -95,6 +95,7 @@
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
@@ -131,6 +132,7 @@
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
@@ -167,6 +169,7 @@
set TARGETFILENAME=$(TargetFileName)
set TARGETPATH=$(TargetPath)
set DEBUGSUFFIX=$(DebugSuffix)
+set WEBKIT_LIBRARIES=$(WEBKIT_LIBRARIES)
REM If any of the above variables didn't exist previously and
REM were set to an empty string, set will set the errorlevel to 1,
