Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (86964 => 86965)
--- trunk/Source/_javascript_Core/ChangeLog 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-05-20 17:20:53 UTC (rev 86965)
@@ -1,3 +1,14 @@
+2011-05-19 Evan Martin <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] remove <(library) variable
+ https://bugs.webkit.org/show_bug.cgi?id=61158
+
+ This was for a build experiment; we can just use the correct value now.
+
+ * _javascript_Core.gyp/_javascript_Core.gyp:
+
2011-05-20 Oliver Hunt <[email protected]>
Reviewed by Sam Weinig.
Modified: trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp (86964 => 86965)
--- trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp 2011-05-20 17:20:53 UTC (rev 86965)
@@ -93,7 +93,7 @@
},
{
'target_name': 'wtf',
- 'type': '<(library)',
+ 'type': 'static_library',
'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
'dependencies': [
'wtf_config',
@@ -190,7 +190,7 @@
},
{
'target_name': 'yarr',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'wtf',
],
Modified: trunk/Source/ThirdParty/ChangeLog (86964 => 86965)
--- trunk/Source/ThirdParty/ChangeLog 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/ThirdParty/ChangeLog 2011-05-20 17:20:53 UTC (rev 86965)
@@ -1,3 +1,15 @@
+2011-05-19 Evan Martin <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] remove <(library) variable
+ https://bugs.webkit.org/show_bug.cgi?id=61158
+
+ This was for a build experiment; we can just use the correct value now.
+
+ * glu/glu.gyp:
+ * gyp/test/library/src/library.gyp:
+
2011-05-12 Jeff Miller <[email protected]>
Ignore Visual Studio *.user files.
Modified: trunk/Source/ThirdParty/glu/glu.gyp (86964 => 86965)
--- trunk/Source/ThirdParty/glu/glu.gyp 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/ThirdParty/glu/glu.gyp 2011-05-20 17:20:53 UTC (rev 86965)
@@ -1,7 +1,7 @@
{
'targets': [{
'target_name': 'libtess',
- 'type': '<(library)',
+ 'type': 'static_library',
'include_dirs': [
'../..',
],
Modified: trunk/Source/ThirdParty/gyp/test/library/src/library.gyp (86964 => 86965)
--- trunk/Source/ThirdParty/gyp/test/library/src/library.gyp 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/ThirdParty/gyp/test/library/src/library.gyp 2011-05-20 17:20:53 UTC (rev 86965)
@@ -20,7 +20,7 @@
},
{
'target_name': 'lib1',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
'lib1.c',
],
@@ -34,7 +34,7 @@
},
{
'target_name': 'lib2',
- 'type': '<(library)',
+ 'type': 'static_library',
'sources': [
'lib2.c',
],
Modified: trunk/Source/WebCore/ChangeLog (86964 => 86965)
--- trunk/Source/WebCore/ChangeLog 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/WebCore/ChangeLog 2011-05-20 17:20:53 UTC (rev 86965)
@@ -1,3 +1,14 @@
+2011-05-19 Evan Martin <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] remove <(library) variable
+ https://bugs.webkit.org/show_bug.cgi?id=61158
+
+ This was for a build experiment; we can just use the correct value now.
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-05-20 Pavel Podivilov <[email protected]>
Reviewed by Pavel Feldman.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (86964 => 86965)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-05-20 17:20:53 UTC (rev 86965)
@@ -874,7 +874,7 @@
},
{
'target_name': 'webcore_bindings',
- 'type': '<(library)',
+ 'type': 'static_library',
'hard_dependency': 1,
'dependencies': [
'webcore_bindings_sources',
@@ -1219,7 +1219,7 @@
},
{
'target_name': 'webcore_html',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
],
@@ -1237,7 +1237,7 @@
},
{
'target_name': 'webcore_svg',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
],
@@ -1261,7 +1261,7 @@
},
{
'target_name': 'webcore_platform',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
],
@@ -1448,7 +1448,7 @@
},
{
'target_name': 'webcore_rendering',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
],
@@ -1506,7 +1506,7 @@
},
{
'target_name': 'webcore_remaining',
- 'type': '<(library)',
+ 'type': 'static_library',
'dependencies': [
'webcore_prerequisites',
],
Modified: trunk/Source/WebKit/chromium/ChangeLog (86964 => 86965)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-05-20 17:20:53 UTC (rev 86965)
@@ -1,3 +1,14 @@
+2011-05-19 Evan Martin <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ [chromium] remove <(library) variable
+ https://bugs.webkit.org/show_bug.cgi?id=61158
+
+ This was for a build experiment; we can just use the correct value now.
+
+ * WebKit.gyp:
+
2011-05-20 Vitaly Repeshko <[email protected]>
Unreviewed.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (86964 => 86965)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-05-20 16:36:40 UTC (rev 86964)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-05-20 17:20:53 UTC (rev 86965)
@@ -43,11 +43,9 @@
# Webkit is being built outside of the full chromium project.
# e.g. via build-webkit --chromium
'chromium_src_dir': '../../WebKit/chromium',
- 'webkit_target_type': 'static_library',
},{
# WebKit is checked out in src/chromium/third_party/WebKit
'chromium_src_dir': '../../../../..',
- 'webkit_target_type': '<(library)',
}],
],
'ahem_path': '../../../Tools/DumpRenderTree/qt/fonts/AHEM____.TTF',
@@ -66,6 +64,7 @@
'targets': [
{
'target_name': 'webkit',
+ 'type': 'static_library',
'msvs_guid': '5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65',
'dependencies': [
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
@@ -650,8 +649,6 @@
]
}],
],
- }, {
- 'type': '<(webkit_target_type)'
}],
['OS=="linux" or OS=="freebsd"', {
'dependencies': [
