OpenBSD/FreeBSD GYP changes (most of the remaining ones)

Review URL: http://codereview.chromium.org/565043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38079 0039d316-1c4b-4281-b951-d872f2087c98
SaschaDeWaal · Feb 4, 2010 · 60b2c07 · 60b2c07
1 parent f6dc896
commit 60b2c07
Show file tree

Hide file tree

Showing 20 changed files with 169 additions and 47 deletions.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -458,7 +458,7 @@
         'browser/debugger/inspectable_tab_proxy.h',
       ],
       'conditions': [
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -535,7 +535,7 @@
             'plugin/command_buffer_stub.h',
           ],
         },],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -824,7 +824,7 @@
         'sync_proto',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk'
           ],
@@ -967,7 +967,7 @@
             'browser/sync/util/data_encryption.h',
           ],
         }],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk'
           ],
@@ -1515,7 +1515,7 @@
         },
       ]},  # 'targets'
     ],  # OS=="win"
-    ['OS=="linux" or OS=="freebsd"', {
+    ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
       'targets': [{
         'target_name': 'packed_resources',
         'type': 'none',
@@ -1601,7 +1601,7 @@
           },
         ],
       }],  # targets
-    }],  # OS=="linux" or OS=="freebsd"
+    }],  # OS=="linux" or OS=="freebsd" or OS=="openbsd"
   ],  # 'conditions'
 }
 

