Fix internal Windows build

https://bugs.webkit.org/show_bug.cgi?id=153886
<rdar://problem/24499887>

Reviewed by Mark Lam.

* JavaScriptCore.vcxproj/JavaScriptCore.proj:
In r190253 I changed the directory of the headers from AppleInternal/include/JavaScriptCore
to AppleInternal/include/private/JavaScriptCore.  This is ok for WebCore and WebKit, but not
other projects, such as CFNetwork, which expect the public API headers to be in the old location.
This used to be done by a combination of copy-files.cmd and the old JavaScriptCore.proj.
This change copies all the API headers, which copies everything in copy-files.cmd except APIShims.h
which does not exist any more.  It copies additional headers that were not copied before, but
I think this is beneficial so we do not forget to add new public headers to a list of public headers
to be copied in the internal build.  Having extra public headers in the internal Windows build is
not a problem because only internal clients use the internal Windows build.

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 3e8f26d..e9f9112 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,22 @@
+2016-02-04  Alex Christensen  <achristensen@webkit.org>
+
+        Fix internal Windows build
+        https://bugs.webkit.org/show_bug.cgi?id=153886
+        <rdar://problem/24499887>
+
+        Reviewed by Mark Lam.
+
+        * JavaScriptCore.vcxproj/JavaScriptCore.proj:
+        In r190253 I changed the directory of the headers from AppleInternal/include/JavaScriptCore 
+        to AppleInternal/include/private/JavaScriptCore.  This is ok for WebCore and WebKit, but not
+        other projects, such as CFNetwork, which expect the public API headers to be in the old location.
+        This used to be done by a combination of copy-files.cmd and the old JavaScriptCore.proj.
+        This change copies all the API headers, which copies everything in copy-files.cmd except APIShims.h
+        which does not exist any more.  It copies additional headers that were not copied before, but
+        I think this is beneficial so we do not forget to add new public headers to a list of public headers
+        to be copied in the internal build.  Having extra public headers in the internal Windows build is
+        not a problem because only internal clients use the internal Windows build.
+
 2016-02-03  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [JSC] Make some classes non JSDestructibleObject

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
index 99f03c4..13bb87f 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.proj
@@ -68,6 +68,9 @@
     <CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\JavaScriptCore\**\*.*">\r
       <Output TaskParameter="Include" ItemName="IncFiles" />\r
     </CreateItem>\r
+    <CreateItem Include="$(SRCROOT)\API\*.h">\r
+      <Output TaskParameter="Include" ItemName="APIFiles" />\r
+    </CreateItem>\r
     <CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">\r
       <Output TaskParameter="Include" ItemName="Bin32Files" />\r
     </CreateItem>\r
@@ -106,6 +109,7 @@
     </CreateItem>\r
 \r
     <Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\JavaScriptCore\%(RecursiveDir)%(Filename)%(Extension)')" />\r
+    <Copy SourceFiles="@(APIFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\JavaScriptCore\%(Filename)%(Extension)')" />\r
     <Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />\r
     <Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />\r
     <Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />\r