Diff
Modified: tags/Safari-537.38.2/Source/_javascript_Core/ChangeLog (148779 => 148780)
--- tags/Safari-537.38.2/Source/_javascript_Core/ChangeLog 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/_javascript_Core/ChangeLog 2013-04-19 23:12:14 UTC (rev 148780)
@@ -1,5 +1,18 @@
2013-04-19 Lucas Forschler <[email protected]>
+ Merge r148779
+
+ 2013-04-19 Roger Fong <[email protected]>
+
+ Remove uses of WebKit_Source from AppleWin build in _javascript_Core.
+
+ * _javascript_Core.vcxproj/_javascript_Core.make:
+ * _javascript_Core.vcxproj/build-generated-files.sh:
+ * _javascript_Core.vcxproj/copy-files.cmd:
+ * _javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj:
+
+2013-04-19 Lucas Forschler <[email protected]>
+
Merge r148760
2013-04-19 Roger Fong <[email protected]>
Modified: tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make (148779 => 148780)
--- tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.make 2013-04-19 23:12:14 UTC (rev 148780)
@@ -9,7 +9,6 @@
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
- set WebKit_Source=$(SRCROOT)\..
-mkdir "%ConfigurationBuildDir%\include\private"
xcopy "%WebKit_Libraries%\include\private\*" "%ConfigurationBuildDir%\include\private" /e/v/i/h/y
devenv "_javascript_Core.submit.sln" /clean $(BUILDSTYLE)
Modified: tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh (148779 => 148780)
--- tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2013-04-19 23:12:14 UTC (rev 148780)
@@ -1,6 +1,6 @@
#!/usr/bin/bash
-NUMCPUS=`${WEBKIT_SOURCE}/../Tools/Scripts/num-cpus`
+NUMCPUS=`../../../Tools/Scripts/num-cpus`
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
Modified: tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd (148779 => 148780)
--- tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/copy-files.cmd 2013-04-19 23:12:14 UTC (rev 148780)
@@ -31,7 +31,7 @@
OpaqueJSString.h
WebKitAvailability.h
) do (
- xcopy /y /d %WebKit_Source%\_javascript_Core\API\%%f "%PublicHeadersDirectory%" >NUL
+ xcopy /y /d ..\API\%%f "%PublicHeadersDirectory%" >NUL
)
echo Copying private headers...
@@ -51,7 +51,7 @@
runtime
yarr
) do (
- xcopy /y /d %WebKit_Source%\_javascript_Core\%%d\*.h "%PrivateHeadersDirectory%" >NUL
+ xcopy /y /d ..\%%d\*.h "%PrivateHeadersDirectory%" >NUL
)
echo Copying resources...
Modified: tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj (148779 => 148780)
--- tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/_javascript_Core/_javascript_Core.vcxproj/testRegExp/testRegExp.vcxproj 2013-04-19 23:12:14 UTC (rev 148780)
@@ -159,10 +159,10 @@
<PreBuildEvent />
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\AtomicString.cpp" />
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringBuilder.cpp" />
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\StringImpl.cpp" />
- <ClCompile Include="$(WebKit_Source)\WTF\wtf\text\WTFString.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\AtomicString.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringBuilder.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\StringImpl.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\include\private\wtf\text\WTFString.cpp" />
<ClCompile Include="..\..\testRegExp.cpp" />
</ItemGroup>
<ItemGroup>
Modified: tags/Safari-537.38.2/Source/WTF/ChangeLog (148779 => 148780)
--- tags/Safari-537.38.2/Source/WTF/ChangeLog 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/WTF/ChangeLog 2013-04-19 23:12:14 UTC (rev 148780)
@@ -1,5 +1,19 @@
2013-04-19 Lucas Forschler <[email protected]>
+ Merge r148779
+
+ 2013-04-19 Roger Fong <[email protected]>
+
+ Remove uses of WebKit_Source from AppleWin build in WTF.
+
+ * WTF.vcxproj/WTF.make:
+ * WTF.vcxproj/copy-files.cmd:
+ * WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py:
+ (react_to_vsprops_changes):
+ (react_to_webkit1_interface_changes):
+
+2013-04-19 Lucas Forschler <[email protected]>
+
Merge r148760
2013-04-19 Roger Fong <[email protected]>
Modified: tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/WTF.make (148779 => 148780)
--- tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/WTF.make 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/WTF.make 2013-04-19 23:12:14 UTC (rev 148780)
@@ -8,7 +8,6 @@
set OFFICIAL_BUILD=1
set WebKit_Libraries=$(SRCROOT)\AppleInternal
set WebKit_OutputDir=$(OBJROOT)
- set WebKit_Source=$(SRCROOT)\..
set ConfigurationBuildDir=$(OBJROOT)\$(BUILDSTYLE)
devenv "WTF.submit.sln" /clean $(BUILDSTYLE)
devenv "WTF.submit.sln" /build $(BUILDSTYLE)
Modified: tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/copy-files.cmd (148779 => 148780)
--- tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/copy-files.cmd 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/copy-files.cmd 2013-04-19 23:12:14 UTC (rev 148780)
@@ -1,7 +1,6 @@
@echo off
set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private
-set WTF_Directory=%Webkit_Source%\WTF
if "%1" EQU "clean" goto :clean
if "%1" EQU "rebuild" call :clean
@@ -15,7 +14,7 @@
wtf\unicode\icu
) do (
mkdir "%PrivateHeadersDirectory%\%%d" 2>NUL
- xcopy /y /d %Webkit_Source%\WTF\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL
+ xcopy /y /d ..\%%d\*.h "%PrivateHeadersDirectory%\%%d" >NUL
)
echo Copying other files...
@@ -26,7 +25,7 @@
wtf\text\StringImpl.cpp
wtf\text\WTFString.cpp
) do (
- echo F | xcopy /y /d %WTF_Directory%\%%f "%PrivateHeadersDirectory%\%%f" >NUL
+ echo F | xcopy /y /d ..\%%f "%PrivateHeadersDirectory%\%%f" >NUL
)
goto :EOF
Modified: tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py (148779 => 148780)
--- tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py 2013-04-19 23:03:49 UTC (rev 148779)
+++ tags/Safari-537.38.2/Source/WTF/WTF.vcxproj/work-around-vs-dependency-tracking-bugs.py 2013-04-19 23:12:14 UTC (rev 148780)
@@ -8,9 +8,8 @@
# It's fragile to rely on the location of this script to find the top-level
# source directory.
-TOP_LEVEL_DIRECTORY = os.environ['WEBKIT_SOURCE'];
+TOP_LEVEL_DIRECTORY = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
WEBKIT_LIBRARIES = os.environ['WEBKIT_LIBRARIES'];
-WEBKIT_SOURCE = os.environ['WEBKIT_SOURCE'];
def main():
react_to_vsprops_changes()
@@ -32,12 +31,12 @@
# Touch wtf/Platform.h so all files will be recompiled. This is necessary
# to pick up changes to preprocessor macros (e.g., ENABLE_*).
- wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'WTF', 'wtf', 'Platform.h')
+ wtf_platform_h = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'WTF', 'wtf', 'Platform.h')
touch_if_older_than(wtf_platform_h, newest_vsprops_time)
def react_to_webkit1_interface_changes():
- interfaces_directory = os.path.join(TOP_LEVEL_DIRECTORY, 'WebKit', 'win', 'Interfaces')
+ interfaces_directory = os.path.join(TOP_LEVEL_DIRECTORY, 'Source', 'WebKit', 'win', 'Interfaces')
newest_idl_time = mtime_of_newest_file_matching_glob(os.path.join(interfaces_directory, '*.idl'))
# WebKit.idl includes all the other IDL files, so needs to be rebuilt if any IDL file changes.
# But Visual Studio isn't smart enough to figure this out, so we touch WebKit.idl to ensure that
