diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-06 22:17:39 +0000 |
| commit | 6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19 (patch) | |
| tree | ac02524310011c60f7d4f5255f1df5b592b4ca5c /o3d/plugin | |
| parent | 05c453db1e7a357eb2cc1b6ac67ff32a5256bb19 (diff) | |
| download | chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.zip chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.gz chromium_src-6a60ae4c2967bae910cbd1a1ff5a53c5f7d78a19.tar.bz2 | |
This completes the building of o3d.msi from the GYP build.
Review URL: http://codereview.chromium.org/164044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/plugin')
| -rw-r--r-- | o3d/plugin/idl/codegen.py | 4 | ||||
| -rw-r--r-- | o3d/plugin/plugin.gyp | 4 | ||||
| -rw-r--r-- | o3d/plugin/version_info.py | 17 |
3 files changed, 18 insertions, 7 deletions
diff --git a/o3d/plugin/idl/codegen.py b/o3d/plugin/idl/codegen.py index 329c797..22cbec2 100644 --- a/o3d/plugin/idl/codegen.py +++ b/o3d/plugin/idl/codegen.py @@ -21,7 +21,9 @@ import sys import os import os.path -third_party = os.path.join('..', '..', '..', 'third_party') +script_dir = os.path.join(os.path.dirname(sys.argv[0])) +third_party = os.path.normpath( + os.path.join(script_dir, '..', '..', '..', 'third_party')) pythonpath = os.pathsep.join([os.path.join(third_party, 'gflags', 'python'), os.path.join(third_party, 'ply')]) diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp index 28a61fc..abf00b8 100644 --- a/o3d/plugin/plugin.gyp +++ b/o3d/plugin/plugin.gyp @@ -120,8 +120,8 @@ { 'link_settings': { 'libraries': [ - '-l"$(DXSDK_DIR)/Lib/x86/DxErr9.lib"', - '-l"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', + '"$(DXSDK_DIR)/Lib/x86/DxErr9.lib"', + '"$(DXSDK_DIR)/Lib/x86/d3dx9.lib"', '-ld3d9.lib', ], }, diff --git a/o3d/plugin/version_info.py b/o3d/plugin/version_info.py index cebfa57..5424cf4 100644 --- a/o3d/plugin/version_info.py +++ b/o3d/plugin/version_info.py @@ -20,9 +20,9 @@ import os.path import re import sys +script_dir = os.path.join(os.path.dirname(sys.argv[0])) gflags_dir = os.path.normpath( - os.path.join(os.path.dirname(sys.argv[0]), - '..', '..', 'third_party', 'gflags', 'python')) + os.path.join(script_dir, '..', '..', 'third_party', 'gflags', 'python')) sys.path.append(gflags_dir) import gflags @@ -43,6 +43,9 @@ gflags.DEFINE_boolean('mimetype', False, gflags.DEFINE_boolean('version', False, 'Print out the plugin version and exit.') +gflags.DEFINE_boolean('commaversion', False, + 'Print out the plugin version with commas and exit.') + def GetDotVersion(version): return '%d.%d.%d.%d' % version @@ -77,9 +80,11 @@ def main(argv): # Get version string from o3d_version.py o3d_version_vars = {} if FLAGS.kill_switch: - execfile('../installer/win/o3d_kill_version.py', o3d_version_vars) + execfile(os.path.join(script_dir, '..', 'installer', 'win', + 'o3d_kill_version.py'), o3d_version_vars) else: - execfile('../installer/win/o3d_version.py', o3d_version_vars) + execfile(os.path.join(script_dir, '..', 'installer', 'win', + 'o3d_version.py'), o3d_version_vars) plugin_version = o3d_version_vars['plugin_version'] sdk_version = o3d_version_vars['sdk_version'] @@ -113,6 +118,10 @@ def main(argv): print '%s' % O3D_PLUGIN_VERSION sys.exit(0) + if FLAGS.commaversion: + print '%s' % O3D_PLUGIN_VERSION_COMMAS + sys.exit(0) + plugin_replace_strings = [ ('@@@PluginName@@@', O3D_PLUGIN_NAME), ('@@@ProductVersionCommas@@@', O3D_PLUGIN_VERSION_COMMAS), |