Define os_posix in gyp files to get new Unix platforms added quickly

build/common.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 20 matching lines @@
         # To do a shared build on linux we need to be able to choose between
         # type static_library and shared_library. We default to doing a static
         # build but you can override this with "gyp -Dlibrary=shared_library"
         # or you can add the following line (without the #) to
         # ~/.gyp/include.gypi {'variables': {'library': 'shared_library'}}
         # to compile as shared by default
         'library%': 'static_library',
 
         # Compute the architecture that we're building on.
         'conditions': [
-          [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
             # This handles the Linux platforms we generally deal with. Anything
             # else gets passed through, which probably won't work very well; such
             # hosts should pass an explicit target_arch to gyp.
             'host_arch%':
-              '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")',
-          }, {  # OS!="linux"
+              '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
+            'os_posix%': 1,

[Mark Mentovai, 2011/05/09 19:54:50]

Now we’re getting into a semantic difference thing. (Sorry I didn’t look at this
bit before.)

_posix.cc and OS_POSIX both mean “all of the OSes you’ve described here AND
Mac.”

We waffled on this a bit but ultimately decided that it wasn’t worth having a
generic “posix but not Mac” macro or filename extension because most of those
uses would be better served by choosing a name describing the real feature at
stake, like gtk or x11.

I think it would be confusing to choose a different definition for “posix” in
GYP-speak.

+          }, {  # OS!=posix
             'host_arch%': 'ia32',
+            'os_posix%': 0,
           }],
 
           # Set default value of toolkit_views on for Windows, Chrome OS
           # and the touch UI.
           ['OS=="win" or chromeos==1 or touchui==1', {
             'toolkit_views%': 1,
           }, {
             'toolkit_views%': 0,
           }],
         ],
       },
 
       # Copy conditionally-set variables out one scope.
       'chromeos%': '<(chromeos)',
       'touchui%': '<(touchui)',
       'host_arch%': '<(host_arch)',
       'library%': '<(library)',
       'toolkit_views%': '<(toolkit_views)',
+      'os_posix%': '<(os_posix)',
 
       # Override branding to select the desired branding flavor.
       'branding%': 'Chromium',
 
       # Override buildtype to select the desired build flavor.
       # Dev - everyday build for development/testing
       # Official - release build (generally implies additional processing)
       # TODO(mmoss) Once 'buildtype' is fully supported (e.g. Windows gyp
       # conversion is done), some of the things which are now controlled by
       # 'branding', such as symbol generation, will need to be refactored based
@@ skipping 101 matching lines @@
         }],
       ],
     },
 
     # Copy conditionally-set variables out one scope.
     'branding%': '<(branding)',
     'buildtype%': '<(buildtype)',
     'target_arch%': '<(target_arch)',
     'host_arch%': '<(host_arch)',
     'toolkit_views%': '<(toolkit_views)',
+    'os_posix%': '<(os_posix)',
     'use_gnome_keyring%': '<(use_gnome_keyring)',
     'linux_fpic%': '<(linux_fpic)',
     'enable_flapper_hacks%': '<(enable_flapper_hacks)',
     'chromeos%': '<(chromeos)',
     'touchui%': '<(touchui)',
     'file_manager_extension%': '<(file_manager_extension)',
     'inside_chromium_build%': '<(inside_chromium_build)',
     'fastbuild%': '<(fastbuild)',
     'python_ver%': '<(python_ver)',
     'armv7%': '<(armv7)',
@@ skipping 200 matching lines @@
     # If debug_devtools is set to 1, JavaScript files for DevTools are
     # stored as is and loaded from disk. Otherwise, a concatenated file
     # is stored in resources.pak. It is still possible to load JS files
     # from disk by passing --debug-devtools cmdline switch.
     'debug_devtools%': 0,
 
     # Point to ICU directory.
     'icu_src_dir': '../third_party/icu',
 
     'conditions': [
-      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+      ['os_posix==1', {
         # This will set gcc_version to XY if you are running gcc X.Y.*.
         # This is used to tweak build flags for gcc 4.4.
         'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
         # Figure out the python architecture to decide if we build pyauto.
         'python_arch%': '<!(<(DEPTH)/build/linux/python_arch.sh <(sysroot)/usr/lib/libpython<(python_ver).so.1.0)',
         'conditions': [
           ['branding=="Chrome"', {
             'linux_breakpad%': 1,
           }],
           # All Chrome builds have breakpad symbols, but only process the
           # symbols from official builds.
           ['(branding=="Chrome" and buildtype=="Official")', {
             'linux_dump_symbols%': 1,
           }],
         ],
-      }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd"
+      }],  # os_posix==1
 
       ['OS=="mac"', {
         'conditions': [
           # mac_product_name is set to the name of the .app bundle as it should
           # appear on disk.  This duplicates data from
           # chrome/app/theme/chromium/BRANDING and
           # chrome/app/theme/google_chrome/BRANDING, but is necessary to get
           # these names into the build system.
           ['branding=="Chrome"', {
             'mac_product_name%': 'Google Chrome',
@@ skipping 41 matching lines @@
             'secure_atl%': 1,
           }],
         ],
         'nacl_win64_defines': [
           # This flag is used to minimize dependencies when building
           # Native Client loader for 64-bit Windows.
           'NACL_WIN64',
         ],
       }],
 
