Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (148626 => 148627)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-17 19:28:00 UTC (rev 148627)
@@ -1,3 +1,13 @@
+2013-04-14 Roger Fong <[email protected]>
+
+ Copy make-file-export-generator script to the the Source folders of the projects that use it.
+ <rdar://problem/13675604>
+
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj.filters:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorBuildCmd.cmd:
+ * _javascript_Core.vcxproj/_javascript_CoreExportGenerator/make-export-file-generator: Copied from Source/WebCore/make-export-file-generator.
+
2013-04-17 Brent Fulgham <[email protected]>
[Windows, WinCairo] Stop individually building WTF files in JSC.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj (148626 => 148627)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj 2013-04-17 19:28:00 UTC (rev 148627)
@@ -149,6 +149,7 @@
<CustomBuild Include="_javascript_CoreExports.def.in">
<FileType>Document</FileType>
</CustomBuild>
+ <None Include="make-export-file-generator" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ConfigurationBuildDir)\obj\_javascript_CoreExportGenerator\DerivedSources\_javascript_CoreExportGenerator.cpp" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj.filters (148626 => 148627)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj.filters 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGenerator.vcxproj.filters 2013-04-17 19:28:00 UTC (rev 148627)
@@ -4,6 +4,7 @@
<None Include="_javascript_CoreExportGeneratorPreBuild.cmd" />
<None Include="_javascript_CoreExportGeneratorBuildCmd.cmd" />
<None Include="_javascript_CoreExportGeneratorPostBuild.cmd" />
+ <None Include="make-export-file-generator" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ConfigurationBuildDir)\obj\_javascript_CoreExportGenerator\DerivedSources\_javascript_CoreExportGenerator.cpp" />
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorBuildCmd.cmd (148626 => 148627)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorBuildCmd.cmd 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/_javascript_CoreExportGeneratorBuildCmd.cmd 2013-04-17 19:28:00 UTC (rev 148627)
@@ -6,4 +6,4 @@
echo Generating export definitions
del /F /Q "%GeneratorDirectory%/DerivedSources/_javascript_CorGenerator.cpp"
-bash -c "${WEBKIT_SOURCE}/WebCore/make-export-file-generator ./_javascript_CoreExports.def.in '%GeneratorDirectory%/DerivedSources/_javascript_CoreExportGenerator.cpp'"
\ No newline at end of file
+bash -c "./make-export-file-generator ./_javascript_CoreExports.def.in '%GeneratorDirectory%/DerivedSources/_javascript_CoreExportGenerator.cpp'"
\ No newline at end of file
Copied: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/make-export-file-generator (from rev 148582, trunk/Source/WebCore/make-export-file-generator) (0 => 148627)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/make-export-file-generator (rev 0)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_CoreExportGenerator/make-export-file-generator 2013-04-17 19:28:00 UTC (rev 148627)
@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+# Copyright (C) 2010 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+input_file = ARGV[0]
+output_file = ARGV[1]
+
+require 'erb'
+
+def line_for_output line
+ return line.chomp if line =~ /#/
+ " printf(\"#{line.chomp}\\n\");"
+end
+
+TEMPLATE = <<-EOF
+#include "config.h"
+#include <stdio.h>
+#include <wtf/Assertions.h>
+
+int main(int, char**)
+{
+<%- input.each_line do |line| -%>
+<%= line_for_output line %>
+<%- end -%>
+
+ return 0;
+}
+EOF
+
+File.open(output_file, "w") do |output|
+ File.open(input_file) do |input|
+ renderer = ERB.new(TEMPLATE, 0, "-")
+ output << renderer.result(binding)
+ end
+end
+
+STDERR.puts "Wrote output to #{output_file}"
Modified: trunk/Source/WebKit/ChangeLog (148626 => 148627)
--- trunk/Source/WebKit/ChangeLog 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/WebKit/ChangeLog 2013-04-17 19:28:00 UTC (rev 148627)
@@ -1,3 +1,13 @@
+2013-04-14 Roger Fong <[email protected]>
+
+ Copy make-file-export-generator script to the the Source folders of the projects that use it.
+ <rdar://problem/13675604>
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters:
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd:
+ * WebKit.vcxproj/WebKitExportGenerator/make-export-file-generator: Copied from Source/WebCore/make-export-file-generator.
+
2013-04-16 Brent Fulgham <[email protected]>
[Windows] Unreviewed VS2010 build correction.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj (148626 => 148627)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2013-04-17 19:28:00 UTC (rev 148627)
@@ -144,6 +144,7 @@
<CustomBuild Include="WebKitExports.def.in">
<FileType>Document</FileType>
</CustomBuild>
+ <None Include="make-export-file-generator" />
<None Include="WebKitExportGeneratorBuildCmd.cmd" />
<None Include="WebKitExportGeneratorPostBuild.cmd" />
<None Include="WebKitExportGeneratorPreBuild.cmd">
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters (148626 => 148627)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters 2013-04-17 19:28:00 UTC (rev 148627)
@@ -4,6 +4,7 @@
<None Include="WebKitExportGeneratorBuildCmd.cmd" />
<None Include="WebKitExportGeneratorPostBuild.cmd" />
<None Include="WebKitExportGeneratorPreBuild.cmd" />
+ <None Include="make-export-file-generator" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(ConfigurationBuildDir)\obj\WebKitExportGenerator\DerivedSources\WebKitExportGenerator.cpp" />
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd (148626 => 148627)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2013-04-17 19:17:31 UTC (rev 148626)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGeneratorBuildCmd.cmd 2013-04-17 19:28:00 UTC (rev 148627)
@@ -6,4 +6,4 @@
echo Generating export definitions
del /F /Q "%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp"
-bash -c "${WEBKIT_SOURCE}/WebCore/make-export-file-generator ./WebKitExports.def.in '%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp'"
+bash -c "./make-export-file-generator ./WebKitExports.def.in '%GeneratorDirectory%/DerivedSources/WebKitExportGenerator.cpp'"
Copied: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/make-export-file-generator (from rev 148582, trunk/Source/WebCore/make-export-file-generator) (0 => 148627)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/make-export-file-generator (rev 0)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/make-export-file-generator 2013-04-17 19:28:00 UTC (rev 148627)
@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+
+# Copyright (C) 2010 Apple Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+# THE POSSIBILITY OF SUCH DAMAGE.
+
+input_file = ARGV[0]
+output_file = ARGV[1]
+
+require 'erb'
+
+def line_for_output line
+ return line.chomp if line =~ /#/
+ " printf(\"#{line.chomp}\\n\");"
+end
+
+TEMPLATE = <<-EOF
+#include "config.h"
+#include <stdio.h>
+#include <wtf/Assertions.h>
+
+int main(int, char**)
+{
+<%- input.each_line do |line| -%>
+<%= line_for_output line %>
+<%- end -%>
+
+ return 0;
+}
+EOF
+
+File.open(output_file, "w") do |output|
+ File.open(input_file) do |input|
+ renderer = ERB.new(TEMPLATE, 0, "-")
+ output << renderer.result(binding)
+ end
+end
+
+STDERR.puts "Wrote output to #{output_file}"
