combine target_defaults.gypi into common.gypi

http://codereview.appspot.com/4654080



git-svn-id: http://skia.googlecode.com/svn/trunk@1780 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/CocoaDebuggerApp.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/FileReaderApp.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/SampleApp.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {
@@ -158,9 +158,7 @@
         'VCLinkerTool': {
           'SubSystem': '2',
           'AdditionalDependencies': [
-              'OpenGL32.lib',
+            'd3d9.lib',
-              'usp10.lib',
-              'd3d9.lib',
           ],
         },
       },

gyp/SimpleCocoaApp.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/animator.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/apptype_console.gypi

@@ -10,11 +10,6 @@
 
         #Console app, use main/wmain
         'EntryPointSymbol': 'mainCRTStartup',
-
-        'AdditionalDependencies': [
-          'OpenGL32.lib',
-          'usp10.lib',
-        ],
       },
     },
   },

gyp/bench.gyp

@@ -9,7 +9,7 @@
 {
   'includes': [
     'apptype_console.gypi',
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/common.gypi

@@ -12,10 +12,51 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 {
-  'conditions' : [
+  'target_defaults': {
-    ['OS == "win"',
+
-      {
+    # Define variables, and allow for override in GYP_DEFINES environment var.
-        'target_defaults': {
+    'variables': {
+      'skia_scalar%': 'float',
+    },
+    'skia_scalar%': '<(skia_scalar)',
+
+    'configurations': {
+      'Debug': {
+        'defines': [
+          'SK_DEBUG',
+          'GR_DEBUG=1',
+        ],
+      },
+      'Release': {
+        'defines': [
+          'SK_RELEASE',
+          'GR_RELEASE=1',
+        ],
+      },
+    },
+
+    'conditions' : [
+
+      [ 'skia_scalar == "float"',
+        {
+          'defines': [
+            'SK_SCALAR_IS_FLOAT',
+            'SK_CAN_USE_FLOAT',
+          ],
+        }, { # else, skia_scalar != "float"
+          'defines': [
+            'SK_SCALAR_IS_FIXED',
+            'SK_CAN_USE_FLOAT',  # we can still use floats along the way
+          ],
+        }
+      ],
+
+      ['OS == "win"',
+        {
+          'defines': [
+            'SK_BUILD_FOR_WIN32',
+            'SK_IGNORE_STDINT_DOT_H',
+          ],
           'msvs_cygwin_shell': 0,
           'msvs_settings': {
             'VCCLCompilerTool': {
@@ -24,6 +65,12 @@
               'DebugInformationFormat': '3',
               'AdditionalOptions': '/MP',
             },
+            'VCLinkerTool': {
+              'AdditionalDependencies': [
+                'OpenGL32.lib',
+                'usp10.lib',
+              ],
+            },
           },
           'configurations': {
             'Debug': {
@@ -52,11 +99,14 @@
             },
           },
         },
-      },
+      ],
-    ],
+
-    ['OS == "linux"', 
+      ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', 
-      {
+        {
-        'target_defaults': {
+          'defines': [
+            'SK_SAMPLES_FOR_X',
+            'SK_BUILD_FOR_UNIX',
+          ],
           'configurations': {
             'Debug': {
               'cflags': ['-g']
@@ -65,13 +115,18 @@
               'cflags': ['-O2']
             },
           },
-          'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ]
+          'cflags': [ '-Wall', '-Wextra', '-Wno-unused' ],
+          'include_dirs' : [
+            '/usr/include/freetype2',
+          ],
         },
-      },
+      ],
-    ],
+
-    ['OS == "mac"', 
+      ['OS == "mac"', 
-      {
+        {
-        'target_defaults': {
+          'defines': [
+            'SK_BUILD_FOR_MAC',
+          ],
           'configurations': {
             'Debug': {
               'cflags': ['-g']
@@ -80,13 +135,14 @@
               'cflags': ['-O2']
             },
           },
+          'xcode_settings': {
+            'SYMROOT': '<(DEPTH)/xcodebuild',
+          },
         },
-        'xcode_settings': {
+      ],
-          'SYMROOT': '<(DEPTH)/xcodebuild',
+
-        },
+    ], # end 'conditions'
-      },
+  }, # end 'target_defaults'
-    ],
-  ],
 }
 # Local Variables:
 # tab-width:2

gyp/core.gyp

@@ -1,7 +1,7 @@
 # Core Skia library code.
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/effects.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/experimental.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/gm.gyp

@@ -2,7 +2,7 @@
 {
   'includes': [
     'apptype_console.gypi',
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/gpu.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/images.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/libtess.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/opts.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,

gyp/pdf.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/svg.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/target_defaults.gypi

@@ -1,95 +0,0 @@
-{
-  'target_defaults': {
-    'defines': [
-      'SK_CAN_USE_FLOAT',
-    ],
-
-    'variables': {
-      'skia_scalar%': 'float',
-    },
-    # Allow override in GYP_DEFINES environment variable.
-    'skia_scalar%': '<(skia_scalar)',
-
-    'configurations': {
-      'Debug': {
-        'defines': [
-          'SK_DEBUG',
-          'GR_DEBUG=1',
-        ],
-        'msvs_settings': {
-           'VCLinkerTool': {
-             'GenerateDebugInformation': 'true',
-           },
-           'VCCLCompilerTool': {
-             #0 Disabled (/Od)
-             #1 Minimize Size (/O1)
-             #2 Maximize Speed (/O2)
-             #3 Full Optimization (/Ox)
-             'Optimization': '0',
-           },
-         },
-      },
-      'Release': {
-        'defines': [
-          'SK_RELEASE',
-          'GR_RELEASE=1',
-        ],
-      },
-    },
-    'conditions': [
-      [ 'skia_scalar == "float"',
-        {
-          'defines': [
-            'SK_SCALAR_IS_FLOAT',
-          ],
-        }, { # else, skia_scalar != "float"
-          'defines': [
-            'SK_SCALAR_IS_FIXED',
-          ],
-        }
-      ],
-      [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-        'include_dirs' : [
-          '/usr/include/freetype2',
-        ],
-      }],
-      [ 'OS == "mac"', {
-        'defines': [
-          'SK_BUILD_FOR_MAC',
-        ],
-      }],
-      [ 'OS == "win"', {
-        'defines': [
-          'SK_BUILD_FOR_WIN32',
-          'SK_IGNORE_STDINT_DOT_H',
-        ],
-      }],
-      [ 'OS == "linux"', {
-        'defines': [
-          'SK_SAMPLES_FOR_X',
-          'SK_BUILD_FOR_UNIX',
-        ],
-      }],
-    ],
-    'direct_dependent_settings': {
-      'conditions': [
-        [ 'OS == "mac"', {
-          'defines': [
-            'SK_BUILD_FOR_MAC',
-          ],
-        }],
-        [ 'OS == "win"', {
-          'defines': [
-            'SK_BUILD_FOR_WIN32',
-          ],
-        }],
-      ],
-    },
-  },
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

gyp/tests.gyp

@@ -2,7 +2,7 @@
 {
   'includes': [
     'apptype_console.gypi',
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/tools.gyp

@@ -8,7 +8,7 @@
 {
   'includes': [
     'apptype_console.gypi',
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/utils.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/views.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/xml.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp/zlib.gyp

@@ -1,6 +1,6 @@
 {
   'includes': [
-    'target_defaults.gypi',
+    'common.gypi',
   ],
   'targets': [
     {

gyp_skia

@@ -53,9 +53,6 @@ def additional_include_files(args=[]):
     if os.path.realpath(path) not in specified_includes:
       result.append(path)
 
-  # Always include common.gypi
-  AddInclude(os.path.join(gyp_config_dir, 'common.gypi'))
-
   return result
 
 if __name__ == '__main__':