-      ['OS=="mac" or (OS=="linux" and chromeos==0 and target_arch!="arm")', {
+      ['OS=="mac" or (os_posix==1 and chromeos==0 and target_arch!="arm")', {
         'use_cups%': 1,
       }, {
         'use_cups%': 0,
       }],
 
       # Set the relative path from this file to the GYP file of the JPEG
       # library used by Chromium.
       ['use_libjpeg_turbo==1', {
         'libjpeg_gyp_path': '../third_party/libjpeg_turbo/libjpeg.gyp',
       }, {
@@ skipping 228 matching lines @@
           '_SCL_SECURE_NO_DEPRECATE',
         ],
         'include_dirs': [
           '<(DEPTH)/third_party/wtl/include',
         ],
       }],  # OS==win
     ],  # conditions for 'target_defaults'
     'target_conditions': [
       ['chromium_code==0', {
         'conditions': [
-          [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+          [ 'os_posix==1', {
             # We don't want to get warnings from third-party code,
             # so remove any existing warning-enabling flags like -Wall.
             'cflags!': [
               '-Wall',
               '-Wextra',
               '-Werror',
             ],
             'cflags': [
               # Don't warn about hash_map in third-party code.
               '-Wno-deprecated',
@@ skipping 35 matching lines @@
           ['OS!="win"', {
             'sources/': [ ['exclude', '_win(_unittest)?\\.(h|cc)$'],
                           ['exclude', '(^|/)win/'],
                           ['exclude', '(^|/)win_[^/]*\\.(h|cc)$'] ],
           }],
           ['OS!="mac"', {
             'sources/': [ ['exclude', '_(cocoa|mac)(_unittest)?\\.(h|cc)$'],
                           ['exclude', '(^|/)(cocoa|mac)/'],
                           ['exclude', '\\.mm?$' ] ],
           }],
-          ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
+          ['os_posix!=1', {
             'sources/': [
               ['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.(h|cc)$'],
               ['exclude', '(^|/)gtk/'],
               ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
             ],
           }],
           ['OS!="linux"', {
             'sources/': [
               ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
               ['exclude', '(^|/)linux/'],
@@ skipping 214 matching lines @@
             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
           },
           'Purify_x64': {
             'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify_Base'],
           },
         }],
       ],
     },
   },
   'conditions': [
-    ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+    ['os_posix==1', {
       'target_defaults': {
         # Enable -Werror by default, but put it in a variable so it can
         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
         'variables': {
           # Use -fno-strict-aliasing, see http://crbug.com/32204
           'no_strict_aliasing%': 1,
           'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
                          ['OS=="freebsd"', {'werror%': '',}],
                          ['OS=="openbsd"', {'werror%': '',}],
+                         ['OS=="solaris"', {'werror%': '',}],

[tony, 2011/05/09 20:13:18]

Nit: Can we put freebsd/openbsd/solaris in the else part of the OS=="linux"
condition?

           ],
         },
         'cflags': [
           '<(werror)',  # See note above about the werror variable.
           '-pthread',
           '-fno-exceptions',
           '-Wall',
           # TODO(evan): turn this back on once all the builds work.
           # '-Wextra',
           # Don't warn about unused function params.  We use those everywhere.
@@ skipping 573 matching lines @@
           'VCResourceCompilerTool': {
             'Culture' : '1033',
             'AdditionalIncludeDirectories': [
               '<(DEPTH)',
               '<(SHARED_INTERMEDIATE_DIR)',
             ],
           },
         },
       },
     }],
-    ['disable_nacl==1 or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+    ['disable_nacl==1', {

[tony, 2011/05/09 20:13:18]

This looks like a functional change.  Looks like if we're on bsd/solaris, we
should force disable_nacl=1 in an above condition.  Can you make this change in
a separate patch?

       'target_defaults': {
         'defines': [
           'DISABLE_NACL',
         ],
       },
     }],
     ['OS=="win" and msvs_use_common_linker_extras', {
       'target_defaults': {
         'msvs_settings': {
           'VCLinkerTool': {
@@ skipping 67 matching lines @@
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: