diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-22 16:29:41 +0000 |
| commit | d73053211c5db825ad997b7900e69b2dd05f8b0c (patch) | |
| tree | fe5a5467ae1d08356918b569543d09e402234463 /o3d/plugin | |
| parent | e01087a666ae4be9e183484c7c7e4b5e127f0874 (diff) | |
| download | chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.zip chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.gz chromium_src-d73053211c5db825ad997b7900e69b2dd05f8b0c.tar.bz2 | |
These are gyp file changes that start to make the Mac GYP build work.
It still doesn't but I want to checkpoint these changes.
Review URL: http://codereview.chromium.org/155890
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21279 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/idl/idl.gyp | 14 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 11 | ||||
| -rw-r--r-- | o3d/plugin/version_info.py | 3 |
3 files changed, 18 insertions, 10 deletions
diff --git a/o3d/plugin/idl/idl.gyp b/o3d/plugin/idl/idl.gyp index 4bf9e3a..9f3a277 100644 --- a/o3d/plugin/idl/idl.gyp +++ b/o3d/plugin/idl/idl.gyp @@ -7,7 +7,7 @@ '../../build/common.gypi', ], 'variables': { - 'chromium_code': 1, + 'chromium_code': 0, 'idl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/idl_glue', 'static_glue_dir': '../../../third_party/nixysa/files/static_glue/npapi', 'idl_files': [ @@ -87,8 +87,6 @@ 'outputs': [ '<(idl_out_dir)/<(RULE_INPUT_ROOT)_glue.cc', '<(idl_out_dir)/<(RULE_INPUT_ROOT)_glue.h', - '<(idl_out_dir)/globals_glue.cc', - '<(idl_out_dir)/globals_glue.h', '<(idl_out_dir)/hash', '<(idl_out_dir)/parsetab.py', '<(idl_out_dir)/parsetab.pyc', @@ -145,6 +143,16 @@ ], }, ], + ['OS=="mac"', + { + 'include_dirs': [ + '../mac', + ], + 'defines': [ + 'XP_MACOSX', + ], + }, + ], ], }, ], diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 688509a..82b6ff6 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -187,21 +187,22 @@ 'action': ['python', 'version_info.py', 'win/o3dPlugin.rc_template', - 'win/o3dPlugin.rc'], + 'win/o3dPlugin.rc'], }, ], ['OS=="mac"', { 'inputs': [ - 'mac/processed/Info.plist', + 'mac/Info.plist', ], 'outputs': [ - 'mac/Info.plist', + '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', ], 'action': ['python', 'version_info.py', - 'mac/processed/Info.plist', - 'mac/Info.plist'], + 'mac/Info.plist', + '<(SHARED_INTERMEDIATE_DIR)/plugin/Info.plist', + ], }, ], ], diff --git a/o3d/plugin/version_info.py b/o3d/plugin/version_info.py index bda71841..fe92026 100644 --- a/o3d/plugin/version_info.py +++ b/o3d/plugin/version_info.py @@ -41,7 +41,6 @@ gflags.DEFINE_boolean('mimetype', False, gflags.DEFINE_boolean('version', False, 'Print out the plugin version and exit.') - def GetDotVersion(version): return '%d.%d.%d.%d' % version @@ -51,7 +50,7 @@ def GetCommaVersion(version): def DoReplace(in_filename, out_filename, replacements): '''Replace the version number in the given filename with the replacements.''' if not os.path.exists(in_filename): - raise Exception(r'''Input template file %s doesn't exist.''' % file) + raise Exception(r'''Input template file %s doesn't exist.''' % in_filename) input_file = open(in_filename, 'r') input = input_file.read() input_file.close() |