Title: [196144] trunk/Source/_javascript_Core
- Revision
- 196144
- Author
- achristen...@apple.com
- Date
- 2016-02-04 13:20:10 -0800 (Thu, 04 Feb 2016)
Log Message
Fix internal Windows build
https://bugs.webkit.org/show_bug.cgi?id=153886
<rdar://problem/24499887>
Reviewed by Mark Lam.
* _javascript_Core.vcxproj/_javascript_Core.proj:
In r190253 I changed the directory of the headers from AppleInternal/include/_javascript_Core
to AppleInternal/include/private/_javascript_Core. 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 _javascript_Core.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.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (196143 => 196144)
--- trunk/Source/_javascript_Core/ChangeLog 2016-02-04 21:14:54 UTC (rev 196143)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-02-04 21:20:10 UTC (rev 196144)
@@ -1,3 +1,22 @@
+2016-02-04 Alex Christensen <achristen...@webkit.org>
+
+ Fix internal Windows build
+ https://bugs.webkit.org/show_bug.cgi?id=153886
+ <rdar://problem/24499887>
+
+ Reviewed by Mark Lam.
+
+ * _javascript_Core.vcxproj/_javascript_Core.proj:
+ In r190253 I changed the directory of the headers from AppleInternal/include/_javascript_Core
+ to AppleInternal/include/private/_javascript_Core. 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 _javascript_Core.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....@gmail.com>
[JSC] Make some classes non JSDestructibleObject
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj (196143 => 196144)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-02-04 21:14:54 UTC (rev 196143)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.proj 2016-02-04 21:20:10 UTC (rev 196144)
@@ -68,6 +68,9 @@
<CreateItem Include="$(ConfigurationBuildDir)\build32\DerivedSources\ForwardingHeaders\_javascript_Core\**\*.*">
<Output TaskParameter="Include" ItemName="IncFiles" />
</CreateItem>
+ <CreateItem Include="$(SRCROOT)\API\*.h">
+ <Output TaskParameter="Include" ItemName="APIFiles" />
+ </CreateItem>
<CreateItem Include="$(ConfigurationBuildDir)\build32\bin32\*">
<Output TaskParameter="Include" ItemName="Bin32Files" />
</CreateItem>
@@ -106,6 +109,7 @@
</CreateItem>
<Copy SourceFiles="@(IncFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\private\_javascript_Core\%(RecursiveDir)%(Filename)%(Extension)')" />
+ <Copy SourceFiles="@(APIFiles)" DestinationFiles="@(IncFiles->'$(DSTROOT)\AppleInternal\include\_javascript_Core\%(Filename)%(Extension)')" />
<Copy SourceFiles="@(Lib32Files)" DestinationFolder="$(AppleInternalLib32)" />
<Copy SourceFiles="@(Lib64Files)" DestinationFolder="$(AppleInternalLib64)" />
<Copy SourceFiles="@(Bin32Files)" DestinationFolder="$(AppleInternalBin32)" />
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