diff --git a/courgette/courgette.gyp b/courgette/courgette.gyp
@@ -93,7 +93,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd"', {
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'dependencies': [
             # Workaround for gyp bug 69.
             # Needed to handle the #include chain:
@@ -118,7 +118,7 @@
         '../testing/gtest.gyp:gtest',
       ],
       'conditions': [
-        [ 'OS == "linux" or OS == "freebsd"', {
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'dependencies': [
             # Workaround for gyp bug 69.
             # Needed to handle the #include chain:

diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
@@ -10,7 +10,7 @@
       ['exclude', '/win_[^/]*\\.cc$'],
     ],
     'conditions': [
-      ['OS=="linux"', {'sources/': [
+      ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
         ['include', '_posix(_unittest)?\\.cc$'],
       ]}],
       ['OS=="mac"', {'sources/': [
@@ -53,7 +53,7 @@
         'sync_socket_unittest.cc',
       ],
       'conditions': [
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
@@ -63,7 +63,7 @@
             '../views/views.gyp:views',
           ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS=="linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [

diff --git a/printing/native_metafile.h b/printing/native_metafile.h
@@ -34,9 +34,9 @@ typedef PdfMetafile NativeMetafile;
 
 }  // namespace printing
 
-#elif defined(OS_LINUX)
+#elif defined(OS_POSIX)
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 namespace printing {
 

diff --git a/printing/pdf_ps_metafile_linux.cc → printing/pdf_ps_metafile_cairo.cc b/printing/pdf_ps_metafile_linux.cc → printing/pdf_ps_metafile_cairo.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 #include <stdio.h>
 

diff --git a/printing/pdf_ps_metafile_linux.h → printing/pdf_ps_metafile_cairo.h b/printing/pdf_ps_metafile_linux.h → printing/pdf_ps_metafile_cairo.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef PRINTING_PDF_PS_METAFILE_LINUX_H_
-#define PRINTING_PDF_PS_METAFILE_LINUX_H_
+#ifndef PRINTING_PDF_PS_METAFILE_CAIRO_H_
+#define PRINTING_PDF_PS_METAFILE_CAIRO_H_
 
 #include <string>
 
@@ -107,4 +107,4 @@ class PdfPsMetafile {
 
 }  // namespace printing
 
-#endif  // PRINTING_PDF_PS_METAFILE_LINUX_H_
+#endif  // PRINTING_PDF_PS_METAFILE_CAIRO_H_
diff --git a/printing/pdf_ps_metafile_linux_unittest.cc → printing/pdf_ps_metafile_cairo_unittest.cc b/printing/pdf_ps_metafile_linux_unittest.cc → printing/pdf_ps_metafile_cairo_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "printing/pdf_ps_metafile_linux.h"
+#include "printing/pdf_ps_metafile_cairo.h"
 
 #include <fcntl.h>
 #include <string>

diff --git a/printing/printed_document_linux.cc → printing/printed_document_cairo.cc b/printing/printed_document_linux.cc → printing/printed_document_cairo.cc
diff --git a/printing/printing.gyp b/printing/printing.gyp
@@ -39,20 +39,20 @@
         'page_setup.h',
         'pdf_metafile_mac.h',
         'pdf_metafile_mac.cc',
-        'pdf_ps_metafile_linux.h',
-        'pdf_ps_metafile_linux.cc',
+        'pdf_ps_metafile_cairo.h',
+        'pdf_ps_metafile_cairo.cc',
         'print_settings.cc',
         'print_settings.h',
         'printed_document.cc',
-        'printed_document_linux.cc',
+        'printed_document_cairo.cc',
         'printed_document_mac.cc',
         'printed_document_win.cc',
         'printed_document.h',
         'printed_page.cc',
         'printed_page.h',
         'printed_pages_source.h',
         'printing_context.h',
-        'printing_context_linux.cc',
+        'printing_context_cairo.cc',
         'printing_context_mac.mm',
         'printing_context_win.cc',
         'units.cc',
@@ -64,13 +64,15 @@
         ],
       },
       'conditions': [
-        ['OS!="linux"', {'sources/': [['exclude', '_linux\\.cc$']]}],
+        ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{
+            'sources/': [['exclude', '_cairo\\.cc$']]
+        }],
         ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win\\.cc$']]
           }, {  # else: OS=="win"
             'sources/': [['exclude', '_posix\\.cc$']]
         }],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'dependencies': [
             # For FT_Init_FreeType and friends.
             '../build/linux/system.gyp:freetype2',
@@ -94,25 +96,25 @@
         'page_range_unittest.cc',
         'page_setup_unittest.cc',
         'pdf_metafile_mac_unittest.cc',
-        'pdf_ps_metafile_linux_unittest.cc',
+        'pdf_ps_metafile_cairo_unittest.cc',
         'printing_context_win_unittest.cc',
         'run_all_unittests.cc',
         'units_unittest.cc',
       ],
       'conditions': [
-        ['OS!="linux"', {'sources/': [['exclude', '_linux_unittest\\.cc$']]}],
+        ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
         ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
         ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
           }, {  # else: OS=="win"
-            'sources/': [['exclude', '_posix_unittest\\.cc$']]
+            'sources/': [['exclude', '_cairo_unittest\\.cc$']]
           }
         ],
-        ['OS=="linux"', {
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
             'dependencies': [
               '../build/linux/system.gyp:gtk',
            ],
         }],
-        ['OS=="linux" or OS=="freebsd"', {
+        ['OS=="linux"', {
           'conditions': [
             ['linux_use_tcmalloc==1', {
               'dependencies': [

diff --git a/printing/printing_context_linux.cc → printing/printing_context_cairo.cc b/printing/printing_context_linux.cc → printing/printing_context_cairo.cc
diff --git a/sdch/bsd/config.h b/sdch/bsd/config.h
@@ -0,0 +1,113 @@
+/* src/config.h.  Generated by SCons.  */
+/* src/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+/* #undef HAVE_DLFCN_H */
+
+/* Define to 1 if you have the <ext/rope> header file. */
+/* #undef HAVE_EXT_ROPE */
+
+/* Define to 1 if you have the <fnmatch.h> header file. */
+/* #undef HAVE_FNMATCH_H */
+
+/* Define to 1 if you have the <getopt.h> header file. */
+/* #undef HAVE_GETOPT_H */
+
+/* Define to 1 if you have the `gettimeofday' function. */
+/* #undef HAVE_GETTIMEOFDAY */
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define to 1 if you have the <malloc.h> header file. */
+/* #undef HAVE_MALLOC_H */
+
+/* Define to 1 if you have the `memalign' function. */
+/* #undef HAVE_MEMALIGN */
+
+/* Define to 1 if you have the <memory.h> header file. */
+/* #undef HAVE_MEMORY_H */
+
+/* Define to 1 if you have the `mprotect' function. */
+/* #undef HAVE_MPROTECT */
+
+/* Define to 1 if you have the `posix_memalign' function. */
+/* #undef HAVE_POSIX_MEMALIGN */
+
+/* Define to 1 if you have the `QueryPerformanceCounter' function. */
+/* #undef HAVE_QUERYPERFORMANCECOUNTER */
+
+/* Define to 1 if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+/* #undef HAVE_STDLIB_H */
+
+/* Define to 1 if you have the <strings.h> header file. */
+/* #undef HAVE_STRINGS_H */
+
+/* Define to 1 if you have the <string.h> header file. */
+/* #undef HAVE_STRING_H */
+
+/* Define to 1 if you have the `strtoll' function. */
+/* #undef HAVE_STRTOLL */
+
+/* Define to 1 if you have the `strtoq' function. */
+/* #undef HAVE_STRTOQ */
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+/* #undef HAVE_SYS_MMAN_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+/* #undef HAVE_SYS_TIME_H */
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+/* #undef HAVE_SYS_TYPES_H */
+
+/* Define to 1 if the system has the type `uint16_t'. */
+/* #undef HAVE_UINT16_T */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Define to 1 if the system has the type `u_int16_t'. */
+/* #undef HAVE_U_INT16_T */
+
+/* Define to 1 if you have the <windows.h> header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* define if your compiler has __attribute__ */
+/* #undef HAVE___ATTRIBUTE__ */
+
+/* Define to 1 if the system has the type `__int16'. */
+/* #undef HAVE___INT16 */
+
+/* Name of package */
+/* #undef PACKAGE */
+
+/* Define to the address where bug reports for this package should be sent. */
+/* #undef PACKAGE_BUGREPORT */
+
+/* Define to the full name of this package. */
+/* #undef PACKAGE_NAME */
+
+/* Define to the full name and version of this package. */
+/* #undef PACKAGE_STRING */
+
+/* Define to the one symbol short name of this package. */
+/* #undef PACKAGE_TARNAME */
+
+/* Define to the version of this package. */
+/* #undef PACKAGE_VERSION */
+
+/* Define to 1 if you have the ANSI C header files. */
+/* #undef STDC_HEADERS */
+
+/* Use custom compare function instead of memcmp */
+/* #undef VCDIFF_USE_BLOCK_COMPARE_WORDS */
+
+/* Version number of package */
+/* #undef VERSION */
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp
@@ -55,6 +55,7 @@
       },
       'conditions': [
         [ 'OS == "linux"', { 'include_dirs': [ 'linux' ] } ],
+        [ 'OS == "freebsd" or OS == "openbsd"', { 'include_dirs': [ 'bsd' ] } ],
         [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ],
         [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ],
       ],

diff --git a/skia/skia.gyp b/skia/skia.gyp
@@ -566,7 +566,7 @@
             ['exclude', '_mac\\.(cc|cpp|mm?)$'],
             ['exclude', '/mac/'] ],
         }],
-        [ 'OS != "linux"', {
+        [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd"', {
           'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ],
           'sources!': [
             '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
@@ -590,7 +590,7 @@
             '../third_party/skia/src/opts/opts_check_SSE2.cpp'
           ],
         }],
-        [ 'OS == "linux" or OS == "freebsd"', {
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'dependencies': [
             '../build/linux/system.gyp:gdk',
             '../build/linux/system.gyp:fontconfig',

diff --git a/testing/gtest.gyp b/testing/gtest.gyp
@@ -59,7 +59,7 @@
             ],
           },
         }],
-        ['OS == "mac" or OS == "linux"', {
+        ['OS == "mac" or OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
           'defines': [
             # gtest isn't able to figure out when RTTI is disabled for gcc
             # versions older than 4.3.2, and assumes it's enabled.  Our Mac