2011-05-19 Evan Martin <evan@chromium.org>
authorevan@chromium.org <evan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 May 2011 17:20:53 +0000 (17:20 +0000)
committerevan@chromium.org <evan@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 May 2011 17:20:53 +0000 (17:20 +0000)
        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.

        * JavaScriptCore.gyp/JavaScriptCore.gyp:
2011-05-19  Evan Martin  <evan@chromium.org>

        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-19  Evan Martin  <evan@chromium.org>

        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-19  Evan Martin  <evan@chromium.org>

        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:

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
Source/ThirdParty/ChangeLog
Source/ThirdParty/glu/glu.gyp
Source/ThirdParty/gyp/test/library/src/library.gyp
Source/WebCore/ChangeLog
Source/WebCore/WebCore.gyp/WebCore.gyp
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKit.gyp

index f5f7cd93a28c3048994a65644649131c73d8fbda..8e664c3a2dca638912ef03b210865f4db45fe47e 100644 (file)
@@ -1,3 +1,14 @@
+2011-05-19  Evan Martin  <evan@chromium.org>
+
+        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.
+
+        * JavaScriptCore.gyp/JavaScriptCore.gyp:
+
 2011-05-20  Oliver Hunt  <oliver@apple.com>
 
         Reviewed by Sam Weinig.
index 27596fceff4ddfbd0067d14524cdb4630e5a9c84..31e87c381b1d42790661c6d7790ec4a66bbf269c 100644 (file)
@@ -93,7 +93,7 @@
     },
     {
       'target_name': 'wtf',
-      'type': '<(library)',
+      'type': 'static_library',
       'msvs_guid': 'AA8A5A85-592B-4357-BC60-E0E91E026AF6',
       'dependencies': [
         'wtf_config',
     },
     {
       'target_name': 'yarr',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'wtf',
       ],
index 87e5cf89c28a7cfa2b1e3a90084959f9a2746025..b4ff0cc365a80e3b868eaa00f5c66b93088c3892 100644 (file)
@@ -1,3 +1,15 @@
+2011-05-19  Evan Martin  <evan@chromium.org>
+
+        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  <jeffm@apple.com>
 
         Ignore Visual Studio *.user files.
index c9ddb77fbd6b78fef58958e34a7c6bf8ed857d9c..51cbc840ec6529dfcb73de68f3c176fbfe8d430c 100644 (file)
@@ -1,7 +1,7 @@
 {
   'targets': [{
     'target_name': 'libtess',
-    'type': '<(library)',
+    'type': 'static_library',
     'include_dirs': [
       '../..',
     ],
index bc355164260373a898d8cc8adae7a2b029356967..51f59bc453e579758c142e6538574d0708f27139 100644 (file)
@@ -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',
       ],
index b6ecd5f6b2fd36b26069a4914f9e52817a66cafc..f920f40a367e68ee130d455a9351777fd29e7496 100644 (file)
@@ -1,3 +1,14 @@
+2011-05-19  Evan Martin  <evan@chromium.org>
+
+        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  <podivilov@chromium.org>
 
         Reviewed by Pavel Feldman.
index 58d3a9bdb79a7ac52603c9cd866f6fc53deb50fd..2d6556b49f79a0c5a652f2b67c13cfe1ee908914 100644 (file)
     },
     {
       'target_name': 'webcore_bindings',
-      'type': '<(library)',
+      'type': 'static_library',
       'hard_dependency': 1,
       'dependencies': [
         'webcore_bindings_sources',
     },
     {
       'target_name': 'webcore_html',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
     },
     {
       'target_name': 'webcore_svg',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
     },
     {
       'target_name': 'webcore_platform',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
     },
     {
       'target_name': 'webcore_rendering',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
     },
     {
       'target_name': 'webcore_remaining',
-      'type': '<(library)',
+      'type': 'static_library',
       'dependencies': [
         'webcore_prerequisites',
       ],
index f7cd3da8026629a9ea780ee7c834de9b5abdc20d..91ffc41e1c8464813d960035af42e14172b07862 100644 (file)
@@ -1,3 +1,14 @@
+2011-05-19  Evan Martin  <evan@chromium.org>
+
+        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  <vitalyr@chromium.org>
 
         Unreviewed.
index 81ec9a49118b4d4f3dc78e90d7085a727f5da93d..723e71a589e0ec6d89cd9d12bf71d654c158761b 100644 (file)
                 # 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',
                             ]
                         }],
                     ],
-                }, {
-                    'type': '<(webkit_target_type)'
                 }],
                 ['OS=="linux" or OS=="freebsd"', {
                     'dependencies': [