Unreviewed. More VS2010 WebKit solution touchups.

* win/tools/vsprops/common.props:
Move an ignored warning from a project to common properties.

* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters:
Make WebKitExports.def.in be treated as a custom build file so that changes to it cause the exports to be rebuilt.

* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters:
Make JavaScriptCoreExports.def.in be treated as a custom build file so that changes to it cause the exports to be rebuilt.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142203 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index aa38041e2f662c22d599d8512619b9174df9e28e..f5de1d8685db44092e31c891dd6ec52247dbf7d4 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-07  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. More VS2010 WebKit solution touchups.
+        Make JavaScriptCoreExports.def.in be treated as a custom build file so that changes to it cause the exports to be rebuilt.
+
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters:
+        * JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExports.def.in:
+
 2013-02-07  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         Objective-C API: testapi.mm should use ARC

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj
index d5153c71493bbfe5a9519a31fbc95e5633c0b74c..a0943ebe527abb9464e7ea852d2b20f166add794 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj
@@ -59,7 +59,9 @@
     <None Include="JavaScriptCoreExportGeneratorBuildCmd.cmd" />\r
     <None Include="JavaScriptCoreExportGeneratorPostBuild.cmd" />\r
     <None Include="JavaScriptCoreExportGeneratorPreBuild.cmd" />\r
-    <None Include="JavaScriptCoreExports.def.in" />\r
+    <CustomBuild Include="JavaScriptCoreExports.def.in">\r
+      <FileType>Document</FileType>\r
+    </CustomBuild>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="$(ConfigurationBuildDir)\obj\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />\r

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters
index 61b461747941fda8d6a0b75a1b7563c6d16b4f20..f8d5c2849cec743005ecf071cb652a2b33d82fe7 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreExportGenerator/JavaScriptCoreExportGenerator.vcxproj.filters
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <None Include="JavaScriptCoreExports.def.in" />\r
     <None Include="JavaScriptCoreExportGeneratorPreBuild.cmd" />\r
     <None Include="JavaScriptCoreExportGeneratorBuildCmd.cmd" />\r
     <None Include="JavaScriptCoreExportGeneratorPostBuild.cmd" />\r
@@ -9,4 +8,7 @@
   <ItemGroup>\r
     <ClCompile Include="$(ConfigurationBuildDir)\obj\JavaScriptCoreExportGenerator\DerivedSources\JavaScriptCoreExportGenerator.cpp" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="JavaScriptCoreExports.def.in" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 59781756df6009efdf473be9849c23430912f4d5..fa1379711b6ffcd69a1e044891db6f649e7c0d81 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2013-02-07  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. More VS2010 WebKit solution touchups.
+        Make WebKitExports.def.in be treated as a custom build file so that changes to it cause the exports to be rebuilt.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters:
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
 2013-02-06  Roger Fong  <roger_fong@apple.com>
 
         Unreviewed. Touchups to VS2010 WebKit solution.

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
index 9cc7e7b17cef4f1f420225cfc4dce675a3fe8a4f..cd3a5979c81ac14534bfd97e7dcbea38062a813f 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj
@@ -56,7 +56,9 @@
     <Link />\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
-    <None Include="WebKitExports.def.in" />\r
+    <CustomBuild Include="WebKitExports.def.in">\r
+      <FileType>Document</FileType>\r
+    </CustomBuild>\r
     <None Include="WebKitExportGeneratorBuildCmd.cmd" />\r
     <None Include="WebKitExportGeneratorPostBuild.cmd" />\r
     <None Include="WebKitExportGeneratorPreBuild.cmd">\r

diff --git a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters
index 8ff3fb69ed3ddd3cf8babbcb8fc4b9a584e8d9a6..b5e5352e3b80a45b6d866d28cd11110d5b330513 100644 (file)
--- a/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters
+++ b/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj.filters
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
   <ItemGroup>\r
-    <None Include="WebKitExports.def.in" />\r
     <None Include="WebKitExportGeneratorBuildCmd.cmd" />\r
     <None Include="WebKitExportGeneratorPostBuild.cmd" />\r
     <None Include="WebKitExportGeneratorPreBuild.cmd" />\r
@@ -9,4 +8,7 @@
   <ItemGroup>\r
     <ClCompile Include="$(ConfigurationBuildDir)\obj\WebKitExportGenerator\DerivedSources\WebKitExportGenerator.cpp" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <CustomBuild Include="WebKitExports.def.in" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 914c08fd6872ecb940337245ac0f9e42a3f2b20e..247f214d36c91ba4e0c4bf33238cf7d64fdfee19 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,10 @@
+2013-02-07  Roger Fong  <roger_fong@apple.com>
+
+        Unreviewed. More VS2010 WebKit solution touchups.
+        Move an ignored warning from a project to common properties.
+
+        * win/tools/vsprops/common.props:
+
 2013-02-06  Mike West  <mkwst@chromium.org>
 
         Add an ENABLE_NOSNIFF feature flag.

diff --git a/WebKitLibraries/win/tools/vsprops/common.props b/WebKitLibraries/win/tools/vsprops/common.props
index a8fbd458b806f824ac7512d4d8a5dbe79ab699db..942384ddede03d6a2654c2b981f65e50aab21e75 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/common.props
+++ b/WebKitLibraries/win/tools/vsprops/common.props
@@ -36,7 +36,7 @@ nmake /nologo -f $(ProjectName).make clean</NMakeCleanCommandLine>
       <WarningLevel>Level4</WarningLevel>\r
       <TreatWarningAsError>false</TreatWarningAsError>\r
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>\r
-      <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4344;4355;4389;4396;4481;4503;4505;4510;4512;4610;4706;4800;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
+      <DisableSpecificWarnings>4018;4068;4099;4100;4127;4138;4146;4180;4189;4201;4244;4251;4267;4275;4288;4291;4305;4344;4355;4389;4396;4481;4503;4505;4510;4512;4610;4706;4800;4819;4951;4952;4996;6011;6031;6211;6246;6255;6387;%(DisableSpecificWarnings)</DisableSpecificWarnings>\r
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>\r
       <FunctionLevelLinking>false</FunctionLevelLinking>\r
       <FloatingPointExceptions>false</FloatingPointExceptions>\r